状态机枚举

ruoyi-system/src/main/java/com/ruoyi/system/controller/DevelopmentInfoController.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.controller;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.ruoyi.system.enums.DevelopmentStatusEnum;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -52,7 +53,7 @@ public class DevelopmentInfoController extends BaseController {
         Integer status = developmentInfo.getStatus();
         List<DevelopmentInfo> list = new ArrayList<>();
         if (status == null) {
-            list = developmentInfoService.selectByStatus("1");
+            list = developmentInfoService.selectByStatus(DevelopmentStatusEnum.DRAFT.getCode()+"");
         } else {
             list = developmentInfoService.selectDevelopmentInfoList(developmentInfo);
         }

ruoyi-system/src/main/java/com/ruoyi/system/controller/ParkInfoController.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.controller;
 import java.util.List;
 
 import com.ruoyi.system.domain.ParkInfoVO;
+import com.ruoyi.system.enums.ParkInfoStatusEnum;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -52,7 +53,7 @@ public class ParkInfoController extends BaseController {
         List<ParkInfo> list;
         startPage();
         if (status == null) {
-            list = parkInfoService.selectByStatus("1");
+            list = parkInfoService.selectByStatus(ParkInfoStatusEnum.DRAFT.getCode()+"");
         } else {
             list = parkInfoService.selectParkInfoList(parkInfo);
         }
@@ -88,7 +89,7 @@ public class ParkInfoController extends BaseController {
     @PostMapping("/add")
     @ResponseBody
     public AjaxResult addSave(ParkInfo parkInfo) {
-        parkInfo.setStatus(1);
+        parkInfo.setStatus(ParkInfoStatusEnum.DRAFT.getCode());
         return toAjax(parkInfoService.insertParkInfo(parkInfo));
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/controller/SubmitExamineLogController.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.system.domain.ParkCarrierInfo;
 import com.ruoyi.system.domain.ParkInfo;
+import com.ruoyi.system.enums.ParkInfoStatusEnum;
 import com.ruoyi.system.service.IParkCarrierInfoService;
 import com.ruoyi.system.service.IParkInfoService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -165,7 +166,7 @@ public class SubmitExamineLogController extends BaseController
         submitExamineLog.setExamineName(currentUser.getUserName());
         ParkInfo parkInfo = new ParkInfo();
         if(submitExamineLog.getType() == 2){
-            parkInfo.setStatus(3);
+            parkInfo.setStatus(ParkInfoStatusEnum.AUTHED.getCode());
             parkInfo.setId(submitExamineLog.getAssociationId());
         }
         return toAjax(submitExamineLogService.updateSubmitParkExamineLog(submitExamineLog, parkInfo));
@@ -194,7 +195,7 @@ public class SubmitExamineLogController extends BaseController
         submitExamineLog.setExamineName(currentUser.getUserName());
         ParkInfo parkInfo = new ParkInfo();
         if(submitExamineLog.getType() == 2){
-            parkInfo.setStatus(4);
+            parkInfo.setStatus(ParkInfoStatusEnum.REJECT.getCode());
             parkInfo.setId(submitExamineLog.getAssociationId());
         }
         return toAjax(submitExamineLogService.updateSubmitParkExamineLog(submitExamineLog, parkInfo));

ruoyi-system/src/main/java/com/ruoyi/system/controller/SubmitExamineLogViewController.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.ParkInfo;
 import com.ruoyi.system.domain.SubmitExamineLog;
 import com.ruoyi.system.domain.SubmitExamineLogView;
+import com.ruoyi.system.enums.ParkInfoStatusEnum;
 import com.ruoyi.system.service.IParkInfoService;
 import com.ruoyi.system.service.ISubmitExamineLogService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -162,7 +163,7 @@ public class SubmitExamineLogViewController extends BaseController
         submitExamineLog.setExamineName(currentUser.getUserName());
         ParkInfo parkInfo = new ParkInfo();
         if(submitExamineLog.getType() == 2){
-            parkInfo.setStatus(3);
+            parkInfo.setStatus(ParkInfoStatusEnum.AUTHED.getCode());
             parkInfo.setId(submitExamineLog.getAssociationId());
         }
         return toAjax(submitExamineLogService.updateSubmitParkExamineLog(submitExamineLog, parkInfo));
@@ -191,7 +192,7 @@ public class SubmitExamineLogViewController extends BaseController
         submitExamineLog.setExamineName(currentUser.getUserName());
         ParkInfo parkInfo = new ParkInfo();
         if(submitExamineLog.getType() == 2){
-            parkInfo.setStatus(4);
+            parkInfo.setStatus(ParkInfoStatusEnum.REJECT.getCode());
             parkInfo.setId(submitExamineLog.getAssociationId());
         }
         return toAjax(submitExamineLogService.updateSubmitParkExamineLog(submitExamineLog, parkInfo));

ruoyi-system/src/main/java/com/ruoyi/system/enums/DevelopmentStatusEnum.java

+package com.ruoyi.system.enums;
+
+public enum DevelopmentStatusEnum {
+    //    认证状态（1-未认证；2-认证中；3-已认证；4-已拒绝9-作废）,
+    DRAFT(1,"草稿"),
+    AUTHING(2,"认证中"),
+    AUTHED(3,"已认证"),
+    REJECT(4,"未通过"),
+    WAITAUTH(5,"待认证"),
+    USELESS(9,"作废");
+    private Integer code;
+    private String description;
+
+    DevelopmentStatusEnum(Integer code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/enums/ParkInfoStatusEnum.java

+package com.ruoyi.system.enums;
+
+public enum ParkInfoStatusEnum {
+    //    认证状态（1-未认证；2-认证中；3-已认证；4-已拒绝9-作废）,
+    DRAFT(1,"草稿"),
+    AUTHING(2,"认证中"),
+    AUTHED(3,"已认证"),
+    REJECT(4,"未通过"),
+    WAITAUTH(5,"待认证"),
+    USELESS(9,"作废");
+    private Integer code;
+    private String description;
+
+    ParkInfoStatusEnum(Integer code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DevelopmentInfoServiceImpl.java

@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.system.domain.ParkInfo;
+import com.ruoyi.system.enums.DevelopmentStatusEnum;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,7 +69,7 @@ public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService {
         developmentInfo.setUpdateTime(DateUtils.getNowDate());
         Long id = developmentInfo.getId();
         Integer status = developmentInfo.getStatus();
-        if (status.equals(3)) {
+        if (status.equals(DevelopmentStatusEnum.AUTHED.getCode())) {
             Long mirrorId = developmentInfo.getMirrorId();
             if (mirrorId != null) {
                 //获取所有子数据
@@ -86,19 +86,19 @@ public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService {
                 myDevelopmentInfo.setStatus(status);
                 //将自己的数据全部复制给原始数据
                 if (developmentInfo2 != null) {
-                    BeanUtils.copyProperties(myDevelopmentInfo, developmentInfo2,"id");
+                    BeanUtils.copyProperties(myDevelopmentInfo, developmentInfo2, "id");
                     developmentInfoMapper.updateDevelopmentInfo(myDevelopmentInfo);
                 }
                 //将其他不为草稿的数据置为作废（排除草稿）
-                developmentInfos = developmentInfos.stream().filter(e -> !e.getStatus().equals(1)).collect(Collectors.toList());
+                developmentInfos = developmentInfos.stream().filter(e -> !e.getStatus().equals(DevelopmentStatusEnum.DRAFT.getCode())).collect(Collectors.toList());
                 for (DevelopmentInfo info : developmentInfos) {
-                    info.setStatus(9);
+                    info.setStatus(DevelopmentStatusEnum.USELESS.getCode());
                     developmentInfoMapper.updateDevelopmentInfo(info);
                 }
                 //把该条子记录删除
                 developmentInfoMapper.deleteDevelopmentInfoById(id);
             }
-        }else {
+        } else {
             developmentInfoMapper.updateDevelopmentInfo(developmentInfo);
         }
         return 1;

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ParkInfoServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.stream.Stream;
 
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.DevelopmentInfo;
+import com.ruoyi.system.enums.ParkInfoStatusEnum;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -78,7 +79,7 @@ public class ParkInfoServiceImpl implements IParkInfoService {
         parkInfo.setUpdateTime(DateUtils.getNowDate());
         Long id = parkInfo.getId();
         Integer status = parkInfo.getStatus();
-        if (status.equals(3)) {
+        if (status.equals(ParkInfoStatusEnum.AUTHED.getCode())) {
             Long mirrorId = parkInfo.getMirrorId();
             if (mirrorId != null) {
                 //获取所有子数据
@@ -94,23 +95,23 @@ public class ParkInfoServiceImpl implements IParkInfoService {
                 myParkInfo.setStatus(status);
                 //将自己的数据全部复制给原始数据
                 if (parkInfo2 != null) {
-                    BeanUtils.copyProperties(myParkInfo, parkInfo2,"id");
+                    BeanUtils.copyProperties(myParkInfo, parkInfo2, "id");
                     parkInfoMapper.updateParkInfo(parkInfo2);
                 }
 
                 //将其他不为草稿的数据置为作废（排除草稿）
-                parkInfos = parkInfos.stream().filter(e -> !e.getStatus().equals(1)).collect(Collectors.toList());
+                parkInfos = parkInfos.stream().filter(e -> !e.getStatus().equals(ParkInfoStatusEnum.DRAFT.getCode())).collect(Collectors.toList());
                 for (ParkInfo info : parkInfos) {
-                    info.setStatus(9);
+                    info.setStatus(ParkInfoStatusEnum.USELESS.getCode());
                     parkInfoMapper.updateParkInfo(info);
                 }
                 //把该条子记录删除
                 parkInfoMapper.deleteParkInfoById(id);
 
-            }else{
+            } else {
                 parkInfoMapper.updateParkInfo(parkInfo);
             }
-        }else{
+        } else {
             parkInfoMapper.updateParkInfo(parkInfo);
         }
         return 1;

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SubmitExamineLogServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import com.ruoyi.system.domain.ParkInfo;
 import com.ruoyi.system.domain.SubmitExamineLogView;
+import com.ruoyi.system.enums.ParkInfoStatusEnum;
 import com.ruoyi.system.service.IParkInfoService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,13 +18,12 @@ import com.ruoyi.common.core.text.Convert;
 
 /**
  * 提交审核日志Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2023-09-25
  */
 @Service
-public class SubmitExamineLogServiceImpl implements ISubmitExamineLogService 
-{
+public class SubmitExamineLogServiceImpl implements ISubmitExamineLogService {
     @Autowired
     private SubmitExamineLogMapper submitExamineLogMapper;
 
@@ -32,79 +32,72 @@ public class SubmitExamineLogServiceImpl implements ISubmitExamineLogService
 
     /**
      * 查询提交审核日志
-     * 
+     *
      * @param id 提交审核日志主键
      * @return 提交审核日志
      */
     @Override
-    public SubmitExamineLog selectSubmitExamineLogById(Long id)
-    {
+    public SubmitExamineLog selectSubmitExamineLogById(Long id) {
         return submitExamineLogMapper.selectSubmitExamineLogById(id);
     }
 
     /**
      * 查询提交审核日志列表
-     * 
+     *
      * @param submitExamineLog 提交审核日志
      * @return 提交审核日志
      */
     @Override
-    public List<SubmitExamineLog> selectSubmitExamineLogList(SubmitExamineLog submitExamineLog)
-    {
+    public List<SubmitExamineLog> selectSubmitExamineLogList(SubmitExamineLog submitExamineLog) {
         return submitExamineLogMapper.selectSubmitExamineLogList(submitExamineLog);
     }
 
     @Override
-    public List<SubmitExamineLog> selectSubmitExamineLogAlreadyList(SubmitExamineLogView submitExamineLogView)
-    {
+    public List<SubmitExamineLog> selectSubmitExamineLogAlreadyList(SubmitExamineLogView submitExamineLogView) {
         return submitExamineLogMapper.selectSubmitExamineLogAlreadyList(submitExamineLogView);
     }
 
     /**
      * 新增提交审核日志
-     * 
+     *
      * @param submitExamineLog 提交审核日志
      * @return 结果
      */
     @Override
-    public int insertSubmitExamineLog(SubmitExamineLog submitExamineLog)
-    {
+    public int insertSubmitExamineLog(SubmitExamineLog submitExamineLog) {
         return submitExamineLogMapper.insertSubmitExamineLog(submitExamineLog);
     }
 
     /**
      * 修改提交审核日志
-     * 
+     *
      * @param submitExamineLog 提交审核日志
      * @return 结果
      */
     @Override
-    public int updateSubmitExamineLog(SubmitExamineLog submitExamineLog)
-    {
+    public int updateSubmitExamineLog(SubmitExamineLog submitExamineLog) {
         return submitExamineLogMapper.updateSubmitExamineLog(submitExamineLog);
     }
 
     /**
      * 批量删除提交审核日志
-     * 
+     *
      * @param ids 需要删除的提交审核日志主键
      * @return 结果
      */
     @Override
-    public int deleteSubmitExamineLogByIds(String ids)
-    {
+    public int deleteSubmitExamineLogByIds(String ids) {
         return submitExamineLogMapper.deleteSubmitExamineLogByIds(Convert.toStrArray(ids));
     }
 
     /**
      * 删除提交审核日志信息
-     * 
+     *
      * @param id 提交审核日志主键
      * @return 结果
      */
     @Override
-    public int deleteSubmitExamineLogById(Long id)
-    {
+    public int deleteSubmitExamineLogById(Long id) {
         return submitExamineLogMapper.deleteSubmitExamineLogById(id);
     }
 
@@ -116,22 +109,21 @@ public class SubmitExamineLogServiceImpl implements ISubmitExamineLogService
      * @return 结果
      */
     @Override
-    public int updateSubmitParkExamineLog(SubmitExamineLog submitExamineLog, ParkInfo parkInfo)
-    {
-        if(submitExamineLog.getType() == 2){
+    public int updateSubmitParkExamineLog(SubmitExamineLog submitExamineLog, ParkInfo parkInfo) {
+        if (submitExamineLog.getType() == 2) {
             parkInfoService.updateParkInfo(parkInfo);
             //作废初始数据
             ParkInfo parkInfoNew = parkInfoService.selectParkInfoById(parkInfo.getId());
             System.out.println(parkInfoNew.toString());
             Long mirrorId = parkInfoNew.getMirrorId();
-            if(ObjectUtils.isNotEmpty(mirrorId)){
+            if (ObjectUtils.isNotEmpty(mirrorId)) {
                 ParkInfo parkInfoOld = parkInfoService.selectParkInfoById(mirrorId);
-                parkInfoOld.setStatus(9);
+                parkInfoOld.setStatus(ParkInfoStatusEnum.USELESS.getCode());
                 parkInfoService.updateParkInfo(parkInfoOld);
                 //作废其他用户数据
-                Map<String,Long> map = new HashMap<>();
-                map.put("id",parkInfo.getId());
-                map.put("mirrorId",mirrorId);
+                Map<String, Long> map = new HashMap<>();
+                map.put("id", parkInfo.getId());
+                map.put("mirrorId", mirrorId);
                 parkInfoService.updateOtherUserParkInfo(map);
             }
         }