From 6205c22a959fbb3b69735f34af8d3316c4082a5d Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期四, 27 二月 2025 16:00:28 +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 | 199 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 185 insertions(+), 14 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..399c022 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,27 +1,39 @@ 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.enums.CommonConstant; +import com.iailab.module.model.enums.PredictItemTypeEnum; 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.entity.StAdjustConfigDetEntity; +import com.iailab.module.model.mcs.sche.entity.StScheduleSchemeEntity; +import com.iailab.module.model.mcs.sche.service.StAdjustConfigService; +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; import com.iailab.module.model.mdk.predict.PredictResultHandler; import com.iailab.module.model.mdk.schedule.ScheduleModelHandler; -import com.iailab.module.model.mdk.vo.DataValueVO; -import com.iailab.module.model.mdk.vo.ItemVO; -import com.iailab.module.model.mdk.vo.PredictResultVO; -import com.iailab.module.model.mdk.vo.ScheduleResultVO; +import com.iailab.module.model.mdk.vo.*; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; 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.math.BigDecimal; import java.util.*; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** @@ -55,6 +67,20 @@ @Autowired private StScheduleSchemeService stScheduleSchemeService; + @Autowired + private StScheduleModelOutService stScheduleModelOutService; + + @Autowired + private DataPointApi dataPointApi; + + @Autowired + private StAdjustConfigService stAdjustConfigService; + + @Autowired + private RedisTemplate<String, Object> redisTemplate; + + public static final long offset = 60 * 3L; + /** * 按模块预测 * @@ -75,15 +101,8 @@ if (reqDTO.getModuleType() == null) { throw new Exception("ModuleType不能为空"); } - Calendar calendar = Calendar.getInstance(); - calendar.setTime(reqDTO.getPredictTime()); - calendar.set(Calendar.MILLISECOND, 0); - calendar.set(Calendar.SECOND, 0); - reqDTO.setPredictTime(calendar.getTime()); + log.info("预测参数:" + JSON.toJSONString(reqDTO)); - MdkPredictModuleRespDTO result = new MdkPredictModuleRespDTO(); - result.setPredictTime(reqDTO.getPredictTime()); - result.setModuleType(reqDTO.getModuleType()); List<DmModuleEntity> moduleList = dmModuleService.getModuleByModuleType(reqDTO.getModuleType()); log.info("预测计算开始: " + System.currentTimeMillis()); for (DmModuleEntity module : moduleList) { @@ -175,6 +194,37 @@ return resp; } + @Override + public Boolean predictSimAdjust(MdkPredictSimAdjustReqDTO reqDTO) { + StScheduleSchemeEntity scheduleScheme = stScheduleSchemeService.getByCode(reqDTO.getScheduleCode()); + List<StAdjustConfigDetEntity> detList = stAdjustConfigService.getDetByModelId(scheduleScheme.getModelId()); + if (CollectionUtils.isEmpty(detList)) { + return Boolean.FALSE; + } + for (StAdjustConfigDetEntity det : detList) { + ItemVO predictItem = mmPredictItemService.getItemById(det.getPredictItemId()); + List<StAdjustDeviationDTO> deviationList = new ArrayList<>(); + switch (PredictItemTypeEnum.getEumById(det.getItemTypeId())) { + case NormalItem: + double adjustValue = new BigDecimal(reqDTO.getModelResult().get(det.getOutKey()).toString()).doubleValue(); + StAdjustDeviationDTO deviationItem = new StAdjustDeviationDTO(); + deviationItem.setPortIdx(det.getModelParamPortOrder()); + deviationItem.setParamIdx(det.getModelParamPortOrder()); + deviationItem.setValue(adjustValue); + deviationList.add(deviationItem); + break; + case MergeItem: + break; + default: + break; + } + // 开始预测 + predictModuleHandler.predictAdjust(predictItem, reqDTO.getPredictTime(), deviationList, scheduleScheme.getModelId()); + } + return Boolean.TRUE; + } + + /** * 预测调整 * @@ -201,10 +251,13 @@ 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); - 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 +266,122 @@ } 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(redisTemplate.opsForValue().get(catchKey).toString(), MdkScheduleRespDTO.class); + } + log.info("调度计算开始: " + System.currentTimeMillis()); + log.info("reqDTO=" + JSON.toJSONString(reqDTO)); + ScheduleResultVO scheduleResult = scheduleModelHandler.doSchedule(reqDTO.getScheduleCode(), reqDTO.getScheduleTime(), + reqDTO.getDynamicDataLength(), reqDTO.getDynamicSettings()); + if(StringUtils.isBlank(scheduleResult.getResultCode()) || !CommonConstant.MDK_STATUS_100.equals(scheduleResult.getResultCode())) { + stScheduleSchemeService.updateTime(scheduleResult.getSchemeId(), scheduleResult.getScheduleTime(), CommonConstant.MDK_STATUS_500); + throw new Exception("模型调用失败!"); + } + 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 { + 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: + 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"); + } + 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