diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml index 42a7cb02e..0915c68e7 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml @@ -22,7 +22,6 @@ pm.`Status` = 1 AND ps.`Status` = 1 - AND pm.Is_Special_Monitor = 1 AND pm.Org_Id IN diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java index 0e171bced..26b7e4f73 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java @@ -60,7 +60,7 @@ public class SpecialAnalysisServiceImpl implements SpecialAnalysisService { break; //风电场 default: - data = dicDataFeignClient.getDicDataByCode(DicDataEnum.ONSHORE_WIND.getCode()).getData(); + data = dicDataFeignClient.getDicDataByCode(DicDataEnum.WIND_FARM.getCode()).getData(); break; } //1.获取原始数据(参数1,部门id。参数2,监测点标签字典id集合) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RMpInfluenceMController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RMpInfluenceMController.java index 25674ede0..114a6e827 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RMpInfluenceMController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RMpInfluenceMController.java @@ -39,7 +39,7 @@ import java.time.LocalDateTime; public class RMpInfluenceMController extends BaseController { private final IRMpInfluenceMService irMpEmissionMService; - @ApiOperation("影响特性(r_mp_emission_m表数据)") + @ApiOperation("影响特性(r_mp_influence_m)") @ApiImplicitParam(value = "jobParam", name = "jobParam", required = true) @PostMapping("rMpInfluenceMHandler") @OperateInfo(info = LogEnum.BUSINESS_MEDIUM)