Merge branch 'dev/icss' into debug

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

@@ -131,9 +131,10 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
      *
      * @return
      */
-    public Map<Long,QuestionInfo> getQuestionInfos(){
+    public Map<Long,QuestionInfo> getQuestionInfos(List<Long> questionIdList){
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+            .in("id",questionIdList);
         List<QuestionInfo> questionInfoList = this.list(questionInfoQueryWrapper);
         Map<Long,QuestionInfo> map = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getId,questionInfo -> questionInfo));
         return map;

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -22,6 +23,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
 
     @Autowired
     QuestionFacade questionFacade;
+
     /**
      * 获取标签信息
      *
@@ -29,14 +31,17 @@ public class RetrievalFacade extends RetrievalServiceImpl {
      * @return
      */
     public List<RetrievalDTO> getTagInfos(@Valid @RequestBody RetrievalVO retrievalVO) {
-        if(retrievalVO.getInputStr() == null || retrievalVO.getInputStr() == ""){
+        if (retrievalVO.getInputStr() == null || retrievalVO.getInputStr() == "") {
             retrievalVO.setInputStr(" ");
         }
         //获取同义词标签信息
         List<RetrievalDTO> data = this.getSymptopInfo(retrievalVO);
+        List<Long> questionIdList = data.stream()
+                .map(r -> r.getQuestionId())
+                .collect(Collectors.toList());
         //将标签名放入实体
-        Map<Long, QuestionInfo> map = questionFacade.getQuestionInfos();
-        for (RetrievalDTO retrievalDTO:data) {
+        Map<Long, QuestionInfo> map = questionFacade.getQuestionInfos(questionIdList);
+        for (RetrievalDTO retrievalDTO : data) {
             retrievalDTO.setName(map.get(retrievalDTO.getQuestionId()).getTagName());
         }
         return data;