From e88fba9645a57535d858ce48da8e9d9a3dc84adc Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期四, 02 一月 2025 16:48:01 +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 | 86 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 1 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 221133c..3e0d626 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,11 +1,18 @@
package com.iailab.module.model.api;
import com.alibaba.fastjson.JSON;
+import com.iailab.module.data.api.point.DataPointApi;
+import com.iailab.module.data.api.point.dto.ApiPointValueWriteDTO;
+import com.iailab.module.model.api.mcs.dto.StScheduleModelOutDTO;
import com.iailab.module.model.api.mdk.MdkApi;
import com.iailab.module.model.api.mdk.dto.*;
+import com.iailab.module.model.common.enums.IsWriteEnum;
+import com.iailab.module.model.common.enums.ModelOutResultType;
+import com.iailab.module.model.common.enums.OutResultType;
import com.iailab.module.model.mcs.pre.entity.DmModuleEntity;
import com.iailab.module.model.mcs.pre.service.DmModuleService;
import com.iailab.module.model.mcs.pre.service.MmPredictItemService;
+import com.iailab.module.model.mcs.sche.service.StScheduleModelOutService;
import com.iailab.module.model.mcs.sche.service.StScheduleRecordService;
import com.iailab.module.model.mcs.sche.service.StScheduleSchemeService;
import com.iailab.module.model.mdk.predict.PredictModuleHandler;
@@ -23,6 +30,8 @@
import java.util.*;
import java.util.stream.Collectors;
+
+import static com.iailab.module.model.common.enums.ModelOutResultType.D;
/**
* @author PanZhibao
@@ -54,6 +63,12 @@
@Autowired
private StScheduleSchemeService stScheduleSchemeService;
+
+ @Autowired
+ private StScheduleModelOutService stScheduleModelOutService;
+
+ @Autowired
+ private DataPointApi dataPointApi;
/**
* 按模块预测
@@ -202,9 +217,10 @@
try {
log.info("调度计算开始: " + System.currentTimeMillis());
ScheduleResultVO scheduleResult = scheduleModelHandler.doSchedule(reqDTO.getScheduleCode(), reqDTO.getScheduleTime());
+ resp.setStatusCode(scheduleResult.getResultCode());
resp.setResult(scheduleResult.getResult());
stScheduleRecordService.create(scheduleResult);
- stScheduleSchemeService.updateTime(scheduleResult.getSchemeId(), scheduleResult.getScheduleTime());
+ stScheduleSchemeService.updateTime(scheduleResult.getSchemeId(), scheduleResult.getScheduleTime(), scheduleResult.getResultCode());
log.info("预测计算结束: " + System.currentTimeMillis());
} catch (Exception ex) {
log.info("调度计算异常: " + System.currentTimeMillis());
@@ -213,4 +229,72 @@
}
return resp;
}
+
+ @Override
+ public Boolean scheduleModelOut(MdkScheduleRespDTO dto) {
+ String modelId = stScheduleSchemeService.getByCode(dto.getScheduleCode()).getModelId();
+ Map<String, Object> result = dto.getResult();
+ List<StScheduleModelOutDTO> list = stScheduleModelOutService.list(modelId);
+ try {
+ for (StScheduleModelOutDTO stScheduleModelOutDTO : list) {
+ double value = 0;
+ //判断点位是否下发
+ if (stScheduleModelOutDTO.getIsWrite().equals(IsWriteEnum.NOTWRITE.value())) {
+ continue;
+ }
+ //返回结果是否存在
+ if (result.get(stScheduleModelOutDTO.getResultKey()) == null) {
+ log.error(result.get(stScheduleModelOutDTO.getResultKey()) + "resultKey匹配失败");
+ continue;
+ }
+ Object resultValue = result.get(stScheduleModelOutDTO.getResultKey());
+ //判断解析方式
+ ModelOutResultType modelOutResultType = ModelOutResultType.getEumByCode(stScheduleModelOutDTO.getResultType());
+ switch (modelOutResultType) {
+ case D:
+ value = (Double) resultValue;
+ 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()];
+ } 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()];
+ } else {
+ log.error(result.get(stScheduleModelOutDTO.getResultKey()) + "下标超限");
+ }
+ break;
+ }
+ //下发到point点位
+ ApiPointValueWriteDTO ApiPointValueWriteDTO = new ApiPointValueWriteDTO();
+ ApiPointValueWriteDTO.setPointNo(stScheduleModelOutDTO.getPointNo());
+ ApiPointValueWriteDTO.setValue(value);
+ if (!dataPointApi.writePointRealValue(ApiPointValueWriteDTO)) {
+ log.error(result.get(stScheduleModelOutDTO.getResultKey()) + "下发数据异常");
+ }
+ }
+ } catch (Exception ex) {
+ log.error("下发数据异常");
+ ex.printStackTrace();
+ }
+ return true;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3