From d1ef13d1f116e69a7f44e78d64fd0fe4ce2cad80 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 10 二月 2025 13:17:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasShuttle.java | 190 +++--------------------------------------------
1 files changed, 14 insertions(+), 176 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasShuttle.java b/src/main/java/com/zy/asrs/entity/BasShuttle.java
index c182e77..1ee828b 100644
--- a/src/main/java/com/zy/asrs/entity/BasShuttle.java
+++ b/src/main/java/com/zy/asrs/entity/BasShuttle.java
@@ -9,12 +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;
import com.baomidou.mybatisplus.annotations.TableName;
@@ -112,13 +106,6 @@
private String memo;
/**
- * 鎻愬崌鏈哄彿
- */
- @ApiModelProperty(value= "鎻愬崌鏈哄彿")
- @TableField("lift_no")
- private Integer liftNo;
-
- /**
* 浣滀笟鏍囪
*/
@ApiModelProperty(value= "浣滀笟鏍囪")
@@ -126,127 +113,29 @@
private Boolean pakMk;
/**
- * 灏忚溅蹇欑姸鎬佷綅
+ * 灏忚溅杩愯閫熷害
*/
- @ApiModelProperty(value= "灏忚溅蹇欑姸鎬佷綅")
- @TableField("busy_status")
- private Integer busyStatus;
+ @ApiModelProperty(value= "灏忚溅杩愯閫熷害")
+ @TableField("run_speed")
+ private Integer runSpeed;
/**
- * 褰撳墠浜岀淮鐮�
+ * 璁惧鐘舵��
*/
- @ApiModelProperty(value= "褰撳墠浜岀淮鐮�")
- @TableField("current_code")
- private Integer currentCode;
+ @ApiModelProperty(value= "璁惧鐘舵��")
+ @TableField("device_status")
+ private String deviceStatus;
/**
- * 鐢垫睜鐢甸噺鐧惧垎姣�
+ * 灏忚溅绂佺敤妤煎眰
*/
- @ApiModelProperty(value= "鐢垫睜鐢甸噺鐧惧垎姣�")
- @TableField("battery_power")
- private Integer batteryPower;
-
- /**
- * 鐢垫睜娓╁害
- */
- @ApiModelProperty(value= "鐢垫睜娓╁害")
- @TableField("battery_temp")
- private Integer batteryTemp;
-
- /**
- * 閿欒缂栧彿
- */
- @ApiModelProperty(value= "閿欒缂栧彿")
- @TableField("error_code")
- private Integer errorCode;
-
- /**
- * Plc杈撳嚭鐘舵�両O
- */
- @ApiModelProperty(value= "Plc杈撳嚭鐘舵�両O")
- @TableField("plc_output_status_io")
- private Integer plcOutputStatusIo;
-
- /**
- * 閿欒淇℃伅鐮�
- */
- @ApiModelProperty(value= "閿欒淇℃伅鐮�")
- @TableField("status_error_code")
- private Integer statusErrorCode;
-
- /**
- * PLC杈撳叆鐘舵��
- */
- @ApiModelProperty(value= "PLC杈撳叆鐘舵��")
- @TableField("plc_input_status")
- private Integer plcInputStatus;
-
- /**
- * 褰撳墠鎴栬�呬箣鍓嶈鍒扮殑浜岀淮鐮佸��
- */
- @ApiModelProperty(value= "褰撳墠鎴栬�呬箣鍓嶈鍒扮殑浜岀淮鐮佸��")
- @TableField("current_or_before_code")
- private Integer currentOrBeforeCode;
-
- /**
- * 璇诲埌鐨勪簩缁寸爜X鏂瑰悜鍋忕Щ閲�
- */
- @ApiModelProperty(value= "璇诲埌鐨勪簩缁寸爜X鏂瑰悜鍋忕Щ閲�")
- @TableField("code_offset_x")
- private Integer codeOffsetX;
-
- /**
- * 璇诲埌鐨勪簩缁寸爜Y鏂瑰悜鍋忕Щ閲�
- */
- @ApiModelProperty(value= "璇诲埌鐨勪簩缁寸爜Y鏂瑰悜鍋忕Щ閲�")
- @TableField("code_offset_y")
- private Integer codeOffsetY;
-
- /**
- * 褰撳墠鐨勭數鍘嬪��
- */
- @ApiModelProperty(value= "褰撳墠鐨勭數鍘嬪��")
- @TableField("current_voltage")
- private Integer currentVoltage;
-
- /**
- * 褰撳墠鐨勬ā鎷熼噺鍊�
- */
- @ApiModelProperty(value= "褰撳墠鐨勬ā鎷熼噺鍊�")
- @TableField("current_analog_value")
- private Integer currentAnalogValue;
-
- /**
- * 褰撳墠鐨勫崌闄嶄己鏈嶉�熷害
- */
- @ApiModelProperty(value= "褰撳墠鐨勫崌闄嶄己鏈嶉�熷害")
- @TableField("current_lift_servo_speed")
- private Integer currentLiftServoSpeed;
-
- /**
- * 褰撳墠鐨勮璧颁己鏈嶉�熷害
- */
- @ApiModelProperty(value= "褰撳墠鐨勮璧颁己鏈嶉�熷害")
- @TableField("current_move_servo_speed")
- private Integer currentMoveServoSpeed;
-
- /**
- * 褰撳墠鐨勫崌闄嶄己鏈嶈礋杞界巼
- */
- @ApiModelProperty(value= "褰撳墠鐨勫崌闄嶄己鏈嶈礋杞界巼")
- @TableField("current_lift_servo_load")
- private Integer currentLiftServoLoad;
-
- /**
- * 褰撳墠鐨勮璧颁己鏈嶈礋杞界巼
- */
- @ApiModelProperty(value= "褰撳墠鐨勮璧颁己鏈嶈礋杞界巼")
- @TableField("current_move_servo_load")
- private Integer currentMoveServoLoad;
+ @ApiModelProperty(value= "灏忚溅绂佺敤妤煎眰")
+ @TableField("disable_lev")
+ private String disableLev;
public BasShuttle() {}
- 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 busyStatus,Integer currentCode,Integer batteryPower,Integer batteryTemp,Integer errorCode,Integer plcOutputStatusIo,Integer statusErrorCode,Integer plcInputStatus,Integer currentOrBeforeCode,Integer codeOffsetX,Integer codeOffsetY,Integer currentVoltage,Integer currentAnalogValue,Integer currentLiftServoSpeed,Integer currentMoveServoSpeed,Integer currentLiftServoLoad,Integer currentMoveServoLoad) {
+ 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, Boolean pakMk, String deviceStatus) {
this.shuttleNo = shuttleNo;
this.status = status;
this.shuttleStatus = shuttleStatus;
@@ -259,60 +148,9 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
- this.liftNo = liftNo;
this.pakMk = pakMk;
- this.busyStatus = busyStatus;
- this.currentCode = currentCode;
- this.batteryPower = batteryPower;
- this.batteryTemp = batteryTemp;
- this.errorCode = errorCode;
- this.plcOutputStatusIo = plcOutputStatusIo;
- this.statusErrorCode = statusErrorCode;
- this.plcInputStatus = plcInputStatus;
- this.currentOrBeforeCode = currentOrBeforeCode;
- this.codeOffsetX = codeOffsetX;
- this.codeOffsetY = codeOffsetY;
- this.currentVoltage = currentVoltage;
- this.currentAnalogValue = currentAnalogValue;
- this.currentLiftServoSpeed = currentLiftServoSpeed;
- this.currentMoveServoSpeed = currentMoveServoSpeed;
- this.currentLiftServoLoad = currentLiftServoLoad;
- this.currentMoveServoLoad = currentMoveServoLoad;
+ this.deviceStatus = deviceStatus;
}
-
-// BasShuttle basShuttle = new BasShuttle(
-// null, // 鍥涘悜绌挎杞﹀彿[闈炵┖]
-// null, // 鐘舵��
-// null, // 褰撳墠灏忚溅鐘舵�侊紙鍐呴儴鑷垜缁存姢锛�
-// null, // 浠诲姟鍙�
-// null, // 鏆傚瓨搴撲綅
-// null, // 鑷姩鍏呯數
-// null, // 鐢甸噺绾�
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// 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$(){
if (null == this.status){ return null; }
--
Gitblit v1.9.1