From f853b02cb7b265379eceb2f0e3c38f9d63bb1b21 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 06 一月 2025 17:55:25 +0800
Subject: [PATCH] 执行调度模型 默认时间
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java | 175 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 114 insertions(+), 61 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 547f21b..9a07f72 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,15 @@
package com.iailab.module.model.api;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
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;
@@ -21,12 +25,16 @@
import com.iailab.module.model.mdk.vo.ScheduleResultVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+
+import static com.iailab.module.model.common.enums.ModelOutResultType.D;
/**
* @author PanZhibao
@@ -64,6 +72,11 @@
@Autowired
private DataPointApi dataPointApi;
+
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
+
+ public static final long offset = 60 * 3L;
/**
* 按模块预测
@@ -211,7 +224,9 @@
resp.setScheduleTime(reqDTO.getScheduleTime());
try {
log.info("调度计算开始: " + System.currentTimeMillis());
- ScheduleResultVO scheduleResult = scheduleModelHandler.doSchedule(reqDTO.getScheduleCode(), reqDTO.getScheduleTime());
+ 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);
@@ -225,70 +240,108 @@
return resp;
}
+ /**
+ * 执行调度模型
+ *
+ * @param reqDTO
+ * @return
+ */
+ @Override
+ public MdkScheduleRespDTO runSchedule(MdkScheduleReqDTO reqDTO) {
+ MdkScheduleRespDTO resp = new MdkScheduleRespDTO();
+ if (reqDTO.getScheduleTime() == null) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
+ calendar.set(Calendar.SECOND, 0);
+ reqDTO.setScheduleTime(calendar.getTime());
+ }
+ resp.setScheduleCode(reqDTO.getScheduleCode());
+ resp.setScheduleTime(reqDTO.getScheduleTime());
+ String catchKey = "ScheduleResult:" + reqDTO.getScheduleCode();
+ try {
+ if (redisTemplate.hasKey(catchKey)) {
+ log.info("查找调度结果缓存: " + catchKey);
+ return JSON.parseObject(JSONObject.toJSONString(redisTemplate.opsForValue().get(catchKey)), MdkScheduleRespDTO.class);
+ }
+ 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());
+ redisTemplate.opsForValue().set(catchKey, JSON.toJSONString(resp), offset, TimeUnit.SECONDS);
+ stScheduleSchemeService.updateTime(scheduleResult.getSchemeId(), scheduleResult.getScheduleTime(), scheduleResult.getResultCode());
+ log.info("预测计算结束: " + System.currentTimeMillis());
+ } catch (Exception ex) {
+ log.info("调度计算异常: " + System.currentTimeMillis());
+ ex.printStackTrace();
+ return resp;
+ }
+ 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{
- list.forEach(
- item -> {
- double value = 0;
- //判断点位是否下发以及返回结果是否存在
- if(item.getIsWrite()==1){
- if(result.get(item.getResultKey())==null){
- log.error(result.get(item.getResultKey()) + "resultKey匹配失败");
- }
- Object resultValue = result.get(item.getResultKey());
- //判断解析方式
- if(item.getResultType().equals("double")){
- if(resultValue instanceof Double) {
- value = (Double) resultValue;
- }
- }else if(item.getResultType().equals("double[]")){
- ArrayList<Double> doubleList = (ArrayList<Double>) resultValue;
- double[] array = new double[doubleList.size()];
- for (int i = 0; i < doubleList.size(); i++) {
- array[i] = doubleList.get(i);
- }
- if(array!= null && item.getResultPort() < array.length){
- value = array[item.getResultPort()];
- }else{
- log.error(result.get(item.getResultKey()) + "下角标超限");
- }
-
- }else if(item.getResultType().equals("double[][]")){
- if (item.getResultType().equals("double[][]")) {
- if (resultValue instanceof ArrayList) {
- ArrayList<ArrayList<Double>> doubleListList = (ArrayList<ArrayList<Double>>) resultValue;
- double[][] array = new double[doubleListList.size()][];
- for (int i = 0; i < doubleListList.size(); i++) {
- ArrayList<Double> doubleList = doubleListList.get(i);
- array[i] = new double[doubleList.size()];
- for (int j = 0; j < doubleList.size(); j++) {
- array[i][j] = doubleList.get(j);
- }
- }
- if (array != null && item.getResultPort() < array.length && item.getResultIndex() < array[item.getResultPort()].length) {
- value = array[item.getResultPort()][item.getResultIndex()];
- } else {
- log.error(result.get(item.getResultKey()) + "下标超限");
- }
- }
- }
- }
- //下发到point点位
- ApiPointValueWriteDTO ApiPointValueWriteDTO = new ApiPointValueWriteDTO();
- ApiPointValueWriteDTO.setPointNo(item.getPointNo());
- ApiPointValueWriteDTO.setValue(value);
- if (!dataPointApi.writePointRealValue(ApiPointValueWriteDTO)) {
- log.error(result.get(item.getResultKey()) + "下发数据异常");
- }
-
+ 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);
}
- }
- );
- }catch (Exception ex){
+ 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();
}
--
Gitblit v1.9.3