From 7635dc25bd2a4d565df496b2d96354639966768d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 25 九月 2025 11:09:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasLift.java | 239 +++++++++--------------------------------------------------
1 files changed, 36 insertions(+), 203 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasLift.java b/src/main/java/com/zy/asrs/entity/BasLift.java
index 67aa7f2..28afce3 100644
--- a/src/main/java/com/zy/asrs/entity/BasLift.java
+++ b/src/main/java/com/zy/asrs/entity/BasLift.java
@@ -1,10 +1,15 @@
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.ArrayList;
import java.util.Date;
+
+import com.zy.common.model.LiftPointModel;
+import com.zy.core.model.LiftStation;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -14,6 +19,7 @@
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
+import java.util.List;
@Data
@TableName("asr_bas_lift")
@@ -72,152 +78,29 @@
private Boolean pakMk;
/**
- * 鎻愬崌鏈洪攣瀹�
+ * 璁惧鐘舵��
*/
- @ApiModelProperty(value= "鎻愬崌鏈洪攣瀹�")
- @TableField("lift_lock")
- private Boolean liftLock;
+ @ApiModelProperty(value= "璁惧鐘舵��")
+ @TableField("device_status")
+ private String deviceStatus;
/**
- * 浣嶇疆鍒拌揪鍙嶉
+ * 鎻愬崌鏈哄潗鏍�
*/
- @ApiModelProperty(value= "浣嶇疆鍒拌揪鍙嶉")
- @TableField("position_arrival_feedback")
- private Integer positionArrivalFeedback;
+ @ApiModelProperty(value= "鎻愬崌鏈哄潗鏍�")
+ @TableField("point")
+ private String point;
/**
- * 鍑嗗灏辩华
+ * 鎻愬崌鏈虹珯鐐�
*/
- @ApiModelProperty(value= "鍑嗗灏辩华")
- private Boolean ready;
-
- /**
- * 杩愯涓�
- */
- @ApiModelProperty(value= "杩愯涓�")
- private Boolean running;
-
- /**
- * 鑱旀満/鍗曟満
- */
- @ApiModelProperty(value= "鑱旀満/鍗曟満")
- private Boolean mode;
-
- /**
- * 杈撻�佺嚎鍓嶇鍏夌數鏈夎揣
- */
- @ApiModelProperty(value= "杈撻�佺嚎鍓嶇鍏夌數鏈夎揣")
- @TableField("line_front_has_stock")
- private Boolean lineFrontHasStock;
-
- /**
- * 杈撻�佺嚎姝ｈ浆鍙嶉
- */
- @ApiModelProperty(value= "杈撻�佺嚎姝ｈ浆鍙嶉")
- @TableField("forward_rotation_feedback")
- private Boolean forwardRotationFeedback;
-
- /**
- * 杈撻�佺嚎鍙嶈浆鍙嶉
- */
- @ApiModelProperty(value= "杈撻�佺嚎鍙嶈浆鍙嶉")
- @TableField("reverse_feedback")
- private Boolean reverseFeedback;
-
- /**
- * 杈撻�佺嚎鐢垫満杩囪浇
- */
- @ApiModelProperty(value= "杈撻�佺嚎鐢垫満杩囪浇")
- @TableField("motor_overload")
- private Boolean motorOverload;
-
- /**
- * 杈撻�佺嚎鏈鍏夌數鏈夎揣
- */
- @ApiModelProperty(value= "杈撻�佺嚎鏈鍏夌數鏈夎揣")
- @TableField("line_end_has_stock")
- private Boolean lineEndHasStock;
-
- /**
- * 杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�
- */
- @ApiModelProperty(value= "杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�")
- @TableField("in_convey_line_card_tray_alarm")
- private Boolean inConveyLineCardTrayAlarm;
-
- /**
- * 鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�
- */
- @ApiModelProperty(value= "鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�")
- @TableField("out_convey_line_card_tray_alarm")
- private Boolean outConveyLineCardTrayAlarm;
-
- /**
- * 骞冲彴浣嶇疆鍋忓樊鎶ヨ
- */
- @ApiModelProperty(value= "骞冲彴浣嶇疆鍋忓樊鎶ヨ")
- @TableField("plat_position_deviation_alarm")
- private Boolean platPositionDeviationAlarm;
-
- /**
- * 骞冲彴鎵煩鍋忓樊鎶ヨ
- */
- @ApiModelProperty(value= "骞冲彴鎵煩鍋忓樊鎶ヨ")
- @TableField("plat_torque_deviation_alarm")
- private Boolean platTorqueDeviationAlarm;
-
- /**
- * 骞冲彴鍥涘悜杞︽娴�
- */
- @ApiModelProperty(value= "骞冲彴鍥涘悜杞︽娴�")
- @TableField("plat_shuttle_check")
- private Boolean platShuttleCheck;
-
- /**
- * 鏈氨缁姸鎬�
- */
- @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("station_list")
+ private String stationList;
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 deviceStatus) {
this.liftNo = liftNo;
this.status = status;
this.wrkNo = wrkNo;
@@ -225,59 +108,8 @@
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.deviceStatus = deviceStatus;
}
-
-// 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,23 +127,24 @@
return null;
}
- public void setPositionArrivalFeedback(Integer lev) {
- switch (lev) {
- case 1:
- case 2:
- this.positionArrivalFeedback = 1;
- break;
- case 4:
- this.positionArrivalFeedback = 2;
- break;
- case 8:
- this.positionArrivalFeedback = 3;
- break;
- case 16:
- this.positionArrivalFeedback = 4;
- break;
+ public List<LiftStation> getStationList$(){
+ List<LiftStation> list = new ArrayList<>();
+ if (Cools.isEmpty(this.stationList)){
+ return list;
}
+
+ List<LiftStation> liftStations = JSON.parseArray(stationList, LiftStation.class);
+ list.addAll(liftStations);
+ return list;
}
+ public LiftPointModel getPoint$(){
+ if (Cools.isEmpty(this.point)){
+ return null;
+ }
+
+ LiftPointModel liftPointModel = JSON.parseObject(point, LiftPointModel.class);
+ return liftPointModel;
+ }
}
--
Gitblit v1.9.1