增加操作人字段,增加入参返回值中回显,修复json校验无效的问题

src/main/java/com/shkpr/service/alambizplugin/apiparam/GisSurveyCheckParams.java

@@ -1,7 +1,7 @@
 package com.shkpr.service.alambizplugin.apiparam;
 
 import com.shkpr.service.alambizplugin.constants.GisSurveyCheckTypeEnum;
-import com.shkpr.service.alambizplugin.controllervalid.CommonParamValidDel;
+import com.shkpr.service.alambizplugin.controllervalid.CommonParamValidSK;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
@@ -23,20 +23,27 @@ public class GisSurveyCheckParams {
     /**
      * 检查类型:0:项目,1:任务
      */
-    @NotNull(groups = {CommonParamValidDel.class})
+    @NotNull(groups = {CommonParamValidSK.class})
     private Integer checkType;
     /**
      * 项目id
      */
-    @Size(max = 64, groups = {CommonParamValidDel.class})
+    @Size(max = 64, groups = {CommonParamValidSK.class})
     private String projId;
     /**
      * 任务id
      */
-    @Size(max = 64, groups = {CommonParamValidDel.class})
+    @Size(max = 64, groups = {CommonParamValidSK.class})
     private String jobId;
 
     /**
+     * 当前操作人id
+     */
+    @NotNull(groups = {CommonParamValidSK.class})
+    @Size(max = 64, groups = {CommonParamValidSK.class})
+    private String operator;
+
+    /**
      * 入参校验
      *
      * @return 校验状态

src/main/java/com/shkpr/service/alambizplugin/bizservice/GisSurveyBizService.java

@@ -60,19 +60,19 @@ public class GisSurveyBizService {
     public GisSurveyCheckResult sysCheckFun(GisSurveyCheckParams params) {
         //任务标识
         GisSurveyCheckTaskId taskId = generateTaskId(params);
-        if (taskId == null) return GisSurveyCheckResult.notExists();
+        if (taskId == null) return GisSurveyCheckResult.notExists(params);
         //获取已存在的任务
         ListenableFuture<GisSurveyCheckResult> previousFuture = FUTURE_CACHE.get(taskId);
         //进行中判断(未完成且未清除)
         if (previousFuture != null && !previousFuture.isDone() && !previousFuture.isCancelled())
-            return GisSurveyCheckResult.inProgress(TIME_CACHE.get(taskId));
+            return GisSurveyCheckResult.inProgress(params, TIME_CACHE.get(taskId));
         //已结束判断,删除缓存
         if (previousFuture != null && (previousFuture.isDone() || previousFuture.isCancelled()))
             FUTURE_CACHE.remove(taskId);
         //启动检查任务
         startTask(taskId, params);
         //返回进行中
-        return GisSurveyCheckResult.inProgress(LocalDateTime.now());
+        return GisSurveyCheckResult.inProgress(params, LocalDateTime.now());
     }
 
     /**
@@ -84,12 +84,12 @@ public class GisSurveyBizService {
     public GisSurveyCheckResult getResult(GisSurveyCheckParams params) {
         //任务标识
         GisSurveyCheckTaskId taskId = generateTaskId(params);
-        if (taskId == null) return GisSurveyCheckResult.notExists();
+        if (taskId == null) return GisSurveyCheckResult.notExists(params);
         //获取任务
         ListenableFuture<GisSurveyCheckResult> checkFuture = FUTURE_CACHE.get(taskId);
-        if (checkFuture == null) return GisSurveyCheckResult.notExists();
+        if (checkFuture == null) return GisSurveyCheckResult.notExists(params);
         //已结束,则直接返回失败(如完成cancelled为false,切无法clear)
-        if (checkFuture.isCancelled()) return GisSurveyCheckResult.fail();
+        if (checkFuture.isCancelled()) return GisSurveyCheckResult.fail(params);
         //完成判断,如完成直接返回结果
         if (checkFuture.isDone()) {
             try {
@@ -103,11 +103,11 @@ public class GisSurveyBizService {
                                 , e.getMessage()
                         )
                 );
-                return GisSurveyCheckResult.fail();
+                return GisSurveyCheckResult.fail(params);
             }
         }
         //返回进行中
-        return GisSurveyCheckResult.inProgress(TIME_CACHE.get(taskId));
+        return GisSurveyCheckResult.inProgress(params, TIME_CACHE.get(taskId));
     }
 
     /**
@@ -119,11 +119,11 @@ public class GisSurveyBizService {
     public GisSurveyCheckResult delResult(GisSurveyCheckParams params) {
         //任务标识
         GisSurveyCheckTaskId taskId = generateTaskId(params);
-        if (taskId == null) return GisSurveyCheckResult.fail();
+        if (taskId == null) return GisSurveyCheckResult.fail(params);
         //如无缓存,则直接返回不存在
-        if (!FUTURE_CACHE.containsKey(taskId)) return GisSurveyCheckResult.notExists();
+        if (!FUTURE_CACHE.containsKey(taskId)) return GisSurveyCheckResult.notExists(params);
         //关闭检查任务
-        return stopTask(taskId) ? GisSurveyCheckResult.success() : GisSurveyCheckResult.fail();
+        return stopTask(taskId) ? GisSurveyCheckResult.success(params) : GisSurveyCheckResult.fail(params);
     }
 
     /**

src/main/java/com/shkpr/service/alambizplugin/components/GisSurveySystemChecker.java

@@ -74,7 +74,7 @@ public class GisSurveySystemChecker {
         //检查类型
         Integer checkType = params.getCheckType();
         //构建返回
-        GisSurveyCheckResult result = GisSurveyCheckResult.fail();
+        GisSurveyCheckResult result = GisSurveyCheckResult.fail(params);
         //孤立点任务
         ListenableFuture<List<String>> isolatedPointsFuture = null;
         //孤立线任务

src/main/java/com/shkpr/service/alambizplugin/dto/GisSurveyCheckResult.java

@@ -1,8 +1,10 @@
 package com.shkpr.service.alambizplugin.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.shkpr.service.alambizplugin.apiparam.GisSurveyCheckParams;
 import com.shkpr.service.alambizplugin.constants.GisSurveyCheckStatusEnum;
 import lombok.Data;
+import org.springframework.beans.BeanUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
@@ -33,6 +35,10 @@ public class GisSurveyCheckResult {
      */
     private String jobId;
     /**
+     * 当前操作人id
+     */
+    private String operator;
+    /**
      * 请求检查时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh_CN", timezone = "Asia/Shanghai")
@@ -64,8 +70,9 @@ public class GisSurveyCheckResult {
     /**
      * 进行中
      */
-    public static GisSurveyCheckResult inProgress(LocalDateTime requestTime) {
+    public static GisSurveyCheckResult inProgress(GisSurveyCheckParams params, LocalDateTime requestTime) {
         GisSurveyCheckResult result = new GisSurveyCheckResult();
+        BeanUtils.copyProperties(params, result);
         result.setCheckStatus(GisSurveyCheckStatusEnum.IN_PROGRESS.getCode());
         result.setRequestTime(requestTime);
         return result;
@@ -74,8 +81,9 @@ public class GisSurveyCheckResult {
     /**
      * 成功
      */
-    public static GisSurveyCheckResult success() {
+    public static GisSurveyCheckResult success(GisSurveyCheckParams params) {
         GisSurveyCheckResult result = new GisSurveyCheckResult();
+        BeanUtils.copyProperties(params, result);
         result.setCheckStatus(GisSurveyCheckStatusEnum.SUCCESS.getCode());
         result.setRequestTime(LocalDateTime.now());
         return result;
@@ -84,8 +92,9 @@ public class GisSurveyCheckResult {
     /**
      * 失败
      */
-    public static GisSurveyCheckResult fail() {
+    public static GisSurveyCheckResult fail(GisSurveyCheckParams params) {
         GisSurveyCheckResult result = new GisSurveyCheckResult();
+        BeanUtils.copyProperties(params, result);
         result.setCheckStatus(GisSurveyCheckStatusEnum.FAIL.getCode());
         result.setRequestTime(LocalDateTime.now());
         return result;
@@ -94,8 +103,9 @@ public class GisSurveyCheckResult {
     /**
      * 不存在
      */
-    public static GisSurveyCheckResult notExists() {
+    public static GisSurveyCheckResult notExists(GisSurveyCheckParams params) {
         GisSurveyCheckResult result = new GisSurveyCheckResult();
+        BeanUtils.copyProperties(params, result);
         result.setCheckStatus(GisSurveyCheckStatusEnum.NOT_EXISTS.getCode());
         return result;
     }