From d1a0613fbc255ca235135b85d19f61356472cda7 Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Thu, 5 Sep 2024 16:38:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?#=E8=AE=BE=E5=A4=87=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=8F=91=E7=94=B5=E9=87=8Ffeign=E6=8E=A5=E5=8F=A3get=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E8=B6=85=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzims/equipment/feign/IPlanGenertionClient.java   |  7 +++----
 .../com/hnac/hzims/equipment/feign/PlanGenertionClient.java    |  9 ++++-----
 .../java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml    |  2 +-
 .../homePage/service/impl/HydroelectricServiceImpl.java        |  5 ++++-
 .../operational/main/service/impl/HydropowerServiceImpl.java   |  5 ++++-
 .../main/service/impl/MainSystemMonitoringServiceImpl.java     | 10 ++++++++--
 6 files changed, 24 insertions(+), 14 deletions(-)

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<String> 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<String> 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 @@
         <include refid="getTaskListSql"></include>
         order by t.UPDATE_TIME desc
     </select>
-、
+
     <select id="getFinishTaskList" parameterType="com.hnac.hzinfo.inspect.task.vo.TaskListQuery" resultType="com.hnac.hzinfo.inspect.task.vo.TaskVo">
         SELECT t.* from HZ_ST_EX_TASK t
         LEFT JOIN HZ_ST_EX_TASK_USER u on t.ID=u.TASK_ID
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/homePage/service/impl/HydroelectricServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/homePage/service/impl/HydroelectricServiceImpl.java
index 5c6dbcf..936a09d 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/homePage/service/impl/HydroelectricServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/homePage/service/impl/HydroelectricServiceImpl.java
@@ -363,7 +363,10 @@ public class HydroelectricServiceImpl implements HydroelectricService {
                 // 日发电量
                 group.setGenerateDay(stationTargets.stream().mapToDouble(HydropowerUnitTargetVo::getPowerDay).sum());
                 // 年计划发电量
-                group.setGeneratePlanYear(planClient.getPlanPowerYear(stations.stream().map(StationEntity::getCode).collect(Collectors.toList()), DateUtil.format(new Date(),"yyyy")));
+                DevicePlanGenerationVo planParam = new DevicePlanGenerationVo();
+                param.setStationIds(stations.stream().map(StationEntity::getCode).collect(Collectors.toList()));
+                param.setDate(DateUtil.format(new Date(),"yyyy"));
+                group.setGeneratePlanYear(planClient.getPlanPowerYear(planParam));
                 if(group.getGeneratePlanYear() <= 0 || group.getGenerateYear() <= 0){
                     group.setGenerateRate(0.0);
                 }else{
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java
index dd93e24..62da01b 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java
@@ -756,7 +756,10 @@ public class HydropowerServiceImpl implements HydropowerService {
 				// 日发电量
 				kpi.setGenerateDay(targets.stream().mapToDouble(HydropowerUnitTargetVo::getPowerDay).sum());
 				// 年计划发电量
-				Double plan = planGenertionClient.getPlanPowerYear(stations.stream().map(StationEntity::getCode).collect(Collectors.toList()), DateUtil.format(new Date(),"yyyy"));
+				DevicePlanGenerationVo param = new DevicePlanGenerationVo();
+				param.setStationIds(stations.stream().map(StationEntity::getCode).collect(Collectors.toList()));
+				param.setDate(DateUtil.format(new Date(),"yyyy"));
+				Double plan = planGenertionClient.getPlanPowerYear(param);
 				kpi.setPlan(plan);
 				if(Math.abs(plan) <= 0){
 					kpi.setPlanRate(0.0);
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainSystemMonitoringServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainSystemMonitoringServiceImpl.java
index f7bdf3f..389194f 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainSystemMonitoringServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainSystemMonitoringServiceImpl.java
@@ -1386,7 +1386,10 @@ public class MainSystemMonitoringServiceImpl implements IMainSystemMonitoringSer
 					BigDecimal powerYear = value.entrySet().stream().filter(s -> listByYear.contains(s.getKey())).map(s -> BigDecimal.valueOf(s.getValue()).setScale(1, RoundingMode.UP)).reduce(BigDecimal.ZERO, BigDecimal::add);
 					stationReportVO.setFinishPowerYear(objDivide(String.valueOf(powerYear)).toString());
 					//获取计划年发电量
-					Double planPowerYear = planGenertionClient.getPlanPowerYear(Collections.singletonList(stationEntity.getCode()), yearMon[0]);
+					DevicePlanGenerationVo param = new DevicePlanGenerationVo();
+					param.setStationIds(Collections.singletonList(stationEntity.getCode()));
+					param.setDate(yearMon[0]);
+					Double planPowerYear = planGenertionClient.getPlanPowerYear(param);
 					stationReportVO.setPowerYearPlan(objDivide(String.valueOf(planPowerYear)).doubleValue());
 					if (ObjectUtil.isNotEmpty(stationReportVO.getPowerMonPlan())
 							&&ObjectUtil.isNotEmpty(stationReportVO.getFinishPowerMon())
@@ -1483,7 +1486,10 @@ public class MainSystemMonitoringServiceImpl implements IMainSystemMonitoringSer
 		Double finishPowerYear = BigDecimal.valueOf(powerCountYear.get()).doubleValue();
 		stationReportVO.setFinishPowerYear(objDivide(String.valueOf(finishPowerYear)).toString());
 		//当年的计划发电量
-		Double planPowerYear = planGenertionClient.getPlanPowerYear(Collections.singletonList(stationId), year);
+		DevicePlanGenerationVo param = new DevicePlanGenerationVo();
+		param.setStationIds(Collections.singletonList(stationEntity.getCode()));
+		param.setDate(year);
+		Double planPowerYear = planGenertionClient.getPlanPowerYear(param);
 		stationReportVO.setPowerYearPlan(objDivide(String.valueOf(planPowerYear)).doubleValue());
 		//当月的计划发电量
 		R<Float> planPowerMonR = planGenertionClient.planGenerationMonthCount(stationId, month);

From f13e3023dba7858d5af7281e8d86fad16c389ede Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Thu, 5 Sep 2024 16:47:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?#=E8=AE=BE=E5=A4=87=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=8F=91=E7=94=B5=E9=87=8Ffeign=E6=8E=A5=E5=8F=A3get=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E8=B6=85=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hnac/hzims/equipment/feign/IPlanGenertionClientBack.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IPlanGenertionClientBack.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IPlanGenertionClientBack.java
index 3a5c2d7..3ef10f4 100644
--- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IPlanGenertionClientBack.java
+++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IPlanGenertionClientBack.java
@@ -48,7 +48,7 @@ public class IPlanGenertionClientBack implements IPlanGenertionClient {
 	}
 
 	@Override
-	public Double getPlanPowerYear(List<String> stationIds, String date) {
+	public Double getPlanPowerYear(DevicePlanGenerationVo param) {
 		return null;
 	}