From 00620a6917d2c4b0df1f62366a489cfe6aed8be1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 02 一月 2025 15:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs-auto
---
src/main/java/com/zy/asrs/entity/BasRgv.java | 271 ++++++++++++++++++++++++-----------------------------
1 files changed, 122 insertions(+), 149 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasRgv.java b/src/main/java/com/zy/asrs/entity/BasRgv.java
index bdd5169..79e6b56 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgv.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgv.java
@@ -3,9 +3,15 @@
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
+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 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;
@@ -29,194 +35,152 @@
private Integer rgvNo;
/**
- * 妯″紡
+ * 鍙叆
*/
- @ApiModelProperty(value= "妯″紡")
- private Integer mode;
+ @ApiModelProperty(value= "鍙叆")
+ @TableField("in_enable")
+ private Integer inEnable;
/**
- * 鐘舵��
+ * 鍙嚭
*/
- @ApiModelProperty(value= "鐘舵��")
+ @ApiModelProperty(value= "鍙嚭")
+ @TableField("out_enable")
+ private Integer outEnable;
+
+ /**
+ * 浣滀笟鎬�
+ */
+ @ApiModelProperty(value= "浣滀笟鎬�")
+ @TableField("rgv_sts")
+ private Integer rgvSts;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "浠诲姟鍙�")
+ @TableField("wrk_no1")
+ private Integer wrkNo1;
+
+ /**
+ * 鍫嗗灈鏈哄彿
+ */
+ @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @TableField("wrk_no2")
+ private Integer wrkNo2;
+
+ /**
+ * 閿欒鐮�
+ */
+ @ApiModelProperty(value= "閿欒鐮�")
+ @TableField("rgv_err")
+ private Long rgvErr;
+
+ /**
+ * 鏍囪
+ */
+ @ApiModelProperty(value= "鏍囪")
+ @TableField("pak_mk")
+ private String pakMk;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
- * 宸ヤ綅1宸ヤ綔鍙�
+ * 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "宸ヤ綅1宸ヤ綔鍙�")
- @TableField("task_no1")
- private Integer taskNo1;
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
/**
- * 宸ヤ綅1鏈夌墿淇″彿
+ * 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "宸ヤ綅1鏈夌墿淇″彿")
- private Integer loaded1;
-
- /**
- * RGV褰撳墠浣嶇疆
- */
- @ApiModelProperty(value= "RGV褰撳墠浣嶇疆")
- @TableField("rgv_pos")
- private Integer rgvPos;
-
- /**
- * 璧拌鍦ㄥ畾浣�
- */
- @ApiModelProperty(value= "璧拌鍦ㄥ畾浣�")
- @TableField("walk_pos")
- private Integer walkPos;
-
- /**
- * 宸ヤ綅2宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綅2宸ヤ綔鍙�")
- @TableField("task_no2")
- private Integer taskNo2;
-
- /**
- * 宸ヤ綅2鏈夌墿淇″彿
- */
- @ApiModelProperty(value= "宸ヤ綅2鏈夌墿淇″彿")
- private Integer loaded2;
-
- /**
- * 宸ヤ綅1浠诲姟瀹屾垚淇″彿
- */
- @ApiModelProperty(value= "宸ヤ綅1浠诲姟瀹屾垚淇″彿")
- @TableField("task_finish1")
- private Integer taskFinish1;
-
- /**
- * 宸ヤ綅2浠诲姟瀹屾垚淇″彿
- */
- @ApiModelProperty(value= "宸ヤ綅2浠诲姟瀹屾垚淇″彿")
- @TableField("task_finish2")
- private Integer taskFinish2;
-
- /**
- * 寮傚父鐮�
- */
- @ApiModelProperty(value= "寮傚父鐮�")
- private Integer alarm;
-
- /**
- * 蹇冭烦
- */
- @ApiModelProperty(value= "蹇冭烦")
- private Integer heart;
-
- /**
- * 澶囩敤1
- */
- @ApiModelProperty(value= "澶囩敤1")
- private Integer temp1;
-
- /**
- * 澶囩敤2
- */
- @ApiModelProperty(value= "澶囩敤2")
- private Integer temp2;
-
- /**
- * 澶囩敤3
- */
- @ApiModelProperty(value= "澶囩敤3")
- private Integer temp3;
-
- /**
- * 澶囩敤4
- */
- @ApiModelProperty(value= "澶囩敤4")
- private Integer temp4;
-
- /**
- * 澶囩敤5
- */
- @ApiModelProperty(value= "澶囩敤5")
- private Integer temp5;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
@TableField("create_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
- * 鍒涘缓浜哄憳
+ * 淇敼浜哄憳
*/
- @ApiModelProperty(value= "鍒涘缓浜哄憳")
- @TableField("create_by")
- private Long createBy;
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
/**
- * 鏇存柊鏃堕棿
+ * 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "鏇存柊鏃堕棿")
+ @ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("update_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
- * 鏇存柊浜哄憳
+ * 澶囨敞
*/
- @ApiModelProperty(value= "鏇存柊浜哄憳")
- @TableField("update_by")
- private Long updateBy;
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
public BasRgv() {}
- public BasRgv(Integer rgvNo,Integer mode,Integer status,Integer taskNo1,Integer loaded1,Integer rgvPos,Integer walkPos,Integer taskNo2,Integer loaded2,Integer taskFinish1,Integer taskFinish2,Integer alarm,Integer heart,Integer temp1,Integer temp2,Integer temp3,Integer temp4,Integer temp5,Date createTime,Long createBy,Date updateTime,Long updateBy) {
+ public BasRgv(Integer rgvNo,Integer inEnable,Integer outEnable,Integer rgvSts,Integer wrkNo1,Integer wrkNo2,Long rgvErr,String pakMk,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.rgvNo = rgvNo;
- this.mode = mode;
+ this.inEnable = inEnable;
+ this.outEnable = outEnable;
+ this.rgvSts = rgvSts;
+ this.wrkNo1 = wrkNo1;
+ this.wrkNo2 = wrkNo2;
+ this.rgvErr = rgvErr;
+ this.pakMk = pakMk;
this.status = status;
- this.taskNo1 = taskNo1;
- this.loaded1 = loaded1;
- this.rgvPos = rgvPos;
- this.walkPos = walkPos;
- this.taskNo2 = taskNo2;
- this.loaded2 = loaded2;
- this.taskFinish1 = taskFinish1;
- this.taskFinish2 = taskFinish2;
- this.alarm = alarm;
- this.heart = heart;
- this.temp1 = temp1;
- this.temp2 = temp2;
- this.temp3 = temp3;
- this.temp4 = temp4;
- this.temp5 = temp5;
- this.createTime = createTime;
this.createBy = createBy;
- this.updateTime = updateTime;
+ this.createTime = createTime;
this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
}
// BasRgv basRgv = new BasRgv(
// null, // RGV缂栧彿[闈炵┖]
-// null, // 妯″紡
+// null, // 鍙叆
+// null, // 鍙嚭
+// null, // 浣滀笟鎬�
+// null, // 浠诲姟鍙�
+// null, // 鍫嗗灈鏈哄彿
+// null, // 閿欒鐮�
+// null, // 鏍囪
// null, // 鐘舵��
-// null, // 宸ヤ綅1宸ヤ綔鍙�
-// null, // 宸ヤ綅1鏈夌墿淇″彿
-// null, // RGV褰撳墠浣嶇疆
-// null, // 璧拌鍦ㄥ畾浣�
-// null, // 宸ヤ綅2宸ヤ綔鍙�
-// null, // 宸ヤ綅2鏈夌墿淇″彿
-// null, // 宸ヤ綅1浠诲姟瀹屾垚淇″彿
-// null, // 宸ヤ綅2浠诲姟瀹屾垚淇″彿
-// null, // 寮傚父鐮�
-// null, // 蹇冭烦
-// null, // 澶囩敤1
-// null, // 澶囩敤2
-// null, // 澶囩敤3
-// null, // 澶囩敤4
-// null, // 澶囩敤5
-// null, // 鍒涘缓鏃堕棿
-// null, // 鍒涘缓浜哄憳
-// null, // 鏇存柊鏃堕棿
-// null // 鏇存柊浜哄憳
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null // 澶囨敞
// );
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
@@ -225,6 +189,15 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
public String getUpdateTime$(){
if (Cools.isEmpty(this.updateTime)){
return "";
--
Gitblit v1.9.1