From b071f40740a605580e08a37400c4524f767473e4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 09 九月 2023 16:11:37 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/BasLiftMapper.xml | 1 -
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 13 +++++++------
src/main/java/com/zy/asrs/entity/BasLift.java | 12 ++++++++++--
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasLift.java b/src/main/java/com/zy/asrs/entity/BasLift.java
index 2cddf57..cc7b5fa 100644
--- a/src/main/java/com/zy/asrs/entity/BasLift.java
+++ b/src/main/java/com/zy/asrs/entity/BasLift.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity;
+import com.alibaba.fastjson.JSON;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
@@ -78,7 +79,7 @@
*/
@ApiModelProperty(value= "鎻愬崌鏈哄潗鏍�")
@TableField("point")
- private NyShuttleProtocol.NyShuttlePointClass point;
+ private String point;
/**
* 妯″紡
@@ -187,7 +188,7 @@
public BasLift() {}
- public BasLift(Integer liftNo, Integer status, Integer wrkNo, Date updateTime, Long updateBy, String memo, Boolean pakMk, NyShuttleProtocol.NyShuttlePointClass point, Boolean model, Boolean busy, Boolean frontOverrun, Boolean backOverrun, Boolean leftOverrun, Boolean rightOverrun, Boolean overHeight, Boolean overWeight, Boolean hasTray, Boolean hasCar, Boolean deviceError, Integer taskAddress, Integer distAddress, Integer completeTaskNo, Integer lev) {
+ public BasLift(Integer liftNo, Integer status, Integer wrkNo, Date updateTime, Long updateBy, String memo, Boolean pakMk, String point, Boolean model, Boolean busy, Boolean frontOverrun, Boolean backOverrun, Boolean leftOverrun, Boolean rightOverrun, Boolean overHeight, Boolean overWeight, Boolean hasTray, Boolean hasCar, Boolean deviceError, Integer taskAddress, Integer distAddress, Integer completeTaskNo, Integer lev) {
this.liftNo = liftNo;
this.status = status;
this.wrkNo = wrkNo;
@@ -229,5 +230,12 @@
return null;
}
+ public NyShuttleProtocol.NyShuttlePointClass getPoint$() {
+ if (Cools.isEmpty(this.point)){
+ return null;
+ }
+ return JSON.parseObject(this.point, NyShuttleProtocol.NyShuttlePointClass.class);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 9259abd..33b4420 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2170,8 +2170,9 @@
if (liftWrkMast != null) {
return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
}
- NavigateNode liftNode = new NavigateNode(basLift.getPoint().getX(), basLift.getPoint().getY());
- liftNode.setZ(basLift.getPoint().getZ());
+
+ NavigateNode liftNode = new NavigateNode(basLift.getPoint$().getX(), basLift.getPoint$().getY());
+ liftNode.setZ(basLift.getPoint$().getZ());
//鑾峰彇灏忚溅鍒拌緭閫佺珯鐐硅璧板懡浠�
NyShuttleOperaResult result = NyShuttleOperaUtils.getStartToTargetCommands(shuttleThread.getSlave().getId(), wrkMast.getWrkNo(), shuttleProtocol.getCurrentLocNo(), recentDevp.getLocNo());
@@ -2343,8 +2344,8 @@
if (basLift.getPoint() == null) {
return false;//娌℃湁璁剧疆鎻愬崌鏈虹偣浣嶅潗鏍�
}
- NavigateNode liftNode = new NavigateNode(basLift.getPoint().getX(), basLift.getPoint().getY());
- liftNode.setZ(basLift.getPoint().getZ());
+ NavigateNode liftNode = new NavigateNode(basLift.getPoint$().getX(), basLift.getPoint$().getY());
+ liftNode.setZ(basLift.getPoint$().getZ());
List<NyShuttleHttpCommand> commands = new ArrayList<>();
//鑾峰彇灏忚溅鍑烘彁鍗囨満琛岃蛋鍛戒护
@@ -2424,8 +2425,8 @@
if (basLift.getPoint() == null) {
return false;//娌℃湁璁剧疆鎻愬崌鏈虹偣浣嶅潗鏍�
}
- NavigateNode liftNode = new NavigateNode(basLift.getPoint().getX(), basLift.getPoint().getY());
- liftNode.setZ(basLift.getPoint().getZ());
+ NavigateNode liftNode = new NavigateNode(basLift.getPoint$().getX(), basLift.getPoint$().getY());
+ liftNode.setZ(basLift.getPoint$().getZ());
//鑾峰彇灏忚溅浠庤緭閫佺珯鍒扮洰鏍囧簱浣嶅懡浠�
NyShuttleOperaResult result = NyShuttleOperaUtils.getStartToTargetCommands(shuttleThread.getSlave().getId(), wrkMast.getWrkNo(), targetBasDevp.getLocNo(), wrkMast.getLocNo());
diff --git a/src/main/resources/mapper/BasLiftMapper.xml b/src/main/resources/mapper/BasLiftMapper.xml
index 2499bd4..484f672 100644
--- a/src/main/resources/mapper/BasLiftMapper.xml
+++ b/src/main/resources/mapper/BasLiftMapper.xml
@@ -10,7 +10,6 @@
<result column="update_by" property="updateBy" />
<result column="memo" property="memo" />
<result column="pak_mk" property="pakMk" />
-
<result column="point" property="point" />
<result column="model" property="model" />
<result column="busy" property="busy" />
--
Gitblit v1.9.1