#功率24小时统计

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/HydropowerStationVo.java

@@ -75,6 +75,9 @@ public class HydropowerStationVo {
 	@ApiModelProperty(value = "年发电量完成百分比")
 	private List<PowerMonthVo> powerYearMap;
 
+	@ApiModelProperty(value = "24小时机组有功功率")
+	private List<ActivePowerVo> activePowerVoList;
+
 	@ApiModelProperty(value = "设备信息")
 	private List<HydropowerUnitVo> deviceList;
 }

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java

@@ -1123,7 +1123,9 @@ public class RealTargetServiceImpl implements RealTargetService {
 	 * @return
 	 */
 	private List<ActivePowerVo> getLoadsByDay(EminfoAndEmParamVo device) {
-        String start = DateUtil.format(new Date(), DateUtil.PATTERN_DATE) + " 00:00:00";
+		Calendar calendar = Calendar.getInstance();
+		calendar.add(Calendar.HOUR_OF_DAY,-24);
+        String start = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATETIME);
         String end = DateUtil.format(new Date(), DateUtil.PATTERN_DATETIME);
         List<AnalyseDataTaosVO> records = dataService.periodTargetData(start, end, 3, 2, device.getEmCode(), HomePageConstant.PV_LOAD);
         if (CollectionUtil.isEmpty(records)) {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/data/service/impl/HzimsDataServiceImpl.java

@@ -256,10 +256,36 @@ public class HzimsDataServiceImpl implements HzimsDataService {
 		this.handleWaterLeve(station.getCode(),response);
 		// 年发电量完成百分比
 		response.setPowerYearMap(this.handlePowerFinish(Collections.singletonList(station),map));
+		// 功率曲线
+		response.setActivePowerVoList(this.activePowers(station.getRefDept(),targetList));
 		return response;
 	}
 
 	/**
+	 * 24小时功率曲线
+	 * @param refDept
+	 * @param targetList
+	 * @return
+	 */
+	private List<ActivePowerVo> activePowers(Long refDept, List<HydropowerUnitTargetVo> targetList) {
+		if(CollectionUtil.isEmpty(targetList)){
+			return new ArrayList<>();
+		}
+		List<ActivePowerVo> actives = new ArrayList<>();
+		targetList.stream().filter(o->o.getDeptId().equals(refDept)).map(HydropowerUnitTargetVo::getActivePowerVoList).collect(Collectors.toList()).forEach(actives::addAll);
+		if(CollectionUtil.isEmpty(actives)){
+			return new ArrayList<>();
+		}
+		Map<Integer,List<ActivePowerVo>> maps = actives.stream().collect(Collectors.groupingBy(ActivePowerVo::getHour));
+		return maps.entrySet().stream().map(entry->{
+			ActivePowerVo activePower = new ActivePowerVo();
+			activePower.setHour(entry.getKey());
+			activePower.setActivePower(String.valueOf(entry.getValue().stream().mapToDouble(o->Double.parseDouble(o.getActivePower())).sum()));
+			return activePower;
+		}).collect(Collectors.toList());
+	}
+
+	/**
 	 * 站点天气、降雨、水位
 	 * @param stationCode
 	 * @return