代码优化

icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -492,6 +492,9 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             return true;
         }
         List<String> idList = Arrays.asList(ids.split(","));
+        if (ListUtil.isEmpty(idList)) {
+            return true;
+        }
         StringBuffer errMsg = new StringBuffer();
         Date now = DateUtil.now();
         String person = UserUtils.getCurrentPrincipleID();
@@ -683,16 +686,16 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         return getQuestionInfoDTOS;
     }
 
-    public List<Long> getQuestionIdsByType(GetQuestionIdsByTypeVO getQuestionIdsByTypeVO) {
-        QueryWrapper<QuestionInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("id", getQuestionIdsByTypeVO.getQuestionIds())
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("type", getQuestionIdsByTypeVO.getQuestionType());
-        List<QuestionInfo> questionInfoList = this.list(queryWrapper);
-        List<Long> questionIds = questionInfoList.stream().map(questionInfo -> questionInfo.getId())
-                .collect(Collectors.toList());
-        return questionIds;
-    }
+//    public List<Long> getQuestionIdsByType(GetQuestionIdsByTypeVO getQuestionIdsByTypeVO) {
+//        QueryWrapper<QuestionInfo> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.in("id", getQuestionIdsByTypeVO.getQuestionIds())
+//                .eq("is_deleted", IsDeleteEnum.N.getKey())
+//                .eq("type", getQuestionIdsByTypeVO.getQuestionType());
+//        List<QuestionInfo> questionInfoList = this.list(queryWrapper);
+//        List<Long> questionIds = questionInfoList.stream().map(questionInfo -> questionInfo.getId())
+//                .collect(Collectors.toList());
+//        return questionIds;
+//    }
 
     /**
      * 根据参数返回标签内容

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

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.GetConceptDetailListDTO;
 import com.diagbot.dto.ConceptDetailDTO;
 import com.diagbot.dto.ConceptIndexDTO;
+import com.diagbot.dto.GetConceptDetailListDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ConceptDetail;
 import com.diagbot.enums.IsDeleteEnum;
@@ -19,9 +19,9 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddConceptDetailVO;
+import com.diagbot.vo.ConceptIndexVO;
 import com.diagbot.vo.GetConceptDetailListVO;
 import com.diagbot.vo.GetConceptDetailVO;
-import com.diagbot.vo.ConceptIndexVO;
 import com.diagbot.vo.RemoveConceptDetailVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -82,6 +82,9 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
                 || IsDeleteEnum.Y.getKey().equals(removeConceptDetailVO.getStatus()))) {
             throw new CommonException(CommonErrorCode.STATUS_IS_ERROR, "状态值错误【Y】或【N】");
         }
+        if (ListUtil.isEmpty(removeConceptDetailVO.getConceptId())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "医学术语静态知识概念id必传");
+        }
         String person = UserUtils.getCurrentPrincipleID();
         List<Long> ids = removeConceptDetailVO.getConceptId();
         Date now = DateUtil.now();

precman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -286,17 +286,27 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
             List<Long> questionIdList = moduleDetailList.stream().map(moduleDetail -> moduleDetail.getQuestionId()).collect(Collectors.toList());
             List<Long> moduleIdList = moduleDetailList.stream().map(moduleDetail -> moduleDetail.getRelationModule()).collect(Collectors.toList());
             //获取标签信息
-            QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-            questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .in("id", questionIdList);
-            List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-            Map<Long, QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getId, questionInfo -> questionInfo));
+            Map<Long, QuestionInfo> questionInfoMap = new HashMap<>();
+            if (ListUtil.isNotEmpty(questionIdList)) {
+                QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+                questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .in("id", questionIdList);
+                List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
+                questionInfoMap = questionInfoList.stream()
+                        .collect(Collectors.toMap(QuestionInfo::getId, questionInfo -> questionInfo));
+            }
+
             //获取模板信息
-            QueryWrapper<ModuleInfo> getRelationModuleWapper = new QueryWrapper<>();
-            questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .in("id", moduleIdList);
-            List<ModuleInfo> moduleInfoList = this.list(getRelationModuleWapper);
-            Map<Long, ModuleInfo> moduleInfoMap = moduleInfoList.stream().collect(Collectors.toMap(ModuleInfo::getId, m -> moduleInfo));
+            Map<Long, ModuleInfo> moduleInfoMap = new HashMap<>();
+            if (ListUtil.isNotEmpty(moduleIdList)) {
+                QueryWrapper<ModuleInfo> getRelationModuleWapper = new QueryWrapper<>();
+                getRelationModuleWapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .in("id", moduleIdList);
+                List<ModuleInfo> moduleInfoList = this.list(getRelationModuleWapper);
+                moduleInfoMap = moduleInfoList.stream()
+                        .collect(Collectors.toMap(ModuleInfo::getId, m -> moduleInfo));
+            }
+
             //循环给出参赋值
             for (ModuleDetail moduleDetail : moduleDetailList) {
                 getModuleDetailInfoDTO = new GetModuleDetailInfoDTO();