From b7b3328fdfa45cf13d1943fa79d47f1b6bb43f01 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 28 五月 2025 18:22:17 +0800
Subject: [PATCH] 添加定时任务用户

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
index 278ef22..f3fc609 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
@@ -4,10 +4,12 @@
 import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.vincent.rsf.server.system.constant.DictTypeCode;
 import com.vincent.rsf.server.system.entity.DictData;
 import com.vincent.rsf.server.system.service.DictDataService;
 import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -30,6 +32,7 @@
 import com.vincent.rsf.server.system.entity.User;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.stream.Collectors;
 
 @Data
 @Accessors(chain = true)
@@ -53,13 +56,19 @@
      * 浠诲姟鐘舵��
      */
     @ApiModelProperty(value= "浠诲姟鐘舵��")
-    private Short taskStatus;
+    private Integer taskStatus;
+
+    @ApiModelProperty("涓婄骇浠诲姟ID")
+    private Long parentId;
+
+    @ApiModelProperty("浠撳簱绫诲瀷")
+    private String warehType;
 
     /**
      * 浠诲姟绫诲瀷
      */
     @ApiModelProperty(value= "浠诲姟绫诲瀷")
-    private Short taskType;
+    private Integer taskType;
 
     /**
      * 婧愬簱浣�
@@ -145,6 +154,7 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
+    @TableLogic
     private Integer deleted;
 
     /**
@@ -164,6 +174,7 @@
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -177,6 +188,7 @@
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date updateTime;
 
     /**
@@ -187,7 +199,7 @@
 
     public Task() {}
 
-    public Task(String taskCode,Short taskStatus,Short taskType,String orgLoc,String targLoc,String barcode,String robotCode,Short exceStatus,String expDesc,Short sort,String expCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+    public Task(String taskCode,Integer taskStatus,Integer taskType,String orgLoc,String targLoc,String barcode,String robotCode,Short exceStatus,String expDesc,Short sort,String expCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
         this.taskCode = taskCode;
         this.taskStatus = taskStatus;
         this.taskType = taskType;
@@ -246,6 +258,18 @@
         if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
             return null;
         }
+        return dictDatas.getValue() + "." + dictDatas.getLabel();
+    }
+
+    public String getWarehType$(){
+        if (null == this.warehType){ return null; }
+        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+        DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_DEVICE_TYPE)
+                .eq(DictData::getValue, warehType));
+        if (Objects.isNull(dictDatas)) {
+            return null;
+        }
         return dictDatas.getLabel();
     }
 
@@ -260,7 +284,7 @@
         if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
             return null;
         }
-        return dictDatas.getLabel();
+        return dictDatas.getValue() + "." + dictDatas.getLabel();
     }
 
     public String getStartTime$(){

--
Gitblit v1.9.1