From ac149f8a32daf67f543d54b41e371906b69438e0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 22 十一月 2023 08:33:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasLift.java | 240 ++++++++++++++++++++++-------------------------------------
1 files changed, 91 insertions(+), 149 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasLift.java b/src/main/java/com/zy/asrs/entity/BasLift.java
index 0276d84..cc7b5fa 100644
--- a/src/main/java/com/zy/asrs/entity/BasLift.java
+++ b/src/main/java/com/zy/asrs/entity/BasLift.java
@@ -1,10 +1,13 @@
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;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.zy.core.model.protocol.NyShuttleProtocol;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -72,152 +75,120 @@
private Boolean pakMk;
/**
- * 鎻愬崌鏈洪攣瀹�
+ * 鎻愬崌鏈哄潗鏍�
*/
- @ApiModelProperty(value= "鎻愬崌鏈洪攣瀹�")
- @TableField("lift_lock")
- private Boolean liftLock;
+ @ApiModelProperty(value= "鎻愬崌鏈哄潗鏍�")
+ @TableField("point")
+ private String point;
/**
- * 浣嶇疆鍒拌揪鍙嶉
+ * 妯″紡
*/
- @ApiModelProperty(value= "浣嶇疆鍒拌揪鍙嶉")
- @TableField("position_arrival_feedback")
- private Integer positionArrivalFeedback;
+ @ApiModelProperty(value= "妯″紡")
+ @TableField("model")
+ private Boolean model;
/**
- * 鍑嗗灏辩华
+ * 蹇欓棽
*/
- @ApiModelProperty(value= "鍑嗗灏辩华")
- private Boolean ready;
+ @ApiModelProperty(value= "蹇欓棽")
+ @TableField("busy")
+ private Boolean busy;
/**
- * 杩愯涓�
+ * 鍓嶈秴闄�
*/
- @ApiModelProperty(value= "杩愯涓�")
- private Boolean running;
+ @ApiModelProperty(value= "鍓嶈秴闄�")
+ @TableField("front_overrun")
+ private Boolean frontOverrun;
/**
- * 鑱旀満/鍗曟満
+ * 鍚庤秴闄�
*/
- @ApiModelProperty(value= "鑱旀満/鍗曟満")
- private Boolean mode;
+ @ApiModelProperty(value= "鍚庤秴闄�")
+ @TableField("back_overrun")
+ private Boolean backOverrun;
/**
- * 杈撻�佺嚎鍓嶇鍏夌數鏈夎揣
+ * 宸﹁秴闄�
*/
- @ApiModelProperty(value= "杈撻�佺嚎鍓嶇鍏夌數鏈夎揣")
- @TableField("line_front_has_stock")
- private Boolean lineFrontHasStock;
+ @ApiModelProperty(value= "宸﹁秴闄�")
+ @TableField("left_overrun")
+ private Boolean leftOverrun;
/**
- * 杈撻�佺嚎姝ｈ浆鍙嶉
+ * 鍙宠秴闄�
*/
- @ApiModelProperty(value= "杈撻�佺嚎姝ｈ浆鍙嶉")
- @TableField("forward_rotation_feedback")
- private Boolean forwardRotationFeedback;
+ @ApiModelProperty(value= "鍙宠秴闄�")
+ @TableField("right_overrun")
+ private Boolean rightOverrun;
/**
- * 杈撻�佺嚎鍙嶈浆鍙嶉
+ * 瓒呴珮
*/
- @ApiModelProperty(value= "杈撻�佺嚎鍙嶈浆鍙嶉")
- @TableField("reverse_feedback")
- private Boolean reverseFeedback;
+ @ApiModelProperty(value= "瓒呴珮")
+ @TableField("over_height")
+ private Boolean overHeight;
/**
- * 杈撻�佺嚎鐢垫満杩囪浇
+ * 瓒呴噸
*/
- @ApiModelProperty(value= "杈撻�佺嚎鐢垫満杩囪浇")
- @TableField("motor_overload")
- private Boolean motorOverload;
+ @ApiModelProperty(value= "瓒呴噸")
+ @TableField("over_weight")
+ private Boolean overWeight;
/**
- * 杈撻�佺嚎鏈鍏夌數鏈夎揣
+ * 鏈夋墭鐩�
*/
- @ApiModelProperty(value= "杈撻�佺嚎鏈鍏夌數鏈夎揣")
- @TableField("line_end_has_stock")
- private Boolean lineEndHasStock;
+ @ApiModelProperty(value= "鏈夋墭鐩�")
+ @TableField("has_tray")
+ private Boolean hasTray;
/**
- * 杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�
+ * 鏈夊皬杞�
*/
- @ApiModelProperty(value= "杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�")
- @TableField("in_convey_line_card_tray_alarm")
- private Boolean inConveyLineCardTrayAlarm;
+ @ApiModelProperty(value= "鏈夊皬杞�")
+ @TableField("has_car")
+ private Boolean hasCar;
/**
- * 鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�
+ * 璁惧鏁呴殰
*/
- @ApiModelProperty(value= "鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�")
- @TableField("out_convey_line_card_tray_alarm")
- private Boolean outConveyLineCardTrayAlarm;
+ @ApiModelProperty(value= "璁惧鏁呴殰")
+ @TableField("device_error")
+ private Boolean deviceError;
/**
- * 骞冲彴浣嶇疆鍋忓樊鎶ヨ
+ * 浠诲姟鍦板潃
*/
- @ApiModelProperty(value= "骞冲彴浣嶇疆鍋忓樊鎶ヨ")
- @TableField("plat_position_deviation_alarm")
- private Boolean platPositionDeviationAlarm;
+ @ApiModelProperty(value= "浠诲姟鍦板潃")
+ @TableField("task_address")
+ private Integer taskAddress;
/**
- * 骞冲彴鎵煩鍋忓樊鎶ヨ
+ * 鐩殑鍦板潃
*/
- @ApiModelProperty(value= "骞冲彴鎵煩鍋忓樊鎶ヨ")
- @TableField("plat_torque_deviation_alarm")
- private Boolean platTorqueDeviationAlarm;
+ @ApiModelProperty(value= "鐩殑鍦板潃")
+ @TableField("dist_address")
+ private Integer distAddress;
/**
- * 骞冲彴鍥涘悜杞︽娴�
+ * 宸插畬鎴愪换鍔″彿
*/
- @ApiModelProperty(value= "骞冲彴鍥涘悜杞︽娴�")
- @TableField("plat_shuttle_check")
- private Boolean platShuttleCheck;
+ @ApiModelProperty(value= "宸插畬鎴愪换鍔″彿")
+ @TableField("complete_task_no")
+ private Integer completeTaskNo;
/**
- * 鏈氨缁姸鎬�
+ * 妤煎眰
*/
- @ApiModelProperty(value= "鏈氨缁姸鎬�")
- @TableField("not_ready")
- private Integer notReady;
-
- /**
- * 浼烘湇1閿欒
- */
- @ApiModelProperty(value= "浼烘湇1閿欒")
- @TableField("servo_error1")
- private Integer servoError1;
-
- /**
- * 浼烘湇2閿欒
- */
- @ApiModelProperty(value= "浼烘湇2閿欒")
- @TableField("servo_error2")
- private Integer servoError2;
-
- /**
- * 浼烘湇3閿欒
- */
- @ApiModelProperty(value= "浼烘湇3閿欒")
- @TableField("servo_error3")
- private Integer servoError3;
-
- /**
- * 浼烘湇4閿欒
- */
- @ApiModelProperty(value= "浼烘湇4閿欒")
- @TableField("servo_error4")
- private Integer servoError4;
-
- /**
- * 鎻愬崌鏈哄疄闄呴�熷害鍙嶉
- */
- @ApiModelProperty(value= "鎻愬崌鏈哄疄闄呴�熷害鍙嶉")
- @TableField("lift_actual_speed")
- private Integer liftActualSpeed;
+ @ApiModelProperty(value= "妤煎眰")
+ @TableField("lev")
+ private Integer lev;
public BasLift() {}
- public BasLift(Integer liftNo,Integer status,Integer wrkNo,Date updateTime,Long updateBy,String memo,Boolean pakMk,Boolean liftLock,Integer positionArrivalFeedback,Boolean ready,Boolean running,Boolean mode,Boolean lineFrontHasStock,Boolean forwardRotationFeedback,Boolean reverseFeedback,Boolean motorOverload,Boolean lineEndHasStock,Boolean inConveyLineCardTrayAlarm,Boolean outConveyLineCardTrayAlarm,Boolean platPositionDeviationAlarm,Boolean platTorqueDeviationAlarm,Boolean platShuttleCheck,Integer notReady,Integer servoError1,Integer servoError2,Integer servoError3,Integer servoError4,Integer liftActualSpeed) {
+ 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;
@@ -225,59 +196,23 @@
this.updateBy = updateBy;
this.memo = memo;
this.pakMk = pakMk;
- this.liftLock = liftLock;
- this.positionArrivalFeedback = positionArrivalFeedback;
- this.ready = ready;
- this.running = running;
- this.mode = mode;
- this.lineFrontHasStock = lineFrontHasStock;
- this.forwardRotationFeedback = forwardRotationFeedback;
- this.reverseFeedback = reverseFeedback;
- this.motorOverload = motorOverload;
- this.lineEndHasStock = lineEndHasStock;
- this.inConveyLineCardTrayAlarm = inConveyLineCardTrayAlarm;
- this.outConveyLineCardTrayAlarm = outConveyLineCardTrayAlarm;
- this.platPositionDeviationAlarm = platPositionDeviationAlarm;
- this.platTorqueDeviationAlarm = platTorqueDeviationAlarm;
- this.platShuttleCheck = platShuttleCheck;
- this.notReady = notReady;
- this.servoError1 = servoError1;
- this.servoError2 = servoError2;
- this.servoError3 = servoError3;
- this.servoError4 = servoError4;
- this.liftActualSpeed = liftActualSpeed;
+ this.point = point;
+ this.model = model;
+ this.busy = busy;
+ this.frontOverrun = frontOverrun;
+ this.backOverrun = backOverrun;
+ this.leftOverrun = leftOverrun;
+ this.rightOverrun = rightOverrun;
+ this.overHeight = overHeight;
+ this.overWeight = overWeight;
+ this.hasTray = hasTray;
+ this.hasCar = hasCar;
+ this.deviceError = deviceError;
+ this.taskAddress = taskAddress;
+ this.distAddress = distAddress;
+ this.completeTaskNo = completeTaskNo;
+ this.lev = lev;
}
-
-// BasLift basLift = new BasLift(
-// null, // 鎻愬崌鏈哄彿[闈炵┖]
-// null, // 褰撳墠鎻愬崌鏈虹姸鎬�
-// null, // 浠诲姟鍙�
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 澶囨敞
-// null, // 浣滀笟鏍囪
-// null, // 鎻愬崌鏈洪攣瀹�
-// null, // 浣嶇疆鍒拌揪鍙嶉
-// null, // 鍑嗗灏辩华
-// null, // 杩愯涓�
-// null, // 鑱旀満/鍗曟満
-// null, // 杈撻�佺嚎鍓嶇鍏夌數鏈夎揣
-// null, // 杈撻�佺嚎姝ｈ浆鍙嶉
-// null, // 杈撻�佺嚎鍙嶈浆鍙嶉
-// null, // 杈撻�佺嚎鐢垫満杩囪浇
-// null, // 杈撻�佺嚎鏈鍏夌數鏈夎揣
-// null, // 杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�
-// null, // 鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�
-// null, // 骞冲彴浣嶇疆鍋忓樊鎶ヨ
-// null, // 骞冲彴鎵煩鍋忓樊鎶ヨ
-// null, // 骞冲彴鍥涘悜杞︽娴�
-// null, // 鏈氨缁姸鎬�
-// null, // 浼烘湇1閿欒
-// null, // 浼烘湇2閿欒
-// null, // 浼烘湇3閿欒
-// null, // 浼烘湇4閿欒
-// null // 鎻愬崌鏈哄疄闄呴�熷害鍙嶉
-// );
public String getUpdateTime$(){
if (Cools.isEmpty(this.updateTime)){
@@ -295,5 +230,12 @@
return null;
}
+ public NyShuttleProtocol.NyShuttlePointClass getPoint$() {
+ if (Cools.isEmpty(this.point)){
+ return null;
+ }
+ return JSON.parseObject(this.point, NyShuttleProtocol.NyShuttlePointClass.class);
+ }
+
}
--
Gitblit v1.9.1