Parcourir la source

修改分析详情接口

chenhongyan1989 il y a 2 semaines
Parent
commit
e92527fa4d

+ 5 - 4
energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/impl/AnalysisServiceImpl.java

@@ -502,8 +502,9 @@ public class AnalysisServiceImpl implements AnalysisService {
         if(CollectionUtils.isEmpty(analysisTypeVos)){
             return analysisDetailVos;
         }
+        Set<String> analysisTypeCodes = analysisTypeVos.stream().map(item -> item.getTypeCode()).collect(Collectors.toSet());
         //最新总文件
-        List<AnalysisGeneralFileVo> newGeneralFileVos = getAllGeneralFiles(batchCode,analysisTypeVos,isIntranet);
+        List<AnalysisGeneralFileVo> newGeneralFileVos = getAllGeneralFiles(batchCode,analysisTypeCodes,isIntranet);
         //获取最新分文件
         List<AnalysisDiagramRelationVo> newDiagramRelationVos = getNewDiagramRelations(batchCode, analysisTypeCode, fieldEngineCodes,isIntranet);
         //查询评论
@@ -862,13 +863,13 @@ public class AnalysisServiceImpl implements AnalysisService {
     /**
      * 获取所有分析类型总文件
      * @param batchCode
-     * @param typeVos
+     * @param typeCodes
      * @param isIntranet
      * @return
      */
-    private List<AnalysisGeneralFileVo> getAllGeneralFiles(String batchCode,List<AnalysisTypeVo> typeVos, boolean isIntranet){
+    private List<AnalysisGeneralFileVo> getAllGeneralFiles(String batchCode,Set<String> typeCodes, boolean isIntranet){
         List<AnalysisGeneralFileVo> resultList = new ArrayList<>();
-        typeVos.stream().forEach(typeVo -> resultList.addAll(getNewGeneralFiles(batchCode,typeVo.getTypeCode(),isIntranet)));
+        typeCodes.stream().forEach(typeCode -> resultList.addAll(getNewGeneralFiles(batchCode,typeCode,isIntranet)));
         return resultList;
     }