删除冗余的状态

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

@@ -6,7 +6,7 @@ import com.shkpr.service.alambizplugin.commproperties.AsyncTaskProperties;
 import com.shkpr.service.alambizplugin.commproperties.GisSurveyCadConvertProperties;
 import com.shkpr.service.alambizplugin.components.GisSurveyCadConverter;
 import com.shkpr.service.alambizplugin.constants.CadEnum;
-import com.shkpr.service.alambizplugin.constants.GisSurveConvertStatusEnum;
+import com.shkpr.service.alambizplugin.constants.CommAsyncStatusEnum;
 import com.shkpr.service.alambizplugin.constants.LogFlagBusiType;
 import com.shkpr.service.alambizplugin.dto.CommAsyncCache;
 import com.shkpr.service.alambizplugin.dto.CommAsyncResult;
@@ -111,8 +111,8 @@ public class GisSurveyCadConvertBizService {
                 //获取结果
                 CommAsyncResult<String> thirdImportResult = previousFuture.get();
                 //如成功/失败,则直接返回
-                if (Objects.equals(thirdImportResult.getStatus(), GisSurveConvertStatusEnum.FAIL.getCode()) ||
-                        Objects.equals(thirdImportResult.getStatus(), GisSurveConvertStatusEnum.SUCCESS.getCode()))
+                if (Objects.equals(thirdImportResult.getStatus(), CommAsyncStatusEnum.FAIL.getCode()) ||
+                        Objects.equals(thirdImportResult.getStatus(), CommAsyncStatusEnum.SUCCESS.getCode()))
                     removeCache(convertId);
                 return thirdImportResult;
             } catch (InterruptedException | ExecutionException e) {

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

@@ -7,7 +7,7 @@ import com.shkpr.service.alambizplugin.commproperties.AsyncTaskProperties;
 import com.shkpr.service.alambizplugin.commproperties.GisSurveySystemCheckProperties;
 import com.shkpr.service.alambizplugin.components.GisSurveySystemCheckResultManager;
 import com.shkpr.service.alambizplugin.components.GisSurveySystemChecker;
-import com.shkpr.service.alambizplugin.constants.GisSurveyCheckStatusEnum;
+import com.shkpr.service.alambizplugin.constants.CommAsyncStatusEnum;
 import com.shkpr.service.alambizplugin.constants.GisSurveyCheckTypeEnum;
 import com.shkpr.service.alambizplugin.constants.LogFlagBusiType;
 import com.shkpr.service.alambizplugin.dbdao.services.intef.GisSurveyJobInfoService;
@@ -100,7 +100,7 @@ public class GisSurveySystemCheckBizService {
             try {
                 //获取结果,并检查失败
                 GisSurveySystemCheckResult gisSurveySystemCheckResult = previousFuture.get();
-                if (Objects.equals(gisSurveySystemCheckResult.getCheckStatus(), GisSurveyCheckStatusEnum.FAIL.getCode()))
+                if (Objects.equals(gisSurveySystemCheckResult.getCheckStatus(), CommAsyncStatusEnum.FAIL.getCode()))
                     return gisSurveySystemCheckResult;
             } catch (InterruptedException | ExecutionException e) {
                 //打印报错信息(不太可能走到这)

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

@@ -8,7 +8,6 @@ import com.shkpr.service.alambizplugin.components.AsyncResultManager;
 import com.shkpr.service.alambizplugin.components.GisSurveyThirdExporter;
 import com.shkpr.service.alambizplugin.constants.CommAsyncStatusEnum;
 import com.shkpr.service.alambizplugin.constants.FileTypeEnum;
-import com.shkpr.service.alambizplugin.constants.GisSurveConvertStatusEnum;
 import com.shkpr.service.alambizplugin.constants.LogFlagBusiType;
 import com.shkpr.service.alambizplugin.dbdao.services.intef.GisSurveyJobInfoService;
 import com.shkpr.service.alambizplugin.dto.CommAsyncCache;
@@ -106,7 +105,7 @@ public class GisSurveyThirdExportBizService {
         //启动任务
         startTask(jobId, fileType, operator);
         //返回进行中
-        return CommAsyncResult.inProgress(jobId, LocalDateTime.now(),operator);
+        return CommAsyncResult.inProgress(jobId, LocalDateTime.now(), operator);
 
     }
 
@@ -147,7 +146,7 @@ public class GisSurveyThirdExportBizService {
                 CommAsyncResult<Map<String, String>> result = previousFuture.get();
                 //如成功/失败,则直接返回
                 if (Objects.equals(result.getStatus(), CommAsyncStatusEnum.FAIL.getCode()) ||
-                        Objects.equals(result.getStatus(), GisSurveConvertStatusEnum.SUCCESS.getCode()))
+                        Objects.equals(result.getStatus(), CommAsyncStatusEnum.SUCCESS.getCode()))
                     removeCache(jobId);
                 return result;
             } catch (InterruptedException | ExecutionException e) {
@@ -202,7 +201,7 @@ public class GisSurveyThirdExportBizService {
         //缓存任务句柄
         TASK_CACHE.put(jobId, future);
         //缓存时间
-        INFO_CACHE.put(jobId, new CommAsyncCache(LocalDateTime.now(),operator));
+        INFO_CACHE.put(jobId, new CommAsyncCache(LocalDateTime.now(), operator));
     }
 
     /**

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

@@ -13,7 +13,7 @@ import com.global.base.log.LogPrintMgr;
 import com.shkpr.service.alambizplugin.commproperties.GisSurveyCadConvertProperties;
 import com.shkpr.service.alambizplugin.commproperties.TempFileProperties;
 import com.shkpr.service.alambizplugin.constants.CadEnum;
-import com.shkpr.service.alambizplugin.constants.GisSurveConvertStatusEnum;
+import com.shkpr.service.alambizplugin.constants.CommAsyncStatusEnum;
 import com.shkpr.service.alambizplugin.constants.LogFlagBusiType;
 import com.shkpr.service.alambizplugin.dto.CommAsyncResult;
 import org.springframework.scheduling.annotation.Async;
@@ -200,7 +200,7 @@ public class GisSurveyCadConverter {
             image.save(filePath.toString(), options);
 
             //转换完成
-            result.setStatus(GisSurveConvertStatusEnum.SUCCESS.getCode());
+            result.setStatus(CommAsyncStatusEnum.SUCCESS.getCode());
             result.setCompleteTime(LocalDateTime.now());
             result.setData(fileName);
 

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

@@ -7,7 +7,7 @@ import com.shkpr.service.alambizplugin.components.checker.DuplicatePointsFinder;
 import com.shkpr.service.alambizplugin.components.checker.IsolatedLinesFinder;
 import com.shkpr.service.alambizplugin.components.checker.IsolatedPointsFinder;
 import com.shkpr.service.alambizplugin.components.checker.OverlapLinesFinder;
-import com.shkpr.service.alambizplugin.constants.GisSurveyCheckStatusEnum;
+import com.shkpr.service.alambizplugin.constants.CommAsyncStatusEnum;
 import com.shkpr.service.alambizplugin.constants.GisSurveyCheckTypeEnum;
 import com.shkpr.service.alambizplugin.constants.GisSurveySystemCheckResultPath;
 import com.shkpr.service.alambizplugin.constants.LogFlagBusiType;
@@ -168,7 +168,7 @@ public class GisSurveySystemChecker {
             }
 
             //完成检查
-            result.setCheckStatus(GisSurveyCheckStatusEnum.SUCCESS.getCode());
+            result.setCheckStatus(CommAsyncStatusEnum.SUCCESS.getCode());
             result.setCompleteTime(LocalDateTime.now());
 
             //写入结果
@@ -209,7 +209,7 @@ public class GisSurveySystemChecker {
             if (overlapLinesFuture != null) overlapLinesFuture.cancel(true);
 
             //失败信息
-            result.setCheckStatus(GisSurveyCheckStatusEnum.FAIL.getCode());
+            result.setCheckStatus(CommAsyncStatusEnum.FAIL.getCode());
             result.setCompleteTime(LocalDateTime.now());
 
             //弃用子任务

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

@@ -9,9 +9,9 @@ import com.shkpr.service.alambizplugin.commtools.ThirdImportTemplateUtils;
 import com.shkpr.service.alambizplugin.components.checker.DuplicatePointsFinder;
 import com.shkpr.service.alambizplugin.components.checker.InvalidLinesFinder;
 import com.shkpr.service.alambizplugin.components.checker.InvalidPropertiesFinder;
+import com.shkpr.service.alambizplugin.constants.CommAsyncStatusEnum;
 import com.shkpr.service.alambizplugin.constants.ExcelEnum;
 import com.shkpr.service.alambizplugin.constants.GisMetadataDefine;
-import com.shkpr.service.alambizplugin.constants.GisSurveyCheckStatusEnum;
 import com.shkpr.service.alambizplugin.constants.GisSurveyExcelDefine;
 import com.shkpr.service.alambizplugin.constants.GisSurveyImportStatusEnum;
 import com.shkpr.service.alambizplugin.constants.LogFlagBusiType;
@@ -214,7 +214,7 @@ public class GisSurveyThirdImporter {
             if (invalidLinesFuture != null) invalidLinesFuture.cancel(true);
 
             //失败信息
-            result.setImportStatus(GisSurveyCheckStatusEnum.FAIL.getCode());
+            result.setImportStatus(CommAsyncStatusEnum.FAIL.getCode());
             result.setCompleteTime(LocalDateTime.now());
 
             //弃用子任务

src/main/java/com/shkpr/service/alambizplugin/constants/GisSurveConvertStatusEnum.java

@@ -1,35 +0,0 @@
-package com.shkpr.service.alambizplugin.constants;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * cad转换状态枚举
- *
- * @author 欧阳劲驰
- * @serial 1.0.0
- */
-@AllArgsConstructor
-@Getter
-public enum GisSurveConvertStatusEnum {
-    /**
-     * 进行中
-     */
-    IN_PROGRESS(0),
-    /**
-     * 成功
-     */
-    SUCCESS(1),
-    /**
-     * 失败
-     */
-    FAIL(2),
-    /**
-     * 不存在
-     */
-    NOT_EXISTS(3);
-    /**
-     * code
-     */
-    private final Integer code;
-}

src/main/java/com/shkpr/service/alambizplugin/constants/GisSurveyCheckStatusEnum.java

@@ -1,35 +0,0 @@
-package com.shkpr.service.alambizplugin.constants;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 系统检查状态枚举
- *
- * @author 欧阳劲驰
- * @serial 1.0.0
- */
-@AllArgsConstructor
-@Getter
-public enum GisSurveyCheckStatusEnum {
-    /**
-     * 进行中
-     */
-    IN_PROGRESS(0),
-    /**
-     * 成功
-     */
-    SUCCESS(1),
-    /**
-     * 失败
-     */
-    FAIL(2),
-    /**
-     * 不存在
-     */
-    NOT_EXISTS(3);
-    /**
-     * code
-     */
-    private final Integer code;
-}

src/main/java/com/shkpr/service/alambizplugin/controller/ApiGisSurveyController.java

@@ -16,8 +16,6 @@ import com.shkpr.service.alambizplugin.constants.ApiURI;
 import com.shkpr.service.alambizplugin.constants.CadEnum;
 import com.shkpr.service.alambizplugin.constants.CommAsyncStatusEnum;
 import com.shkpr.service.alambizplugin.constants.FileTypeEnum;
-import com.shkpr.service.alambizplugin.constants.GisSurveConvertStatusEnum;
-import com.shkpr.service.alambizplugin.constants.GisSurveyCheckStatusEnum;
 import com.shkpr.service.alambizplugin.constants.GisSurveyImportStatusEnum;
 import com.shkpr.service.alambizplugin.constants.LogFlagBusiType;
 import com.shkpr.service.alambizplugin.constants.ResponseCode;
@@ -163,13 +161,13 @@ public class ApiGisSurveyController {
         }
 
         //执行成功
-        if (resultStr != null && !Objects.equals(result.getCheckStatus(), GisSurveyCheckStatusEnum.FAIL.getCode())) {
+        if (resultStr != null && !Objects.equals(result.getCheckStatus(), CommAsyncStatusEnum.FAIL.getCode())) {
             resResult.setRescode(ResponseCode.RESULT_NORMAL.toStrCode());
             resResult.setResmsg(ResponseCode.RESULT_NORMAL.toStrMsg());
             resResult.setResdata(resultStr);
         }
         //执行失败
-        if (resultStr != null && Objects.equals(result.getCheckStatus(), GisSurveyCheckStatusEnum.FAIL.getCode())) {
+        if (resultStr != null && Objects.equals(result.getCheckStatus(), CommAsyncStatusEnum.FAIL.getCode())) {
             resResult.setResdata(resultStr);
         }
         //结果为空
@@ -235,12 +233,12 @@ public class ApiGisSurveyController {
         //清除检查
         GisSurveySystemCheckResult cancelCheck = systemCheckBizService.cancelCheck(oJsonParam);
         //成功
-        if (Objects.equals(cancelCheck.getCheckStatus(), GisSurveyCheckStatusEnum.SUCCESS.getCode())) {
+        if (Objects.equals(cancelCheck.getCheckStatus(), CommAsyncStatusEnum.SUCCESS.getCode())) {
             resResult.setRescode(ResponseCode.RESULT_NORMAL.toStrCode());
             resResult.setResmsg(ResponseCode.RESULT_NORMAL.toStrMsg());
         }
         //不存在
-        else if (Objects.equals(cancelCheck.getCheckStatus(), GisSurveyCheckStatusEnum.NOT_EXISTS.getCode())) {
+        else if (Objects.equals(cancelCheck.getCheckStatus(), CommAsyncStatusEnum.NOT_EXISTS.getCode())) {
             resResult.setRescode(ResponseCode.RESULT_SYSTEM_CHECK_NOT_FOUND.toStrCode());
             resResult.setResmsg(ResponseCode.RESULT_SYSTEM_CHECK_NOT_FOUND.toStrMsg());
         }
@@ -404,13 +402,13 @@ public class ApiGisSurveyController {
         }
 
         //执行成功
-        if (resultStr != null && !Objects.equals(result.getImportStatus(), GisSurveConvertStatusEnum.FAIL.getCode())) {
+        if (resultStr != null && !Objects.equals(result.getImportStatus(), CommAsyncStatusEnum.FAIL.getCode())) {
             resResult.setRescode(ResponseCode.RESULT_NORMAL.toStrCode());
             resResult.setResmsg(ResponseCode.RESULT_NORMAL.toStrMsg());
             resResult.setResdata(resultStr);
         }
         //执行失败
-        if (resultStr != null && Objects.equals(result.getImportStatus(), GisSurveConvertStatusEnum.FAIL.getCode())) {
+        if (resultStr != null && Objects.equals(result.getImportStatus(), CommAsyncStatusEnum.FAIL.getCode())) {
             resResult.setResdata(resultStr);
         }
         //不存在
@@ -474,12 +472,12 @@ public class ApiGisSurveyController {
         //清除导入
         Integer cancelCheck = thirdImportBizService.cancelImport(jobId);
         //成功
-        if (Objects.equals(cancelCheck, GisSurveyCheckStatusEnum.SUCCESS.getCode())) {
+        if (Objects.equals(cancelCheck, CommAsyncStatusEnum.SUCCESS.getCode())) {
             resResult.setRescode(ResponseCode.RESULT_NORMAL.toStrCode());
             resResult.setResmsg(ResponseCode.RESULT_NORMAL.toStrMsg());
         }
         //不存在
-        else if (Objects.equals(cancelCheck, GisSurveyCheckStatusEnum.NOT_EXISTS.getCode())) {
+        else if (Objects.equals(cancelCheck, CommAsyncStatusEnum.NOT_EXISTS.getCode())) {
             resResult.setRescode(ResponseCode.RESULT_ASYNC_TASK_NOT_FOUND.toStrCode());
             resResult.setResmsg(ResponseCode.RESULT_ASYNC_TASK_NOT_FOUND.toStrMsg());
         }
@@ -878,13 +876,13 @@ public class ApiGisSurveyController {
         }
 
         //执行成功
-        if (resultStr != null && !Objects.equals(result.getStatus(), GisSurveConvertStatusEnum.FAIL.getCode())) {
+        if (resultStr != null && !Objects.equals(result.getStatus(), CommAsyncStatusEnum.FAIL.getCode())) {
             resResult.setRescode(ResponseCode.RESULT_NORMAL.toStrCode());
             resResult.setResmsg(ResponseCode.RESULT_NORMAL.toStrMsg());
             resResult.setResdata(resultStr);
         }
         //执行失败
-        if (resultStr != null && Objects.equals(result.getStatus(), GisSurveConvertStatusEnum.FAIL.getCode())) {
+        if (resultStr != null && Objects.equals(result.getStatus(), CommAsyncStatusEnum.FAIL.getCode())) {
             resResult.setResdata(resultStr);
         }
 
@@ -953,13 +951,13 @@ public class ApiGisSurveyController {
         }
 
         //执行成功
-        if (resultStr != null && !Objects.equals(result.getStatus(), GisSurveConvertStatusEnum.FAIL.getCode())) {
+        if (resultStr != null && !Objects.equals(result.getStatus(), CommAsyncStatusEnum.FAIL.getCode())) {
             resResult.setRescode(ResponseCode.RESULT_NORMAL.toStrCode());
             resResult.setResmsg(ResponseCode.RESULT_NORMAL.toStrMsg());
             resResult.setResdata(resultStr);
         }
         //执行失败
-        if (resultStr != null && Objects.equals(result.getStatus(), GisSurveConvertStatusEnum.FAIL.getCode())) {
+        if (resultStr != null && Objects.equals(result.getStatus(), CommAsyncStatusEnum.FAIL.getCode())) {
             resResult.setResdata(resultStr);
         }
         //不存在

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

@@ -1,7 +1,7 @@
 package com.shkpr.service.alambizplugin.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.shkpr.service.alambizplugin.constants.GisSurveConvertStatusEnum;
+import com.shkpr.service.alambizplugin.constants.CommAsyncStatusEnum;
 import com.shkpr.service.alambizplugin.constants.GisSurveyImportStatusEnum;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -60,7 +60,7 @@ public class CommAsyncResult<T> {
     /**
      * 进行中
      */
-    public static <T> CommAsyncResult<T> inProgress(String id, LocalDateTime requestTime,String operator) {
+    public static <T> CommAsyncResult<T> inProgress(String id, LocalDateTime requestTime, String operator) {
         CommAsyncResult<T> result = new CommAsyncResult<>();
         result.setId(id);
         result.setStatus(GisSurveyImportStatusEnum.IN_PROGRESS.getCode());
@@ -75,7 +75,7 @@ public class CommAsyncResult<T> {
     public static <T> CommAsyncResult<T> success(String id) {
         CommAsyncResult<T> result = new CommAsyncResult<>();
         result.setId(id);
-        result.setStatus(GisSurveConvertStatusEnum.SUCCESS.getCode());
+        result.setStatus(CommAsyncStatusEnum.SUCCESS.getCode());
         result.setRequestTime(LocalDateTime.now());
         return result;
     }
@@ -86,7 +86,7 @@ public class CommAsyncResult<T> {
     public static <T> CommAsyncResult<T> fail(String id) {
         CommAsyncResult<T> result = new CommAsyncResult<>();
         result.setId(id);
-        result.setStatus(GisSurveConvertStatusEnum.FAIL.getCode());
+        result.setStatus(CommAsyncStatusEnum.FAIL.getCode());
         result.setRequestTime(LocalDateTime.now());
         return result;
     }

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

@@ -2,7 +2,7 @@ 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 com.shkpr.service.alambizplugin.constants.CommAsyncStatusEnum;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -91,7 +91,7 @@ public class GisSurveySystemCheckResult {
                 result.getOverlapLinesResult().setDone(subtask.getOverlapLinesFuture().isDone());
         }
 
-        result.setCheckStatus(GisSurveyCheckStatusEnum.IN_PROGRESS.getCode());
+        result.setCheckStatus(CommAsyncStatusEnum.IN_PROGRESS.getCode());
         result.setRequestTime(requestTime);
         return result;
     }
@@ -102,7 +102,7 @@ public class GisSurveySystemCheckResult {
     public static GisSurveySystemCheckResult success(GisSurveyCheckParams params) {
         GisSurveySystemCheckResult result = new GisSurveySystemCheckResult();
         BeanUtils.copyProperties(params, result);
-        result.setCheckStatus(GisSurveyCheckStatusEnum.SUCCESS.getCode());
+        result.setCheckStatus(CommAsyncStatusEnum.SUCCESS.getCode());
         result.setRequestTime(LocalDateTime.now());
         return result;
     }
@@ -113,7 +113,7 @@ public class GisSurveySystemCheckResult {
     public static GisSurveySystemCheckResult fail(GisSurveyCheckParams params) {
         GisSurveySystemCheckResult result = new GisSurveySystemCheckResult();
         BeanUtils.copyProperties(params, result);
-        result.setCheckStatus(GisSurveyCheckStatusEnum.FAIL.getCode());
+        result.setCheckStatus(CommAsyncStatusEnum.FAIL.getCode());
         result.setRequestTime(LocalDateTime.now());
         return result;
     }
@@ -124,7 +124,7 @@ public class GisSurveySystemCheckResult {
     public static GisSurveySystemCheckResult notExists(GisSurveyCheckParams params) {
         GisSurveySystemCheckResult result = new GisSurveySystemCheckResult();
         BeanUtils.copyProperties(params, result);
-        result.setCheckStatus(GisSurveyCheckStatusEnum.NOT_EXISTS.getCode());
+        result.setCheckStatus(CommAsyncStatusEnum.NOT_EXISTS.getCode());
         return result;
     }