From d79c5f396b23520e6370e9d9b6abc31938a0e83f Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 29 四月 2025 18:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java
index d43affd..746fe01 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java
@@ -1,6 +1,7 @@
package com.iailab.module.model.api;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.iailab.module.data.api.point.DataPointApi;
import com.iailab.module.data.api.point.dto.ApiPointValueWriteDTO;
@@ -364,42 +365,25 @@
continue;
}
Object resultValue = result.get(stScheduleModelOutDTO.getResultKey());
+ String resultJson = JSON.toJSONString(resultValue);
//判断解析方式
ModelOutResultType modelOutResultType = ModelOutResultType.getEumByCode(stScheduleModelOutDTO.getResultType());
switch (modelOutResultType) {
case D:
- if (resultValue instanceof Integer) {
- value = ((Integer) resultValue).doubleValue();
- } else if (resultValue instanceof Double) {
- value = (Double) resultValue;
- } else {
- System.out.println("resultValue is not a number");
- }
+ value = Double.valueOf(resultJson);
break;
case D1:
- ArrayList<Double> doubleList = (ArrayList<Double>) resultValue;
- double[] array1 = new double[doubleList.size()];
- for (int i = 0; i < doubleList.size(); i++) {
- array1[i] = doubleList.get(i);
- }
- if (stScheduleModelOutDTO.getResultPort() < array1.length) {
- value = array1[stScheduleModelOutDTO.getResultPort()];
+ JSONArray jsonArray = JSON.parseArray(resultJson);
+ if (stScheduleModelOutDTO.getResultPort() < jsonArray.size()) {
+ value = jsonArray.getDoubleValue(stScheduleModelOutDTO.getResultPort());
} else {
log.error(result.get(stScheduleModelOutDTO.getResultKey()) + "下角标超限");
}
break;
case D2:
- ArrayList<ArrayList<Double>> doubleListList = (ArrayList<ArrayList<Double>>) resultValue;
- double[][] array2 = new double[doubleListList.size()][];
- for (int i = 0; i < doubleListList.size(); i++) {
- ArrayList<Double> doubleList2 = doubleListList.get(i);
- array2[i] = new double[doubleList2.size()];
- for (int j = 0; j < doubleList2.size(); j++) {
- array2[i][j] = doubleList2.get(j);
- }
- }
- if (stScheduleModelOutDTO.getResultPort() < array2.length && stScheduleModelOutDTO.getResultIndex() < array2[stScheduleModelOutDTO.getResultPort()].length) {
- value = array2[stScheduleModelOutDTO.getResultPort()][stScheduleModelOutDTO.getResultIndex()];
+ JSONArray json2Array = JSON.parseArray(resultJson);
+ if (stScheduleModelOutDTO.getResultPort() < json2Array.size() && stScheduleModelOutDTO.getResultIndex() < json2Array.getJSONArray(stScheduleModelOutDTO.getResultPort()).size()) {
+ value = json2Array.getJSONArray(stScheduleModelOutDTO.getResultPort()).getDoubleValue(stScheduleModelOutDTO.getResultIndex());
} else {
log.error(result.get(stScheduleModelOutDTO.getResultKey()) + "下标超限");
}
@@ -414,8 +398,7 @@
}
}
} catch (Exception ex) {
- log.error("下发数据异常");
- ex.printStackTrace();
+ log.error("下发数据异常，result:" + JSON.toJSONString(result),ex);
}
return true;
}
@@ -429,4 +412,30 @@
public void influenceFactorHandle(MmPredictInfluenceFactorHandleReqVO reqVO) {
influenceFactorService.influenceFactorHandle(reqVO);
}
+
+ @Override
+ public MdkScheduleRespDTO doScheduleAndOut(MdkScheduleReqDTO reqDTO) {
+ MdkScheduleRespDTO resp = new MdkScheduleRespDTO();
+ resp.setScheduleCode(reqDTO.getScheduleCode());
+ resp.setScheduleTime(reqDTO.getScheduleTime());
+ try {
+ log.info("调度计算开始: " + System.currentTimeMillis());
+ log.info("reqDTO=" + JSON.toJSONString(reqDTO));
+ ScheduleResultVO scheduleResult = scheduleModelHandler.doSchedule(reqDTO.getScheduleCode(), reqDTO.getScheduleTime(),
+ reqDTO.getDynamicDataLength(), reqDTO.getDynamicSettings());
+ resp.setStatusCode(scheduleResult.getResultCode());
+ resp.setResult(scheduleResult.getResult());
+ stScheduleRecordService.create(scheduleResult);
+ stScheduleSchemeService.updateTime(scheduleResult.getSchemeId(), scheduleResult.getScheduleTime(), scheduleResult.getResultCode());
+ log.info("调度计算结束: " + System.currentTimeMillis());
+ log.info("调度计算结果开始下发");
+ scheduleModelOut(resp);
+ log.info("调度计算结果开始下发结束");
+ } catch (Exception ex) {
+ log.info("调度计算异常: " + System.currentTimeMillis());
+ ex.printStackTrace();
+ return resp;
+ }
+ return resp;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3