代码逻辑优化

knowledgeman-service/src/main/java/com/diagbot/facade/VersionDetailFacade.java

@@ -1,21 +1,11 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import com.diagbot.dto.VersionDetailSpecDTO;
-import com.diagbot.util.BeanUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.VersionDetailDTO;
+import com.diagbot.dto.VersionDetailSpecDTO;
 import com.diagbot.entity.VersionDetail;
 import com.diagbot.entity.VersionInfo;
 import com.diagbot.enums.IsDeleteEnum;
@@ -24,11 +14,21 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.VersionDetailServiceImpl;
 import com.diagbot.service.impl.VersionInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.VersionDetailIdVO;
 import com.diagbot.vo.VersionDetailVO;
 import com.diagbot.vo.VersionInfoAndDetailIdVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 版本详情
@@ -132,22 +132,22 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
             }
             userNames = userNamesDTO.data;
         }
-		
-		// 过滤字段
-		for (VersionDetail versionData : datas) {
-			VersionDetailDTO versionDTO = new VersionDetailDTO();
-			versionDTO.setId(versionData.getId());
-			//versionDTO.setCreator(versionData.getCreator());
-			versionDTO.setModifierid(userNames.get(versionData.getModifier()));
-			versionDTO.setDescription(versionData.getDescription());
-			versionDTO.setGmtCreate(versionData.getGmtCreate());
-			versionDTO.setOrderNo(versionData.getOrderNo());
-			versionDTO.setRemark(versionData.getRemark());
-			versionDTO.setStatus(versionData.getStatus());
-			versionDTO.setTitle(versionData.getTitle());
-			versionDTO.setVersionId(versionData.getVersionId());
-			dataNew.add(versionDTO);
-		}
+
+        // 过滤字段
+        for (VersionDetail versionData : datas) {
+            VersionDetailDTO versionDTO = new VersionDetailDTO();
+            versionDTO.setId(versionData.getId());
+            //versionDTO.setCreator(versionData.getCreator());
+            versionDTO.setModifierid(userNames.get(versionData.getModifier()));
+            versionDTO.setDescription(versionData.getDescription());
+            versionDTO.setGmtCreate(versionData.getGmtCreate());
+            versionDTO.setOrderNo(versionData.getOrderNo());
+            versionDTO.setRemark(versionData.getRemark());
+            versionDTO.setStatus(versionData.getStatus());
+            versionDTO.setTitle(versionData.getTitle());
+            versionDTO.setVersionId(versionData.getVersionId());
+            dataNew.add(versionDTO);
+        }
         return dataNew;
 
     }
@@ -160,7 +160,7 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
      */
     public boolean updateVersionDetail(VersionDetailVO versionDetailVO) {
         // 1.先判断数据是否存在有效
-    	checkExist(versionDetailVO.getDetailId());
+        checkExistMain(versionDetailVO.getDetailId());
         // 2.修改版本详情信息
         VersionDetail versionDetail = new VersionDetail();
 
@@ -187,8 +187,8 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
      * @return
      */
     public boolean cancelVersionDetail(VersionDetailIdVO versionDetailIdVO) {
-    	 // 1.先判断数据是否存在有效
-    	checkExist(versionDetailIdVO.getId());
+        // 1.先判断数据是否存在有效
+        checkExist(versionDetailIdVO.getId());
         UpdateWrapper<VersionDetail> versionDetailNew = new UpdateWrapper<>();
         versionDetailNew.in("id", versionDetailIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey()).set("is_deleted",
                 IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID()).set("gmt_modified", DateUtil.now());
@@ -203,14 +203,9 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
      */
     public boolean addVersionDetail(VersionInfoAndDetailIdVO versionInfoAndDetailIdVO) {
 
-    	//1.增加明细前先判断主版本号的id是否有效
-        QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
-        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", versionInfoAndDetailIdVO.getVersionInfoId());
-        int sum = versionInfoServiceImpl.count(VersionInfoFand);
-        if (sum == 0) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "主版本号数据不存在");
-        }
-        
+        //1.增加明细前先判断主版本号的id是否有效
+        checkExistMain(versionInfoAndDetailIdVO.getVersionInfoId());
+
         List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
         List<VersionDetailVO> datas = versionInfoAndDetailIdVO.getVersionDetail();
         for (VersionDetailVO data : datas) {
@@ -233,18 +228,40 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
 
         return res;
     }
+
     /**
      * 判断数据是否存在有效
      *
      * @param id
      */
     private void checkExist(Long id) {
-    	 // 1.先判断数据是否存在有效
-    	 QueryWrapper<VersionDetail> VersionInfoFand = new QueryWrapper<>();
-         VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
-         int sum = count(VersionInfoFand);
-         if (sum == 0) {
-             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
-         }
+        // 1.先判断数据是否存在有效
+        QueryWrapper<VersionDetail> VersionInfoFand = new QueryWrapper<>();
+        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
+        int sum = count(VersionInfoFand);
+        if (sum == 0) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+        }
+    }
+
+
+    /**
+     * 判断数据是否存在有效(主版本)
+     *
+     * @param id
+     */
+    private void checkExistMain(Long id) {
+        // 1.先判断数据是否存在有效
+        QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
+        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", id);
+        VersionInfo versionInfo = versionInfoServiceImpl.getOne(VersionInfoFand);
+        if (null == versionInfo) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "主版本号数据不存在");
+        }
+        if (StringUtil.isNotBlank(versionInfo.getStatus())
+                && versionInfo.getStatus().equals(String.valueOf(StatusEnum.Disable.getKey()))) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该版本已停用");
+        }
     }
 }

knowledgeman-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -23,6 +23,7 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.IntegerUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.VersionDetailVO;
 import com.diagbot.vo.VersionInfoAllVO;
@@ -149,7 +150,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
                 .set("modifier", UserUtils.getCurrentPrincipleID())
                 .set("gmt_modified", DateUtil.now());
         update(new VersionInfo(), versionInfoUp);
-        
+
         //3.增加版本数据
         VersionInfo versionInfo = new VersionInfo();
         versionInfo.setCreator(UserUtils.getCurrentPrincipleID());
@@ -213,7 +214,9 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         if (dataInfo != null && !dataInfo.getId().equals(versionInfoVO.getId())) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该产品该版本号已存在");
         }
-        if (dataInfo != null && dataInfo.getStatus().equals(StatusEnum.Disable.getKey())) {
+        if (dataInfo != null
+                && StringUtil.isNotBlank(dataInfo.getStatus())
+                && dataInfo.getStatus().equals(String.valueOf(StatusEnum.Disable.getKey()))) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该产品该版本号已停用");
         }
         // 3.修改版本信息