From 5c92309910361bb197208ffdd95fd84e531b624a Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 22 四月 2025 16:59:06 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/ansteel
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunOffPowerOptimTask.java | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 deletions(-)
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 1f02179..9b5ba52 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
@@ -1,17 +1,17 @@
package com.iailab.module.ansteel.job.task;
+import com.iailab.module.model.api.mcs.McsApi;
+import com.iailab.module.model.api.mcs.dto.ScheduleSuggestRespDTO;
import com.iailab.module.model.api.mdk.MdkApi;
-import com.iailab.module.model.api.mdk.dto.MdkPredictReqDTO;
+import com.iailab.module.model.api.mdk.dto.MdkScheduleReqDTO;
+import com.iailab.module.model.api.mdk.dto.MdkScheduleRespDTO;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* 无功优化模型
@@ -28,29 +28,44 @@
@Autowired
private MdkApi mdkApi;
+ @Autowired
+ private McsApi mcsApi;
+
+
@Override
public void run(String params) {
logger.info("runPredictModuleTask定时任务正在执行，参数为：{}", params);
try {
Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.SECOND, 0);
- calendar.set(Calendar.MILLISECOND, 0);
- Date predictTime = calendar.getTime();
- if (StringUtils.isEmpty(params)) {
- logger.info("参数为空");
- return;
+ 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()) {
+ String key = entry.getKey();
+ this.saveScheduleSuggest("无功优化", entry.getValue(), "WGYH", calendar.getTime());
}
- List<String> moduleTypeList = Arrays.asList(params.split(","));
- moduleTypeList.forEach(type -> {
- MdkPredictReqDTO dto = new MdkPredictReqDTO();
- dto.setPredictTime(predictTime);
- dto.setModuleType(type);
- mdkApi.predictModule(dto);
- logger.info(type + "模块预测完成。");
- });
} catch (Exception ex) {
logger.error("runPredictModuleTask运行异常",ex);
}
logger.info("runPredictModuleTask运行完成");
}
+
+ private void saveScheduleSuggest(String title, Object content, String scheduleObj, Date scheduleTime) {
+ if (content == null || StringUtils.isBlank(content.toString()) || "0".equals(content.toString())) {
+ logger.info(title + "content为空");
+ return;
+ }
+ ScheduleSuggestRespDTO suggest = new ScheduleSuggestRespDTO();
+ suggest.setTitle(title);
+ suggest.setContent(content.toString());
+ suggest.setScheduleObj(scheduleObj);
+ suggest.setScheduleTime(scheduleTime);
+ suggest.setSort(0);
+ mcsApi.createScheduleSuggest(suggest);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3