驾驶舱 相关统计 接口服务 消缺

src/main/java/com/energy/manage/analyse/controller/anomaly/AnomalyController.java

@@ -47,8 +47,8 @@ public class AnomalyController extends BaseServiceController {
 
     @ApiOperation("查询异常风机概览")
     @PostMapping("/getAnomalyOverview")
-    public ResultResp<List<AnomalyOverviewVO>> getAnomalyOverview(@RequestBody AnomalyDTO anomalyDTO){
-        List<AnomalyOverviewVO> anomalyOverview= anomalyService.getAnomalyOverview(anomalyDTO);
+    public ResultResp<List<AnomalyOverviewVO>> getAnomalyOverview(@RequestBody List<AnomalyDTO> anomalyDTOList){
+        List<AnomalyOverviewVO> anomalyOverview= anomalyService.getAnomalyOverview(anomalyDTOList);
         return success(anomalyOverview);
     }
 

src/main/java/com/energy/manage/analyse/controller/healthscores/HealthscoresController.java

@@ -3,6 +3,7 @@ package com.energy.manage.analyse.controller.healthscores;
 import com.energy.manage.analyse.common.DateUtil;
 import com.energy.manage.analyse.common.reponse.ResultResp;
 import com.energy.manage.analyse.controller.base.BaseServiceController;
+import com.energy.manage.analyse.domain.dto.HealthDTO;
 import com.energy.manage.analyse.domain.vo.healthscores.HealthOverviewVO;
 import com.energy.manage.analyse.domain.vo.healthscores.HealthscoresRegionVO;
 import com.energy.manage.analyse.domain.vo.healthscores.HealthscoresTendencyVO;
@@ -13,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -47,12 +49,8 @@ public class HealthscoresController extends BaseServiceController {
 
     @ApiOperation("首页风场健康台数统计数据")
     @PostMapping("/getHealthscoresWindList")
-    public ResultResp<List<HealthscoresWindVO>> getHealthscoresWindList(
-                                                                @ApiParam(value = "fieldCode参数为平台内部风场编号，当参数为空时，默认查全部风场", required = false)
-                                                                @RequestParam(value = "fieldCode",required = false) String fieldCode,
-                                                                @ApiParam(value = "datatime参数为查询日期，当参数为空时，默认查昨天日期的数据", required = false)
-                                                                @RequestParam(value = "datatime",required = false) String datatime){
-        List<HealthscoresWindVO> list = healthscoresService.getHealthscoresWind(fieldCode,datatime);
+    public ResultResp<List<HealthscoresWindVO>> getHealthscoresWindList(@RequestBody List<HealthDTO> healthDTOList){
+        List<HealthscoresWindVO> list = healthscoresService.getHealthscoresWind(healthDTOList);
         return success(list);
     }
 

src/main/java/com/energy/manage/analyse/domain/dto/HealthDTO.java

@@ -0,0 +1,19 @@
+package com.energy.manage.analyse.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@ApiModel("健康评估风场参数")
+public class HealthDTO {
+
+    @ApiModelProperty("风场code")
+    private String fieldCode;
+
+
+    @ApiModelProperty("查询日期")
+    private String datatime;
+}

src/main/java/com/energy/manage/analyse/mappers/anomaly/AnomalyWindfarmMapper.java

@@ -11,7 +11,6 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-
 /**
  * 异常检测mappser接口
  */
@@ -19,136 +18,138 @@ import java.util.List;
 public interface AnomalyWindfarmMapper extends MyMapper<AnomalyWindfarmPO> {
 
         /**
-     * 查询区域异常情况信息
-     * 
-     * @param fieldIds
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    AnomalyRegionVO getAnomalyListByFieldIds(@Param("fieldIds") List<String> fieldIds,
-            @Param("beginTime") String beginTime,
-            @Param("endTime") String endTime);
-
-    /**
-     * 异常检测统计
-     * @param fieldId
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    List<AnomalyOverviewVO> selectAnomalyWindfarmAndFieldId(@Param("fieldId") String fieldId,
-                                                      @Param("beginTime") String beginTime,
-                                                      @Param("endTime") String endTime);
-
-
-    /**
-     * 柱状图
-     * @param fieldId
-     * @param year
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    BarChartVO selectAnomalyModelCount(@Param("fieldId") String fieldId,
-                                       @Param("year") String year,
-                                       @Param("beginTime") String beginTime,
-                                       @Param("endTime") String endTime);
-
-
-    /**
-     * 检测器he传感器通用
-     * @param fieldId
-     * @param year
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    List<AnomalyModelPO> selectAllAnomalyModel(@Param("fieldId") String fieldId,
-                                               @Param("year") String year,
-                                               @Param("beginTime") String beginTime,
-                                               @Param("endTime") String endTime);
-
-
-    /**
-     * 异常检测器
-     * @param fieldId
-     * @param engineId
-     * @param tableName
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    BaseAnomalyDetectorPO selectAnomalyDetectorAll(@Param("fieldId") String fieldId,
-                                                   @Param("tableName") String tableName,
-                                                   @Param("engineId") String engineId,
-                                                   @Param("beginTime") String beginTime,
-                                                   @Param("endTime") String endTime);
-
-
-    /**
-     *  单表统计：指定年度表
-     * @param fieldId
-     * @param engineId
-     * @param tableName
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    List<AnomalyDailyVO> selectBySingleTable(@Param("fieldId") String fieldId,
-                                             @Param("engineId") String engineId,
-                                             @Param("tableName") String tableName,
-                                             @Param("startDate") String beginTime,
-                                             @Param("endDate") String endTime);
-
-
+         * 查询区域异常情况信息
+         * 
+         * @param fieldIds
+         * @param beginTime
+         * @param endTime
+         * @return
+         */
+        AnomalyRegionVO getAnomalyListByFieldIds(@Param("fieldIds") List<String> fieldIds,
+                        @Param("beginTime") String beginTime,
+                        @Param("endTime") String endTime);
 
+        /**
+         * 异常检测统计
+         * 
+         * @param fieldId
+         * @param beginTime
+         * @param endTime
+         * @return
+         */
+        // List<AnomalyOverviewVO> selectAnomalyWindfarmAndFieldId(@Param("fieldId")
+        // String fieldId,
+        // @Param("beginTime") String beginTime,
+        // @Param("endTime") String endTime);
+        List<AnomalyOverviewVO> selectAnomalyWindfarmAndFieldId(@Param("fieldIds") List<String> fieldIds,
+                        @Param("beginTime") String beginTime,
+                        @Param("endTime") String endTime);
 
-    /**
-     *  跨表统计：指定年度表
-     * @param fieldId
-     * @param engineId
-     * @param table1，table2
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    List<AnomalyDailyVO> selectByUnionTables(@Param("fieldId") String fieldId,
-                                             @Param("engineId") String engineId,
-                                             @Param("table1") String table1,
-                                             @Param("table2") String table2,
-                                             @Param("startDate") String beginTime,
-                                             @Param("endDate") String endTime);
+        /**
+         * 柱状图
+         * 
+         * @param fieldId
+         * @param year
+         * @param beginTime
+         * @param endTime
+         * @return
+         */
+        BarChartVO selectAnomalyModelCount(@Param("fieldId") String fieldId,
+                        @Param("year") String year,
+                        @Param("beginTime") String beginTime,
+                        @Param("endTime") String endTime);
 
+        /**
+         * 检测器he传感器通用
+         * 
+         * @param fieldId
+         * @param year
+         * @param beginTime
+         * @param endTime
+         * @return
+         */
+        List<AnomalyModelPO> selectAllAnomalyModel(@Param("fieldId") String fieldId,
+                        @Param("year") String year,
+                        @Param("beginTime") String beginTime,
+                        @Param("endTime") String endTime);
 
-    /**
-     * 根据风场查询异常个数传感器
-     * @param fieldId
-     * @param year
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    AnomalySensorCountVO selectAnomalySensorCountVO(@Param("fieldId") String fieldId,
-                                                    @Param("year") String year,
-                                                    @Param("beginTime") String beginTime,
-                                                    @Param("endTime") String endTime);
+        /**
+         * 异常检测器
+         * 
+         * @param fieldId
+         * @param engineId
+         * @param tableName
+         * @param beginTime
+         * @param endTime
+         * @return
+         */
+        BaseAnomalyDetectorPO selectAnomalyDetectorAll(@Param("fieldId") String fieldId,
+                        @Param("tableName") String tableName,
+                        @Param("engineId") String engineId,
+                        @Param("beginTime") String beginTime,
+                        @Param("endTime") String endTime);
 
+        /**
+         * 单表统计：指定年度表
+         * 
+         * @param fieldId
+         * @param engineId
+         * @param tableName
+         * @param beginTime
+         * @param endTime
+         * @return
+         */
+        List<AnomalyDailyVO> selectBySingleTable(@Param("fieldId") String fieldId,
+                        @Param("engineId") String engineId,
+                        @Param("tableName") String tableName,
+                        @Param("startDate") String beginTime,
+                        @Param("endDate") String endTime);
 
-    /**
-     * 异常检测模块统计异常风机台数
-     * @param fieldId
-     * @param year
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    AnomalyCount selectModeCount(@Param("fieldId") String fieldId,
-                                 @Param("year") String year,
-                                 @Param("beginTime") String beginTime,
-                                 @Param("endTime") String endTime);
+        /**
+         * 跨表统计：指定年度表
+         * 
+         * @param fieldId
+         * @param engineId
+         * @param table1，table2
+         * @param beginTime
+         * @param endTime
+         * @return
+         */
+        List<AnomalyDailyVO> selectByUnionTables(@Param("fieldId") String fieldId,
+                        @Param("engineId") String engineId,
+                        @Param("table1") String table1,
+                        @Param("table2") String table2,
+                        @Param("startDate") String beginTime,
+                        @Param("endDate") String endTime);
 
+        /**
+         * 根据风场查询异常个数传感器
+         * 
+         * @param fieldId
+         * @param year
+         * @param beginTime
+         * @param endTime
+         * @return
+         */
+        AnomalySensorCountVO selectAnomalySensorCountVO(@Param("fieldId") String fieldId,
+                        @Param("year") String year,
+                        @Param("beginTime") String beginTime,
+                        @Param("endTime") String endTime);
 
-    Integer   selectEngineCountByCode ( @Param("companyCode") String companyCode);
+        /**
+         * 异常检测模块统计异常风机台数
+         * 
+         * @param fieldId
+         * @param year
+         * @param beginTime
+         * @param endTime
+         * @return
+         */
+        AnomalyCount selectModeCount(@Param("fieldId") String fieldId,
+                        @Param("year") String year,
+                        @Param("beginTime") String beginTime,
+                        @Param("endTime") String endTime);
+
+        Integer selectEngineCountByCode(@Param("companyCode") String companyCode);
 
 }

src/main/java/com/energy/manage/analyse/mappers/healthscores/HealthscoresMapper.java

@@ -29,12 +29,12 @@ public interface HealthscoresMapper extends MyMapper<HealthscoresPO> {
     /**
      * 查询整个风场健康情况统计信息集合
      * 
-     * @param fieldId
+     * @param fieldIds
      * @param beginTime
      * @param endTime
      * @return
      */
-    List<HealthscoresWindVO> selectWindScoreList(@Param("fieldId") String fieldId,
+    List<HealthscoresWindVO> selectWindScoreList(@Param("fieldIds") List<String> fieldIds,
             @Param("beginTime") String beginTime,
             @Param("endTime") String endTime);
 

src/main/java/com/energy/manage/analyse/service/anomaly/AnomalyService.java

@@ -25,7 +25,8 @@ public interface AnomalyService {
      * @param anomalyDTO
      * @return
      */
-    List<AnomalyOverviewVO> getAnomalyOverview(AnomalyDTO anomalyDTO);
+    // List<AnomalyOverviewVO> getAnomalyOverview(AnomalyDTO anomalyDTO);
+    List<AnomalyOverviewVO> getAnomalyOverview(List<AnomalyDTO> anomalyDTOList);
 
     /**
      * 柱状图

src/main/java/com/energy/manage/analyse/service/anomaly/impl/AnomalyServiceImpl.java

@@ -60,7 +60,7 @@ public class AnomalyServiceImpl implements AnomalyService {
     // 分表前缀
     private static final String TABLE_PREFIX = "analyse.anomaly_model_";
 
-        /**
+    /**
      * @param fids
      * @return
      */
@@ -76,7 +76,6 @@ public class AnomalyServiceImpl implements AnomalyService {
         return windFieldMapper.selectByExample(example);
     }
 
-
     /**
      * 查询区域异常情况信息集合
      * 
@@ -140,8 +139,17 @@ public class AnomalyServiceImpl implements AnomalyService {
                     .filter(field -> field.getCompanyCode().equals(company.getCodeNumber()))
                     .map(WindFieldPO::getFieldId).collect(Collectors.toList());
             log.info("查询公司编号: {}, 对应的风场ID集合: {}", company.getCodeNumber(), fieldIds);
-            AnomalyRegionVO regionAnomalyRegionVO = anomalyWindfarmMapper.getAnomalyListByFieldIds(fieldIds, beginTime, endTime);
 
+            AnomalyRegionVO regionAnomalyRegionVO = null;
+            if (CollectionUtil.isEmpty(fieldIds)) {
+                log.warn("没有查询到对应的风场信息，可能是风场编号错误或数据库中没有该风场记录，companyCode: {}", company.getCodeNumber());
+                continue;
+            }
+
+            regionAnomalyRegionVO = anomalyWindfarmMapper.getAnomalyListByFieldIds(fieldIds,
+                    beginTime,
+                    endTime);
+                    
             if (regionAnomalyRegionVO == null) {
                 log.warn("没有查询到对应的异常情况信息，可能是时间范围内没有数据，companyCode: {}, beginTime: {}, endTime: {}", companyCode,
                         beginTime, endTime);
@@ -150,6 +158,7 @@ public class AnomalyServiceImpl implements AnomalyService {
 
             regionAnomalyRegionVO.setCompanyCode(company.getCodeNumber());
             regionAnomalyRegionVO.setCompanyName(company.getCodeName());
+
             list.add(regionAnomalyRegionVO);
         }
 
@@ -157,19 +166,25 @@ public class AnomalyServiceImpl implements AnomalyService {
     }
 
     @Override
-    public List<AnomalyOverviewVO> getAnomalyOverview(AnomalyDTO anomalyDTO) {
-
-        String fieldId = null;
-        WindFieldPO windFieldPO = getWindField(anomalyDTO.getFieldCode());
-        if (windFieldPO != null) {
-            fieldId = windFieldPO.getFieldId();
+    public List<AnomalyOverviewVO> getAnomalyOverview(List<AnomalyDTO> anomalyDTOList) {
+
+        List<String> fieldIds = new ArrayList<>();
+        for (AnomalyDTO anomalyDTO : anomalyDTOList) {
+            String fieldId = null;
+            WindFieldPO windFieldPO = getWindField(anomalyDTO.getFieldCode());
+            if (windFieldPO != null) {
+                fieldId = windFieldPO.getFieldId();
+            }
+            if (fieldId != null) {
+                fieldIds.add(fieldId);
+            }
         }
 
         String beginTime = null;
         String endTime = null;
-        if (!StringUtils.isEmpty(anomalyDTO.getDatatime())) {
-            beginTime = appendTimeToString(anomalyDTO.getDatatime(), 00, 00, 00);
-            endTime = appendTimeToString(anomalyDTO.getDatatime(), 23, 59, 59);
+        if (!StringUtils.isEmpty(anomalyDTOList.get(0).getDatatime())) {
+            beginTime = appendTimeToString(anomalyDTOList.get(0).getDatatime(), 00, 00, 00);
+            endTime = appendTimeToString(anomalyDTOList.get(0).getDatatime(), 23, 59, 59);
         } else {
             beginTime = getYesterdayStartStr();
             endTime = getYesterdayEnd().format(DATETIME_FORMATTER);
@@ -180,7 +195,7 @@ public class AnomalyServiceImpl implements AnomalyService {
         // 切换数据源
         DynamicDataSourceContextHolder.push("slave");
 
-        List<AnomalyOverviewVO> anomalyOverviewVOList = anomalyWindfarmMapper.selectAnomalyWindfarmAndFieldId(fieldId,
+        List<AnomalyOverviewVO> anomalyOverviewVOList = anomalyWindfarmMapper.selectAnomalyWindfarmAndFieldId(fieldIds,
                 beginTime, endTime);
         if (CollectionUtil.isEmpty(anomalyOverviewVOList)) {
             return null;
@@ -949,7 +964,7 @@ public class AnomalyServiceImpl implements AnomalyService {
             anomalyYawVO.setAnomalyCabletwistPO(anomalyCabletwistPO);
         }
 
-                // 清除当前
+        // 清除当前
         DynamicDataSourceContextHolder.poll();
         // 切换数据源
         DynamicDataSourceContextHolder.push("slave");
@@ -983,7 +998,6 @@ public class AnomalyServiceImpl implements AnomalyService {
             anomalyYawVO.setAnomalyYawCountPO(anomalyYawCountPO);
         }
 
-
         return anomalyYawVO;
     }
 
@@ -1060,7 +1074,7 @@ public class AnomalyServiceImpl implements AnomalyService {
             anomalyMinpitchPO.setGraphPath(NetUtils.getFilePath(isIntranet, minpitchPO.getGraphPath()));
             anomalyPitchVO.setAnomalyMinpitchPO(anomalyMinpitchPO);
         }
-       
+
         return anomalyPitchVO;
     }
 

src/main/java/com/energy/manage/analyse/service/healthscores/HealthscoresService.java

@@ -1,6 +1,7 @@
 package com.energy.manage.analyse.service.healthscores;
 
 
+import com.energy.manage.analyse.domain.dto.HealthDTO;
 import com.energy.manage.analyse.domain.vo.healthscores.HealthOverviewVO;
 import com.energy.manage.analyse.domain.vo.healthscores.HealthscoresRegionVO;
 import com.energy.manage.analyse.domain.vo.healthscores.HealthscoresTendencyVO;
@@ -27,7 +28,7 @@ public interface HealthscoresService {
      * @param datatime
      * @return
      */
-    List<HealthscoresWindVO> getHealthscoresWind(String fieldCode, String datatime);
+    List<HealthscoresWindVO> getHealthscoresWind(List<HealthDTO> healthDTOList);
 
 
     /**

src/main/java/com/energy/manage/analyse/service/healthscores/impl/HealthscoresServiceImpl.java

@@ -2,6 +2,8 @@ package com.energy.manage.analyse.service.healthscores.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import com.energy.manage.analyse.domain.dto.AnomalyDTO;
+import com.energy.manage.analyse.domain.dto.HealthDTO;
 import com.energy.manage.analyse.domain.vo.enginegroup.WindEngineGroupVO;
 import com.energy.manage.analyse.domain.vo.healthscores.HealthOverviewListVO;
 import com.energy.manage.analyse.domain.vo.healthscores.HealthOverviewVO;
@@ -112,7 +114,15 @@ public class HealthscoresServiceImpl implements HealthscoresService {
                     .filter(field -> field.getCompanyCode().equals(company.getCodeNumber()))
                     .map(WindFieldPO::getFieldId).collect(Collectors.toList());
             log.info("查询公司编号: {}, 对应的风场ID集合: {}", company.getCodeNumber(), fieldIds);
-            HealthscoresRegionVO regionHealthscoresRegionVO = healthscoresMapper.getHealthscoresListByFieldIds(fieldIds,
+
+            HealthscoresRegionVO regionHealthscoresRegionVO = null;
+
+            if (CollectionUtil.isEmpty(fieldIds)) {
+                log.warn("没有查询到对应的风场信息，可能是风场编号错误或数据库中没有该风场记录，companyCode: {}", company.getCodeNumber());
+                continue;
+            }
+
+            regionHealthscoresRegionVO = healthscoresMapper.getHealthscoresListByFieldIds(fieldIds,
                     beginTime, endTime);
 
             if (regionHealthscoresRegionVO == null) {
@@ -130,29 +140,41 @@ public class HealthscoresServiceImpl implements HealthscoresService {
     }
 
     @Override
-    public List<HealthscoresWindVO> getHealthscoresWind(String fieldCode, String datatime) {
-
-        String fieldId = null;
-        WindFieldPO windFieldPO = getWindField(fieldCode);
-        if (windFieldPO != null) {
-            fieldId = windFieldPO.getFieldId();
+    public List<HealthscoresWindVO> getHealthscoresWind(List<HealthDTO> healthDTOList) {
+
+        List<String> fieldIds = new ArrayList<>();
+        for (HealthDTO healthDTO : healthDTOList) {
+            String fieldId = null;
+            WindFieldPO windFieldPO = getWindField(healthDTO.getFieldCode());
+            if (windFieldPO != null) {
+                fieldId = windFieldPO.getFieldId();
+            }
+            if (fieldId != null) {
+                fieldIds.add(fieldId);
+            }
         }
 
         String beginTime = null;
         String endTime = null;
-        if (!StringUtils.isEmpty(datatime)) {
-            beginTime = appendTimeToString(datatime, 00, 00, 00);
-            endTime = appendTimeToString(datatime, 23, 59, 59);
+        if (!StringUtils.isEmpty(healthDTOList.get(0).getDatatime())) {
+            beginTime = appendTimeToString(healthDTOList.get(0).getDatatime(), 00, 00, 00);
+            endTime = appendTimeToString(healthDTOList.get(0).getDatatime(), 23, 59, 59);
         } else {
             beginTime = getYesterdayStartStr();
             endTime = getYesterdayEnd().format(DATETIME_FORMATTER);
         }
 
-        List<HealthscoresWindVO> list = getHealthscoresWind(fieldId, beginTime, endTime);
-        if (CollectionUtil.isEmpty(list)) {
+        // 清除当前
+        DynamicDataSourceContextHolder.poll();
+        // 切换数据源
+        DynamicDataSourceContextHolder.push("slave");
 
+        List<HealthscoresWindVO> list = healthscoresMapper.selectWindScoreList(fieldIds, beginTime, endTime);
+        if (CollectionUtil.isEmpty(list)) {
+            log.warn("没有查询到对应的健康评分信息，可能是时间范围内没有数据，beginTime: {}, endTime: {}", beginTime, endTime);
             return null;
         }
+
         Set<String> fids = list.parallelStream().map(HealthscoresWindVO::getFieldId).collect(Collectors.toSet());
         List<WindFieldPO> fList = getWindFGroupList(fids);
         for (HealthscoresWindVO vo : list) {
@@ -186,7 +208,7 @@ public class HealthscoresServiceImpl implements HealthscoresService {
         DynamicDataSourceContextHolder.poll();
         // 切换数据源
         DynamicDataSourceContextHolder.push("slave");
-        return healthscoresMapper.selectWindScoreList(fieldId, beginTime, endTime);
+        return healthscoresMapper.selectWindScoreList(Collections.singletonList(fieldId), beginTime, endTime);
     }
 
     @Override

src/main/java/com/energy/manage/analyse/service/wakediagnosis/impl/WakeWindFarmServiceImpl.java

@@ -100,6 +100,7 @@ public class WakeWindFarmServiceImpl implements WakeWindFarmService {
             }
             vo.setWakeTurbinePath(NetUtils.getFilePath(isIntranet,vo.getWakeTurbinePath()));
             vo.setWakeRoseDiagramPath(NetUtils.getFilePath(isIntranet,vo.getWakeRoseDiagramPath()));
+            vo.setWakeRoseDiagram30dPath(NetUtils.getFilePath(isIntranet,vo.getWakeRoseDiagram30dPath()));
         }
 
         wakeWindFarmVO.setGetWakeTurbineList(wakeTurbinePOList);

src/main/resources/bootstrap.properties

@@ -1,6 +1,6 @@
 #============================nacos配置=========================================
-# spring.cloud.nacos.config.server-addr = 192.168.50.234:8848
-spring.cloud.nacos.config.server-addr = 10.172.12.211:8848
+spring.cloud.nacos.config.server-addr = 192.168.50.234:8848
+# spring.cloud.nacos.config.server-addr = 10.172.12.211:8848
 spring.cloud.nacos.config.namespace = 79c42a7a-2c7d-4dcf-8a2c-b334271e2191
 spring.cloud.nacos.config.name=application.properties
 spring.cloud.nacos.config.group = @profiles.active@

src/main/resources/mybatis/anomaly/AnaomalyMapper.xml

@@ -32,8 +32,14 @@
         from
             anomaly_windfarm
         where 1=1
-        <if test="fieldId!=null">
+        <!-- <if test="fieldId!=null">
            and  field_id = #{fieldId}
+        </if> -->
+        <if test="fieldIds != null and fieldIds.size() > 0">
+            and field_id in
+            <foreach collection="fieldIds" item="fieldId" open="(" separator="," close=")">
+                #{fieldId,jdbcType=VARCHAR}
+            </foreach>
         </if>
         <if test="beginTime != null and beginTime != ''">
             and source_datetime  <![CDATA[>= ]]> #{beginTime}

src/main/resources/mybatis/healthscores/HealthscoresMapper.xml

@@ -57,8 +57,14 @@
         create_time as createTime
         FROM healthscores_wind
         WHERE 1=1
-        <if test="fieldId!=null">
+        <!-- <if test="fieldId!=null">
             and field_id = #{fieldId}
+        </if> -->
+        <if test="fieldIds != null and fieldIds.size() > 0">
+            and field_id in
+            <foreach collection="fieldIds" item="fieldId" open="(" separator="," close=")">
+                #{fieldId,jdbcType=VARCHAR}
+            </foreach>
         </if>
         <if test="beginTime != null and beginTime != ''">
             and source_datetime  <![CDATA[>= ]]> #{beginTime}