优化代码6666666

cdssman-service/src/main/java/com/diagbot/facade/KlConceptFacade.java

@@ -39,10 +39,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 import java.util.stream.Collectors;
 
 /**
@@ -155,10 +158,14 @@ public class KlConceptFacade extends KlConceptServiceImpl {
             //保存新数据
             //1.先保存标准词，生成conceptId
             KlConcept klConceptPare = new KlConcept();
+            Long libId = klConceptSaveVO.getLibId();
+            if (null == libId) {
+                libId = Long.valueOf(-(new Random().nextInt(100000)));
+            }
             klConceptPare.setLibName(klConceptSaveVO.getLibName());
             klConceptPare.setLibType(klConceptSaveVO.getLibType());
             klConceptPare.setStatus(klConceptSaveVO.getStatus());
-            klConceptPare.setLibId(klConceptSaveVO.getLibId());
+            klConceptPare.setLibId(libId);
             klConceptPare.setCreator(UserUtils.getCurrentPrincipleID());
             klConceptPare.setModifier(UserUtils.getCurrentPrincipleID());
             klConceptPare.setGmtCreate(now);
@@ -188,7 +195,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
                 }
             }
             //KlConceptCommon
-            if (klConceptSaveVO.getIsHasCommon().equals(1)) {
+            if (null != klConceptSaveVO.getIsHasCommon() && klConceptSaveVO.getIsHasCommon().equals(1)) {
                 KlConceptCommon conceptCommon = new KlConceptCommon();
                 conceptCommon.setSexType(klConceptSaveVO.getSexType());
                 conceptCommon.setMaxAge(klConceptSaveVO.getMaxAge());
@@ -261,7 +268,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
 
         res = klLibraryInfoFacade.update(new KlLibraryInfo(), klLibraryInfoQuerySub);
         //更新kl_concept_common表
-        if (klConceptSaveVO.getIsHasCommon().equals(1)) {
+        if (null != klConceptSaveVO.getIsHasCommon() && klConceptSaveVO.getIsHasCommon().equals(1)) {
             UpdateWrapper<KlConceptCommon> klConceptCommonQuerySub = new UpdateWrapper<>();
             klConceptCommonQuerySub.eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("concept_id", klConceptSaveVO.getConceptId())
@@ -279,7 +286,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
             res = klConceptCommonService.saveOrUpdate(klConceptCommonSub);
         }
         //更新kl_disease
-        if (klConceptSaveVO.getIcdCode() != null) {
+        if (null != klConceptSaveVO.getIcdCode()) {
             KlDisease kllDiseaseSub = new KlDisease();
             kllDiseaseSub.setConceptId(klConceptSaveVO.getConceptId());
             kllDiseaseSub.setGmtModified(now);
@@ -288,7 +295,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
             res = klDiseaseFacade.saveOrUpdate(kllDiseaseSub);
         }
         //更新kl_lis
-        if (klConceptSaveVO.getScopeType() != null) {
+        if (null != klConceptSaveVO.getScopeType()) {
             KlLis klLisSub = new KlLis();
             klLisSub.setConceptId(klConceptSaveVO.getConceptId());
             klLisSub.setGmtModified(now);
@@ -311,7 +318,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
         List<GetAllForRelationDTO> retList = Lists.newArrayList();
 
         if (StringUtil.isNotBlank(getAllForRelationVO.getName())
-                || getAllForRelationVO.getTypeId() != null) {
+                || null != getAllForRelationVO.getTypeId()) {
             List<KlConcept> conceptList = this.list(new QueryWrapper<KlConcept>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .like(StringUtil.isNotBlank(getAllForRelationVO.getName()), "lib_name", getAllForRelationVO.getName().trim())

cdssman-service/src/main/java/com/diagbot/vo/KlConceptSaveVO.java

@@ -3,6 +3,7 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -16,15 +17,19 @@ import java.util.List;
 public class KlConceptSaveVO {
     private Long conceptId;
     private Long libId;
+    @NotBlank(message = "请输入术语名称")
     private String libName;
     private String spell;
+    @NotNull(message = "请输入术语词性type")
     private Integer libType;
     private String synonymName;
+    @NotNull(message = "请输入状态")
     private Integer status;
     //是否标准词,1:是,0:否
     private Integer isConcept = 0;
     private Integer sexType;
     //是否有通用扩展(0:否;1:是)
+    @NotNull(message = "请输入是否有通用扩展")
     private Integer isHasCommon;
     private Double minAge;
     private Double maxAge;

cdssman-service/src/main/java/com/diagbot/web/KlConceptController.java

@@ -62,7 +62,7 @@ public class KlConceptController {
     @PostMapping("/saveConceptInfo")
     @SysLogger("saveConceptInfo")
     @DSTransactional
-    public RespDTO<Boolean> saveConceptInfos(@RequestBody KlConceptSaveVO klConceptSaveVO) {
+    public RespDTO<Boolean> saveConceptInfos(@RequestBody @Valid KlConceptSaveVO klConceptSaveVO) {
         return RespDTO.onSuc(klConceptFacade.saveConceptInfo(klConceptSaveVO));
     }
     @ApiOperation(value = "删除同义词[by:wangfeng]")