From 184a0722e53f64f40ddb2c88f11f26941f565a8c Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 18 十二月 2024 14:56:44 +0800
Subject: [PATCH] 上报逻辑调整
---
src/main/java/com/zy/asrs/entity/BasShuttle.java | 297 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 232 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasShuttle.java b/src/main/java/com/zy/asrs/entity/BasShuttle.java
index 28d8315..8a25578 100644
--- a/src/main/java/com/zy/asrs/entity/BasShuttle.java
+++ b/src/main/java/com/zy/asrs/entity/BasShuttle.java
@@ -9,11 +9,6 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -41,9 +36,9 @@
private Integer status;
/**
- * 浣滀笟鎬�
+ * 褰撳墠灏忚溅鐘舵�侊紙鍐呴儴鑷垜缁存姢锛�
*/
- @ApiModelProperty(value= "浣滀笟鎬�")
+ @ApiModelProperty(value= "褰撳墠灏忚溅鐘舵�侊紙鍐呴儴鑷垜缁存姢锛�")
@TableField("shuttle_status")
private Integer shuttleStatus;
@@ -53,45 +48,6 @@
@ApiModelProperty(value= "浠诲姟鍙�")
@TableField("wrk_no")
private Integer wrkNo;
-
- /**
- * 鎺�
- */
- @ApiModelProperty(value= "鎺�")
- private Integer row;
-
- /**
- * 鍒�
- */
- @ApiModelProperty(value= "鍒�")
- private Integer bay;
-
- /**
- * 灞�
- */
- @ApiModelProperty(value= "灞�")
- private Integer lev;
-
- /**
- * 鍘嗗彶鎺�
- */
- @ApiModelProperty(value= "鍘嗗彶鎺�")
- @TableField("his_row")
- private Integer hisRow;
-
- /**
- * 鍘嗗彶鍒�
- */
- @ApiModelProperty(value= "鍘嗗彶鍒�")
- @TableField("his_bay")
- private Integer hisBay;
-
- /**
- * 鍘嗗彶灞�
- */
- @ApiModelProperty(value= "鍘嗗彶灞�")
- @TableField("his_lev")
- private Integer hisLev;
/**
* 鏆傚瓨搴撲綅
@@ -158,25 +114,187 @@
private Integer liftNo;
/**
- * 鏍囪
+ * 浣滀笟鏍囪
*/
- @ApiModelProperty(value= "鏍囪")
+ @ApiModelProperty(value= "浣滀笟鏍囪")
@TableField("pak_mk")
- private String pakMk;
+ private Boolean pakMk;
+
+ /**
+ * 灏忚溅杩愯閫熷害
+ */
+ @ApiModelProperty(value= "灏忚溅杩愯閫熷害")
+ @TableField("run_speed")
+ private Integer runSpeed;
+
+ /**
+ * 鐗涚溂-宸ヤ綔妯″紡
+ */
+ @ApiModelProperty(value= "宸ヤ綔妯″紡")
+ @TableField("working_mode")
+ private Integer workingMode;
+
+ /**
+ * 鐗涚溂-杩愯鐘舵��
+ */
+ @ApiModelProperty(value= "杩愯鐘舵��")
+ @TableField("free")
+ private Integer free;
+
+ /**
+ * 鐗涚溂-褰撳墠閫熷害
+ */
+ @ApiModelProperty(value= "褰撳墠閫熷害")
+ @TableField("speed")
+ private Integer speed;
+
+ /**
+ * 鐗涚溂-璐熻浇鐘舵��
+ */
+ @ApiModelProperty(value= "璐熻浇鐘舵��")
+ @TableField("load_state")
+ private Integer loadState;
+
+ /**
+ * 鐗涚溂-绠″埗鐘舵��
+ */
+ @ApiModelProperty(value= "绠″埗鐘舵��")
+ @TableField("suspend_state")
+ private Integer suspendState;
+
+ /**
+ * 鐗涚溂-椤跺崌浣嶇疆
+ */
+ @ApiModelProperty(value= "椤跺崌浣嶇疆")
+ @TableField("lift_position")
+ private Integer liftPosition;
+
+ /**
+ * 鐗涚溂-杩愯鏂瑰悜
+ */
+ @ApiModelProperty(value= "杩愯鏂瑰悜")
+ @TableField("run_dir")
+ private Integer runDir;
+
+ /**
+ * 鐗涚溂-杩愯鏂瑰悜
+ */
+ @ApiModelProperty(value= "杩愯鏂瑰悜")
+ @TableField("run_dir2")
+ private Integer runDir2;
+
+ /**
+ * 鐗涚溂-鍏呯數鐘舵��
+ */
+ @ApiModelProperty(value= "鍏呯數鐘舵��")
+ @TableField("charg_state")
+ private Integer chargState;
+
+ /**
+ * 鐗涚溂-鐢垫睜鐢甸噺
+ */
+ @ApiModelProperty(value= "鐢垫睜鐢甸噺")
+ @TableField("power_percent")
+ private Integer powerPercent;
+
+ /**
+ * 鐗涚溂-鏈�楂樼數鑺數鍘�
+ */
+ @ApiModelProperty(value= "鏈�楂樼數鑺數鍘�")
+ @TableField("max_cell_voltage")
+ private Integer maxCellVoltage;
+
+ /**
+ * 鐗涚溂-鏈�浣庣數鑺數鍘�
+ */
+ @ApiModelProperty(value= "鏈�浣庣數鑺數鍘�")
+ @TableField("min_cell_voltage")
+ private Integer minCellVoltage;
+
+ /**
+ * 鐗涚溂-鐢垫睜鐢靛帇
+ */
+ @ApiModelProperty(value= "鐢垫睜鐢靛帇")
+ @TableField("voltage")
+ private Integer voltage;
+
+ /**
+ * 鐗涚溂-鍏呮斁鐢靛惊鐜鏁�
+ */
+ @ApiModelProperty(value= "鍏呮斁鐢靛惊鐜鏁�")
+ @TableField("charge_cycle_times")
+ private Integer chargeCycleTimes;
+
+ /**
+ * 鐗涚溂-鍓╀綑鐢甸噺
+ */
+ @ApiModelProperty(value= "鍓╀綑鐢甸噺")
+ @TableField("surplus_quantity")
+ private Integer surplusQuantity;
+
+ /**
+ * 鐗涚溂-鎬荤數閲�
+ */
+ @ApiModelProperty(value= "鎬荤數閲�")
+ @TableField("count_quantity")
+ private Integer countQuantity;
+
+ /**
+ * 鐗涚溂-瀹為檯搴撲綅
+ */
+ @ApiModelProperty(value= "瀹為檯搴撲綅")
+ @TableField("point")
+ private String point;
+
+ /**
+ * 鐗涚溂-瀹為檯鍧愭爣
+ */
+ @ApiModelProperty(value= "瀹為檯鍧愭爣")
+ @TableField("coord")
+ private String coord;
+
+ /**
+ * 鐗涚溂-浠诲姟鐩殑搴撲綅
+ */
+ @ApiModelProperty(value= "浠诲姟鐩殑搴撲綅")
+ @TableField("task")
+ private String task;
+
+ /**
+ * 鐗涚溂-浠诲姟鐘舵��
+ */
+ @ApiModelProperty(value= "浠诲姟鐘舵��")
+ @TableField("task_state")
+ private Integer taskState;
+
+ /**
+ * 鐗涚溂-鏁呴殰鐘舵��
+ */
+ @ApiModelProperty(value= "鏁呴殰鐘舵��")
+ @TableField("err_state")
+ private Integer errState;
+
+ /**
+ * 鐗涚溂-鎬婚噷绋嬫暟
+ */
+ @ApiModelProperty(value= "鎬婚噷绋嬫暟")
+ @TableField("status_sum")
+ private String statusSum;
+
+ /**
+ * 鐗涚溂-闈炶嚜鍔ㄧ姸鎬佹椂闂磋鏃�
+ */
+ @ApiModelProperty(value= "闈炶嚜鍔ㄧ姸鎬佹椂闂磋鏃�")
+ @TableField("err_time")
+ private Integer errTime;
public BasShuttle() {}
- public BasShuttle(Integer shuttleNo,Integer status,Integer shuttleStatus,Integer wrkNo,Integer row,Integer bay,Integer lev,Integer hisRow,Integer hisBay,Integer hisLev,String idleLoc,Integer autoCharge,Integer chargeLine,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer liftNo,String pakMk) {
+ public BasShuttle(Integer shuttleNo, Integer status, Integer shuttleStatus, Integer wrkNo, String idleLoc, Integer autoCharge, Integer chargeLine, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer liftNo, Boolean pakMk, Integer runSpeed, Integer workingMode, Integer free, Integer speed, Integer loadState, Integer suspendState, Integer liftPosition, Integer runDir, Integer runDir2, Integer chargState, Integer powerPercent, Integer maxCellVoltage, Integer minCellVoltage, Integer voltage, Integer chargeCycleTimes, Integer surplusQuantity, Integer countQuantity, String point, String coord, String task, Integer taskState, Integer errState, String statusSum, Integer errTime) {
this.shuttleNo = shuttleNo;
this.status = status;
this.shuttleStatus = shuttleStatus;
this.wrkNo = wrkNo;
- this.row = row;
- this.bay = bay;
- this.lev = lev;
- this.hisRow = hisRow;
- this.hisBay = hisBay;
- this.hisLev = hisLev;
this.idleLoc = idleLoc;
this.autoCharge = autoCharge;
this.chargeLine = chargeLine;
@@ -187,19 +305,37 @@
this.memo = memo;
this.liftNo = liftNo;
this.pakMk = pakMk;
+ this.runSpeed = runSpeed;
+ this.workingMode = workingMode;
+ this.free = free;
+ this.speed = speed;
+ this.loadState = loadState;
+ this.suspendState = suspendState;
+ this.liftPosition = liftPosition;
+ this.runDir = runDir;
+ this.runDir2 = runDir2;
+ this.chargState = chargState;
+ this.powerPercent = powerPercent;
+ this.maxCellVoltage = maxCellVoltage;
+ this.minCellVoltage = minCellVoltage;
+ this.voltage = voltage;
+ this.chargeCycleTimes = chargeCycleTimes;
+ this.surplusQuantity = surplusQuantity;
+ this.countQuantity = countQuantity;
+ this.point = point;
+ this.coord = coord;
+ this.task = task;
+ this.taskState = taskState;
+ this.errState = errState;
+ this.statusSum = statusSum;
+ this.errTime = errTime;
}
-// BasShuttle basShuttle = new BasShuttle(
+ // BasShuttle basShuttle = new BasShuttle(
// null, // 鍥涘悜绌挎杞﹀彿[闈炵┖]
// null, // 鐘舵��
-// null, // 浣滀笟鎬�
+// null, // 褰撳墠灏忚溅鐘舵�侊紙鍐呴儴鑷垜缁存姢锛�
// null, // 浠诲姟鍙�
-// null, // 鎺�
-// null, // 鍒�
-// null, // 灞�
-// null, // 鍘嗗彶鎺�
-// null, // 鍘嗗彶鍒�
-// null, // 鍘嗗彶灞�
// null, // 鏆傚瓨搴撲綅
// null, // 鑷姩鍏呯數
// null, // 鐢甸噺绾�
@@ -209,7 +345,24 @@
// null, // 淇敼鏃堕棿
// null, // 澶囨敞
// null, // 鎻愬崌鏈哄彿
-// null // 鏍囪
+// null, // 浣滀笟鏍囪
+// null, // 灏忚溅蹇欑姸鎬佷綅
+// null, // 褰撳墠浜岀淮鐮�
+// null, // 鐢垫睜鐢甸噺鐧惧垎姣�
+// null, // 鐢垫睜娓╁害
+// null, // 閿欒缂栧彿
+// null, // Plc杈撳嚭鐘舵�両O
+// null, // 閿欒淇℃伅鐮�
+// null, // PLC杈撳叆鐘舵��
+// null, // 褰撳墠鎴栬�呬箣鍓嶈鍒扮殑浜岀淮鐮佸��
+// null, // 璇诲埌鐨勪簩缁寸爜X鏂瑰悜鍋忕Щ閲�
+// null, // 璇诲埌鐨勪簩缁寸爜Y鏂瑰悜鍋忕Щ閲�
+// null, // 褰撳墠鐨勭數鍘嬪��
+// null, // 褰撳墠鐨勬ā鎷熼噺鍊�
+// null, // 褰撳墠鐨勫崌闄嶄己鏈嶉�熷害
+// null, // 褰撳墠鐨勮璧颁己鏈嶉�熷害
+// null, // 褰撳墠鐨勫崌闄嶄己鏈嶈礋杞界巼
+// null // 褰撳墠鐨勮璧颁己鏈嶈礋杞界巼
// );
public String getStatus$(){
@@ -256,5 +409,19 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
+ public int getPakMk() {
+ if (Cools.isEmpty(this.pakMk)){
+ return 0;
+ }
+ return this.pakMk ? 1 : 0;
+ }
+
+ public String getPakMk$() {
+ if (Cools.isEmpty(this.pakMk)){
+ return "";
+ }
+ return this.pakMk ? "Y" : "N";
+ }
+
}
--
Gitblit v1.9.1