From dabf0fa97e049fdc805dcffc48b9df283805668a Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 06 五月 2025 09:36:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPeakValleyFlatTask.java | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPeakValleyFlatTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPeakValleyFlatTask.java
index fb1a9d7..76eeea4 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPeakValleyFlatTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunPeakValleyFlatTask.java
@@ -62,29 +62,33 @@
//下发昨日占比
ApiPointValueWriteDTO dto = new ApiPointValueWriteDTO();
dto.setPointNo(entry.getValue().get(0).getPointNo());
- dto.setValue(value/totalValue*100);
+ double percent = totalValue==0?0:value/totalValue*100;
+ dto.setValue(percent);
dataPointApi.writePointRealValue(dto);
- //计算前三十日累积量
- double value30 = 0;
- for (int i = 1; i < 31; i++) {
+ if(entry.getValue().get(0).getPointNoMonth()!=null){
//计算前三十日累积量
- value30 = value30 + getSumValue(entry.getValue(), i, calendar);
+ double value30 = 0;
+ for (int i = 1; i < 31; i++) {
+ //计算前三十日累积量
+ value30 = value30 + getSumValue(entry.getValue(), i, calendar);
+ }
+
+ //计算前三十日总电耗
+ calendar.set(Calendar.MILLISECOND, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.add(Calendar.DAY_OF_YEAR, -30);
+ Date startTimeMonth = calendar.getTime();
+ double totalValueMonth = getSumValueTotal(entry.getValue().get(0).getPowerNo(), startTimeMonth,endTime);
+
+ //下发前三十日占比
+ ApiPointValueWriteDTO monthDto = new ApiPointValueWriteDTO();
+ monthDto.setPointNo(entry.getValue().get(0).getPointNoMonth());
+ double percentMonth = totalValueMonth==0?0:value30/totalValueMonth*100;
+ monthDto.setValue(percentMonth);
+ dataPointApi.writePointRealValue(monthDto);
}
-
- //计算前三十日总电耗
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.MINUTE, 0);
- calendar.set(Calendar.HOUR_OF_DAY, 0);
- calendar.add(Calendar.DAY_OF_YEAR, -30);
- Date startTimeMonth = calendar.getTime();
- double totalValueMonth = getSumValueTotal(entry.getValue().get(0).getPowerNo(), startTimeMonth,endTime);
-
- //下发前三十日占比
- ApiPointValueWriteDTO monthDto = new ApiPointValueWriteDTO();
- monthDto.setPointNo(entry.getValue().get(0).getPointNoMonth());
- monthDto.setValue(value30/totalValueMonth*100);
- dataPointApi.writePointRealValue(monthDto);
});
} catch (Exception ex) {
logger.error("runPeakValleyFlatTask运行异常");
@@ -93,16 +97,17 @@
}
private Date getTime(String timeStr, int ago, Calendar calendar) {
+ Calendar cal = (Calendar) calendar.clone();
String[] timeSplit = timeStr.split(":");
if (timeSplit.length != 2) {
throw new IllegalArgumentException("时间配置格式不合法");
}
//根据配置获取startTime、endTime
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.HOUR_OF_DAY, Integer.parseInt(timeSplit[0]));
- calendar.set(Calendar.MINUTE, Integer.parseInt(timeSplit[1]));
- calendar.add(Calendar.DAY_OF_YEAR, -ago);
- return calendar.getTime();
+ cal.set(Calendar.MILLISECOND, 0);
+ cal.set(Calendar.HOUR_OF_DAY, Integer.parseInt(timeSplit[0]));
+ cal.set(Calendar.MINUTE, Integer.parseInt(timeSplit[1]));
+ cal.add(Calendar.DAY_OF_YEAR, -ago);
+ return cal.getTime();
}
private List<ApiPointValueDTO> fillMissingData(List<ApiPointValueDTO> valueList,
@@ -167,6 +172,7 @@
dto.setPointNo(entity.getPowerNo());
dto.setStart(startTime);
dto.setEnd(endTime);
+ logger.info("开始查询,测点："+entity.getPowerNo()+"startTime:"+startTime+"endTime:"+endTime);
//查找数据
List<ApiPointValueDTO> valueList = dataPointApi.queryPointHistoryValue(dto);
--
Gitblit v1.9.3