代码优化

icss-service/src/main/java/com/diagbot/facade/FeatureFacade.java

@@ -55,14 +55,20 @@ public class FeatureFacade {
      * @return
      */
     public List<FeatureConceptDTO> addQuestionId(List<FeatureConceptDTO> concepts, Integer type) {
+        List<String> nameList = concepts
+                .stream()
+                .map(concept -> concept.getName()).collect(Collectors.toList());
+        if (ListUtil.isEmpty(nameList)) {
+            return concepts;
+        }
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        List<String> nameList = concepts.stream().map(concept -> concept.getName()).collect(Collectors.toList());
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("tag_name", nameList)
                 .eq("type", type);
         List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
         if (ListUtil.isNotEmpty(questionInfoList)) {
-            Map<String, QuestionInfo> questionInfoMap = EntityUtil.makeEntityMap(questionInfoList, "tagName");
+            Map<String, QuestionInfo> questionInfoMap
+                    = EntityUtil.makeEntityMap(questionInfoList, "tagName");
             for (FeatureConceptDTO concept : concepts) {
                 if (questionInfoMap.containsKey(concept.getName())) {
                     concept.setId(questionInfoMap.get(concept.getName()).getId());

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -136,7 +136,9 @@ public class PushFacade {
                 List<ConceptPushDTO> vitalDTOList = addQuestionId(vitals, QuestionTypeEnum.Vital.getKey());
                 pushDTO.setVital(vitalDTOList);
                 if (ListUtil.isNotEmpty(vitalDTOList)) {
-                    List<Long> vitalIds = vitalDTOList.stream().map(vital -> vital.getId()).filter(vitalId -> vitalId != null).collect(Collectors.toList());
+                    List<Long> vitalIds = vitalDTOList
+                            .stream()
+                            .map(vital -> vital.getId()).filter(vitalId -> vitalId != null).collect(Collectors.toList());
                     pushDTO.setVitalIds(vitalIds);
                 }
             }
@@ -153,8 +155,11 @@ public class PushFacade {
             if (ListUtil.isNotEmpty(labs)) {
                 List<QuestionPushDTO> lisDTO = Lists.newLinkedList();
                 Map<String, Long> lisMap = new LinkedHashMap<>();
-                List<String> mealNameList = labs.stream().map(lab -> lab.getName()).collect(Collectors.toList());
-                Map<String, QuestionDTO> questionDTOMap = addLisQuestion(mealNameList, pushVO.getAge(), pushVO.getSex());
+                List<String> mealNameList = labs
+                        .stream()
+                        .map(lab -> lab.getName()).collect(Collectors.toList());
+                Map<String, QuestionDTO> questionDTOMap
+                        = addLisQuestion(mealNameList, pushVO.getAge(), pushVO.getSex());
                 for (String name : mealNameList) {
                     QuestionPushDTO questionPushDTO = new QuestionPushDTO();
                     QuestionDTO questionDTO = questionDTOMap.get(name);
@@ -360,7 +365,8 @@ public class PushFacade {
         }
         List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
         if (ListUtil.isNotEmpty(questionInfoList)) {
-            Map<String, QuestionInfo> questionInfoMap = EntityUtil.makeEntityMap(questionInfoList, "tagName");
+            Map<String, QuestionInfo> questionInfoMap
+                    = EntityUtil.makeEntityMap(questionInfoList, "tagName");
             for (ConceptPushDTO concept : concepts) {
                 if (questionInfoMap.containsKey(concept.getName())) {
                     concept.setId(questionInfoMap.get(concept.getName()).getId());
@@ -380,6 +386,9 @@ public class PushFacade {
      */
     public Map<String, QuestionDTO> addLisQuestion(List<String> nameList, Integer age, Integer sex) {
         Map<String, QuestionDTO> mapDTO = new LinkedHashMap<>();
+        if (ListUtil.isEmpty(nameList)) {
+            return mapDTO;
+        }
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                 in("name", nameList).