From ef3d782afb43abb5d432166718865991fa16e8fe Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 19 五月 2025 17:51:24 +0800
Subject: [PATCH] 修改修正计划开始日期
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java | 4 +---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java | 20 +++++++++++---------
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java | 4 +---
3 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java
index 4bc6b06..c70e3a1 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java
@@ -8,6 +8,8 @@
import com.iailab.module.ansteel.common.enums.TraceProcessTypeEnum;
import com.iailab.module.model.api.mcs.McsApi;
import com.iailab.module.model.api.mdk.MdkApi;
+import com.iailab.module.model.api.mdk.dto.MdkScheduleReqDTO;
+import com.iailab.module.model.api.mdk.dto.MdkScheduleRespDTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +17,7 @@
import java.util.Calendar;
import java.util.Date;
+import java.util.Map;
import java.util.Objects;
/**
@@ -93,22 +96,21 @@
calendar.add(Calendar.DAY_OF_YEAR, -1);
Date startDate = calendar.getTime();
String clock = DateUtils.format(startDate);
- calendar.add(Calendar.DAY_OF_YEAR, -3);
- Date chartStartDate = calendar.getTime();
// 调用模型
- /* MdkScheduleReqDTO dto = new MdkScheduleReqDTO();
+ 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();
+ Map<String, Object> tResult = mdkScheduleRespDTO.getResult();
- JSONObject jsonObject = new JSONObject(result);
- JSONObject result2 = (JSONObject) JSON.toJSON(jsonObject.get("result"));*/
-
- JSONObject jsonObject = JSONObject.parseObject(jsonStr);
+ JSONObject jsonObject = new JSONObject(tResult);
JSONObject result = (JSONObject) JSON.toJSON(jsonObject.get("result"));
+ logger.info("result===" + JSONObject.toJSONString(result));
+
+// JSONObject jsonObject = JSONObject.parseObject(jsonStr);
+// JSONObject result = (JSONObject) JSON.toJSON(jsonObject.get("result"));
if (Objects.isNull(result)) {
logger.info("模型结果为空");
@@ -134,7 +136,7 @@
cokingTraceIndService.saveTraceInd(relId, indType, clock);
// 保存溯源折线图
- cokingTraceChartService.save(relId, clock, indType, chartStartDate, endDate);
+ cokingTraceChartService.save(relId, clock, indType, startDate, endDate);
} catch (Exception ex) {
logger.error("RunCokingTraceModelBMTask运行异常");
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
index 47110c4..14a0b7c 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
@@ -92,8 +92,6 @@
calendar.add(Calendar.DAY_OF_YEAR, -1);
Date startDate = calendar.getTime();
String clock = DateUtils.format(startDate);
- calendar.add(Calendar.DAY_OF_YEAR, -3);
- Date chartStartDate = calendar.getTime();
// 调用模型
JSONObject jsonObject = JSONObject.parseObject(jsonStr);
@@ -123,7 +121,7 @@
cokingTraceIndService.saveTraceInd(relId, indType, clock);
// 保存溯源折线图
- cokingTraceChartService.save(relId, clock, indType, chartStartDate, endDate);
+ cokingTraceChartService.save(relId, clock, indType, startDate, endDate);
} catch (Exception ex) {
logger.error("RunCokingTraceModelHCTask运行异常");
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java
index 1658e68..b99336f 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java
@@ -92,8 +92,6 @@
calendar.add(Calendar.DAY_OF_YEAR, -1);
Date startDate = calendar.getTime();
String clock = DateUtils.format(startDate);
- calendar.add(Calendar.DAY_OF_YEAR, -3);
- Date chartStartDate = calendar.getTime();
// 调用模型
JSONObject jsonObject = JSONObject.parseObject(jsonStr);
@@ -123,7 +121,7 @@
cokingTraceIndService.saveTraceInd(relId, indType, clock);
// 保存溯源折线图
- cokingTraceChartService.save(relId, clock, indType, chartStartDate, endDate);
+ cokingTraceChartService.save(relId, clock, indType, startDate, endDate);
} catch (Exception ex) {
logger.error("RunCokingTraceModelLJTask运行异常");
--
Gitblit v1.9.3