Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricAreaVo.java

@@ -54,7 +54,7 @@ public class HydroelectricAreaVo {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double generatePlanYear;
 
-	@ApiModelProperty(value = "电量完成吕")
+	@ApiModelProperty(value = "电量完成率")
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double generateRate;
 

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/homePage/hydroelectric/vo/HydroelectricStationVo.java

@@ -60,9 +60,9 @@ public class HydroelectricStationVo {
 	@ApiModelProperty(value = "设备集合")
 	private List<HydroelectricDeviceVo> devices;
 
-	@ApiModelProperty(value = "降雨/发电量曲线")
+	@ApiModelProperty(value = "降雨曲线")
 	private List<HydroelectricPowerRainVo> powerRains;
 
-	@ApiModelProperty(value = "降雨/发电量曲线")
+	@ApiModelProperty(value = "发电量曲线")
 	private List<HydroelectricGenerateMonVo> generateMons;
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/homePage/service/impl/HydroelectricServiceImpl.java

@@ -254,7 +254,7 @@ public class HydroelectricServiceImpl implements HydroelectricService {
                 // 日发电量
                 area.setGenerateDay(targets.stream().mapToDouble(HydropowerUnitTargetVo::getPowerDay).sum());
                 // 年计划发电量
-                area.setGeneratePlanYear(planClient.getPlanPowerYear(stations.stream().map(StationEntity::getCode).collect(Collectors.toList()), DateUtil.format(new Date(),"yyyy")));
+                area.setGeneratePlanYear(plans.stream().mapToDouble(PlanGenerationEntity::getPlanGeneration).sum());
                 if(area.getGeneratePlanYear() <= 0 || area.getGenerateYear() <= 0){
                     area.setGenerateRate(0.0);
                 }else{