修改：分图去最新地址逻辑修改

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

@@ -160,6 +160,11 @@ public class AnalysisServiceImpl implements AnalysisService {
     private final static String GENERAL_FILE_TYPE_CODE = "total";
 
     /**
+     * 过滤掉html展示
+     */
+    private final static String FILTER_PATTEN = ".html";
+
+    /**
      * 风机编号正则
      */
     private static final String ENGINE_CODE_PATTEN = IdPrefixEnum.WIND_EILL_NUMBER.getCode() + "\\d{3," + IdGeneratorUtil.DEC_INIT_LENGTH + "}";
@@ -675,7 +680,8 @@ public class AnalysisServiceImpl implements AnalysisService {
     private List<AnalysisGeneralFileVo> getNewGeneralFiles(String batchCode,String analysisTypeCode, boolean isIntranet){
         //从数据库获取当前批次、当前分析类型的所有的分析总文件
         List<AnalysisGeneralFileVo> generalFileVos = generalFileMapper.selectByCondition(batchCode,analysisTypeCode);
-        generalFileVos = generalFileVos.stream().filter(item-> StringUtils.isNotBlank(item.getEngineTypeCode()))
+        generalFileVos = generalFileVos.stream().filter(item-> StringUtils.isNotBlank(item.getEngineTypeCode())
+                        && !item.getFileAddr().endsWith(FILTER_PATTEN))
                 .collect(Collectors.groupingBy(
                         AnalysisGeneralFileVo::getEngineTypeCode,
                         Collectors.maxBy(Comparator.comparing(AnalysisGeneralFileVo::getCreateTime)))
@@ -703,9 +709,10 @@ public class AnalysisServiceImpl implements AnalysisService {
         if(CollectionUtils.isEmpty(diagramRelationVos)){
             return diagramRelationVos;
         }
+        diagramRelationVos = diagramRelationVos.stream().filter(item -> !item.getFileAddr().endsWith(FILTER_PATTEN)).collect(Collectors.toList());
         //根据机组分组获取每组最新文件
         diagramRelationVos = diagramRelationVos.stream().collect(Collectors.groupingBy(
-                        AnalysisDiagramRelationVo::getFieldEngineCode,
+                        AnalysisDiagramRelationVo::getFileAddr,
                         Collectors.maxBy(Comparator.comparing(AnalysisDiagramRelationVo::getCreateTime)))
                 ).values().stream().map(Optional::get)
                 //对风机编号进行排序