From 2f8e173048d22c5b40612c3538b9c1aa5a5397f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 27 三月 2026 13:38:05 +0800
Subject: [PATCH] #乐观锁
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 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 81f7e45..bf28c73 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
@@ -3,27 +3,19 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.vincent.rsf.server.manager.service.TaskService;
+import com.vincent.rsf.server.manager.enums.TaskType;
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;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -32,12 +24,10 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
-import java.util.Date;
-import java.util.stream.Collectors;
import com.vincent.rsf.server.manager.service.BasStationService;
@Data
@Accessors(chain = true)
-@TableName("man_task")
+@TableName(value = "man_task", autoResultMap = true)
@ApiModel(value = "Task", description = "浠诲姟妗�")
public class Task implements Serializable {
/**
@@ -61,6 +51,16 @@
*/
@ApiModelProperty(value= "浠诲姟鐘舵��")
private Integer taskStatus;
+
+ /** 鏄惁瀛樺湪鍙墽琛岀殑褰撳墠娴佺▼姝ラ锛岀敤浜庡垪琛ㄦ槸鍚﹀睍绀哄畬鎴愭寜閽� */
+ @TableField(exist = false,select = false)
+ @ApiModelProperty(value = "鏄惁鍙偣鍑诲畬鎴愶紙鏈夊綋鍓嶆楠や笖闈炵粓鎬侊級")
+ private Boolean canComplete;
+
+ /** 鏄惁鍙彇娑堬細娴佺▼姝ラ鑳藉搴斾笂 taskStatus 涓旀湭鍒版渶鍚庝竴姝�(9999) 鏃朵负 true */
+ @TableField(exist = false, select = false)
+ @ApiModelProperty(value = "鏄惁鍙彇娑�")
+ private Boolean canCancel;
@ApiModelProperty("涓婄骇浠诲姟ID")
private Long parentId;
@@ -198,6 +198,9 @@
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
+ @Version
+ private Integer version;
+
/**
* 澶囨敞
*/
@@ -221,6 +224,13 @@
*/
@ApiModelProperty(value= "姝ュ簭缁堢偣")
private String endStep;
+
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List<String> targSiteArea;
+
+ private String targLocArea;
+
+ private String targSiteAreaNow;
public Task() {}
@@ -309,17 +319,7 @@
}
public String getTaskType$() {
- if (Cools.isEmpty(this.taskType)) {
- return null;
- }
- DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
- DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
- .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_TASK_TYPE)
- .eq(DictData::getValue, this.taskType));
- if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
- return null;
- }
- return dictDatas.getValue() + "." + dictDatas.getLabel();
+ return TaskType.getTypeDesc(taskType);
}
public String getStartTime$(){
--
Gitblit v1.9.1