(fix | improvement)Improve the performance of the chat page retrieve function

Merge pull request #2359 from luowanghaoyun/github_master

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java

@@ -519,6 +519,9 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
 
     private DataItem getDataItem(DimensionDO dimensionDO) {
         ModelResp modelResp = modelService.getModel(dimensionDO.getModelId());
+        if(modelResp == null) {
+            return null;
+        }
         DimensionResp dimensionResp = DimensionConverter.convert2DimensionResp(dimensionDO,
                 ImmutableMap.of(modelResp.getId(), modelResp));
         return DataItem.builder().id(dimensionResp.getId().toString()).name(dimensionResp.getName())
@@ -528,7 +531,9 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
 
     private DataEvent getDataEvent(List<DimensionDO> dimensionDOS, EventType eventType) {
         List<DataItem> dataItems =
-                dimensionDOS.stream().map(this::getDataItem).collect(Collectors.toList());
+                dimensionDOS.stream().map(this::getDataItem)
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toList());
         return new DataEvent(this, dataItems, eventType);
     }
 

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java

@@ -683,7 +683,9 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
 
     private DataEvent getDataEvent(List<MetricDO> metricDOS, EventType eventType) {
         List<DataItem> dataItems =
-                metricDOS.stream().map(this::getDataItem).collect(Collectors.toList());
+                metricDOS.stream().map(this::getDataItem)
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toList());
         return new DataEvent(this, dataItems, eventType);
     }
 

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java

@@ -1,5 +1,6 @@
 package com.tencent.supersonic.headless.server.service.impl;
 
+import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.pojo.enums.DictWordType;
 import com.tencent.supersonic.headless.api.pojo.SchemaElement;
@@ -79,7 +80,7 @@ public class RetrieveServiceImpl implements RetrieveService {
         Set<Long> dataSetIds = queryNLReq.getDataSetIds();
 
         ChatQueryContext chatQueryContext = new ChatQueryContext(queryNLReq);
-        chatQueryContext.setModelIdToDataSetIds(dataSetService.getModelIdToDataSetIds());
+        chatQueryContext.setModelIdToDataSetIds(modelIdToDataSetIds);
 
         Map<MatchText, List<HanlpMapResult>> regTextMap =
                 searchMatchStrategy.match(chatQueryContext, originals, dataSetIds);