From f7426b7804ad1ee1bfb3f1520ad035bcda54f852 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 28 四月 2025 17:34:25 +0800
Subject: [PATCH] 无功优化模型
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 7 -------
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunOffPowerOptimTask.java | 13 +++++++++----
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
index b95b9d3..fd34f95 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
@@ -467,11 +467,8 @@
if (StringUtils.isNotBlank(dto.getActivePower())) {
points.add(dto.getActivePower());
}
-
if (!CollectionUtils.isEmpty(points)) {
-
Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
-
if (pointsRealValue.get(dto.getCurDemand()) != null) {
dto.setCurDemand(pointsRealValue.get(dto.getCurDemand()).toString());
}
@@ -490,16 +487,12 @@
Date start = calendar.getTime();
ApiPointValueQueryDTO apiPointValueQueryDTO = new ApiPointValueQueryDTO();
apiPointValueQueryDTO.setStart(start);
- apiPointValueQueryDTO.setEnd(new Date());
apiPointValueQueryDTO.setPointNo(dto.getMaxDemand());
Object maxValue = dataPointApi.queryPointMaxValue(apiPointValueQueryDTO);
dto.setMaxDemand(maxValue == null ? "" : maxValue.toString());
}
-
-
}
-
return success(result);
}
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunOffPowerOptimTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunOffPowerOptimTask.java
index 9b5ba52..f6d9e71 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunOffPowerOptimTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunOffPowerOptimTask.java
@@ -37,20 +37,25 @@
logger.info("runPredictModuleTask定时任务正在执行，参数为：{}", params);
try {
Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.SECOND,0);
- calendar.set(Calendar.MILLISECOND,0);
+ calendar.set(Calendar.SECOND, 0);
+ calendar.set(Calendar.MILLISECOND, 0);
MdkScheduleReqDTO dto = new MdkScheduleReqDTO();
dto.setScheduleTime(calendar.getTime());
dto.setScheduleCode(params);
MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(dto);
logger.info(params + "调度方案执行完成，" + mdkScheduleRespDTO);
Map<String, Object> result = mdkScheduleRespDTO.getResult();
- for(Map.Entry<String, Object> entry : result.entrySet()) {
+ for (Map.Entry<String, Object> entry : result.entrySet()) {
String key = entry.getKey();
this.saveScheduleSuggest("无功优化", entry.getValue(), "WGYH", calendar.getTime());
}
+ if (mdkApi.scheduleModelOut(mdkScheduleRespDTO)) {
+ logger.info("调度方案结果下发成功");
+ } else {
+ logger.error("调度方案结果下发失败");
+ }
} catch (Exception ex) {
- logger.error("runPredictModuleTask运行异常",ex);
+ logger.error("runPredictModuleTask运行异常", ex);
}
logger.info("runPredictModuleTask运行完成");
}
--
Gitblit v1.9.3