diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IPlanGenertionClient.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IPlanGenertionClient.java index 2b2ed6d..d550a9f 100644 --- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IPlanGenertionClient.java +++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IPlanGenertionClient.java @@ -76,12 +76,11 @@ public interface IPlanGenertionClient { /** * 年计划/实际发电量 - * @param stationIds - * @param date + * @param param * @return */ - @GetMapping(GET_POWER_YEAR) - Double getPlanPowerYear(@RequestParam(value = "stationIds", required = false) List stationIds, @RequestParam(value = "date", required = false) String date); + @PostMapping(GET_POWER_YEAR) + Double getPlanPowerYear(@RequestBody DevicePlanGenerationVo param); /** * 计划发电量查询 diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/PlanGenertionClient.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/PlanGenertionClient.java index c549eae..ef65993 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/PlanGenertionClient.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/PlanGenertionClient.java @@ -107,14 +107,13 @@ public class PlanGenertionClient implements IPlanGenertionClient{ /** * 年计划发电量/实际发电量 - * @param stationIds - * @param date 'yyyy' + * @param param * @return */ - @GetMapping(GET_POWER_YEAR) + @PostMapping(GET_POWER_YEAR) @Override - public Double getPlanPowerYear(List stationIds, String date) { - return service.getPlanPowerYear(stationIds,date); + public Double getPlanPowerYear(DevicePlanGenerationVo param) { + return service.getPlanPowerYear(param.getStationIds(),param.getDate()); } /** diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml index 3bc04c3..84ecf4e 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml @@ -238,7 +238,7 @@ order by t.UPDATE_TIME desc -、 +