Commit ad544458 authored by chenzhao's avatar chenzhao

修改分析光伏预警生成数据不对

parent a4d6eec7
...@@ -169,9 +169,6 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -169,9 +169,6 @@ public class HealthStatusIndicatorServiceImpl {
// @Scheduled(cron = "0 0 */1 * * ?") // @Scheduled(cron = "0 0 */1 * * ?")
@Async("async") @Async("async")
public void healthWarningMinuteGF(Date time) { public void healthWarningMinuteGF(Date time) {
if (!openHealth) {
return;
}
String format = DateUtil.format(time, "yyyy-MM-dd HH:mm:00"); String format = DateUtil.format(time, "yyyy-MM-dd HH:mm:00");
// Date date = DateUtils.dateAddHours(time, -8); // Date date = DateUtils.dateAddHours(time, -8);
log.info("光伏---------------------预警时间----" + time); log.info("光伏---------------------预警时间----" + time);
...@@ -306,9 +303,9 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -306,9 +303,9 @@ public class HealthStatusIndicatorServiceImpl {
int flag = ObjectUtils.isEmpty(idxBizPvWarningRecords) || WarningNameEnum int flag = ObjectUtils.isEmpty(idxBizPvWarningRecords) || WarningNameEnum
.getCode(level) > WarningNameEnum.getCode(idxBizPvWarningRecords.get(0).getWarningName()) ? 0 .getCode(level) > WarningNameEnum.getCode(idxBizPvWarningRecords.get(0).getWarningName()) ? 0
: 1; : 1;
Boolean timeFlag = format // Boolean timeFlag = format
.equals(idxBizPvHealthIndices.get(idxBizPvHealthIndices.size() - 1).getRecDate()); // .equals(idxBizPvHealthIndices.get(idxBizPvHealthIndices.size() - 1).getRecDate());
if (!level.equals("") && flag == 0 && timeFlag) { if (!level.equals("") && flag == 0) {
IdxBizPvWarningRecord idxBizPvWarningRecord = new IdxBizPvWarningRecord(); IdxBizPvWarningRecord idxBizPvWarningRecord = new IdxBizPvWarningRecord();
idxBizPvWarningRecord.setKks(idxBizPvHealthIndices.get(idxBizPvHealthIndices.size() - 1).getKks()); idxBizPvWarningRecord.setKks(idxBizPvHealthIndices.get(idxBizPvHealthIndices.size() - 1).getKks());
idxBizPvWarningRecord idxBizPvWarningRecord
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment