From f2d87e1e765f525c63b742943c8b865032db82df Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 19 三月 2025 07:45:41 +0800
Subject: [PATCH] 模型调整
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 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 334d710..883b075 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.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;
@@ -14,6 +15,7 @@
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.StAdjustConfigEntity;
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;
@@ -196,30 +198,47 @@
@Override
public Boolean predictSimAdjust(MdkPredictSimAdjustReqDTO reqDTO) {
+ log.info("开始模拟调整");
+ log.info("ModelResult:" + JSONObject.toJSONString(reqDTO.getModelResult()));
StScheduleSchemeEntity scheduleScheme = stScheduleSchemeService.getByCode(reqDTO.getScheduleCode());
- List<StAdjustConfigDetEntity> detList = stAdjustConfigService.getDetByModelId(scheduleScheme.getModelId());
- if (CollectionUtils.isEmpty(detList)) {
+ Map<StAdjustConfigEntity, List<StAdjustConfigDetEntity>> configMap = stAdjustConfigService.getAdjustConfigMap(scheduleScheme.getModelId());
+ if (CollectionUtils.isEmpty(configMap)) {
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;
+ for (Map.Entry<StAdjustConfigEntity, List<StAdjustConfigDetEntity>> entry : configMap.entrySet()) {
+ log.info("AdjustConfigID=" + entry.getKey().getId());
+ if (CollectionUtils.isEmpty(entry.getValue())) {
+ continue;
}
- // 开始预测
- predictModuleHandler.predictAdjust(predictItem, reqDTO.getPredictTime(), deviationList, scheduleScheme.getModelId(), det.getConfigId());
+ String firstOutKey = entry.getValue().get(0).getOutKey();
+ BigDecimal firstAdjustValue = new BigDecimal(reqDTO.getModelResult().get(firstOutKey.trim()).toString().trim());
+ if (BigDecimal.ZERO.compareTo(firstAdjustValue) == 0) {
+ log.info("adjustValue = ZERO");
+ continue;
+ }
+ for (StAdjustConfigDetEntity det : entry.getValue()) {
+ ItemVO predictItem = mmPredictItemService.getItemById(det.getPredictItemId());
+ List<StAdjustDeviationDTO> deviationList = new ArrayList<>();
+ switch (PredictItemTypeEnum.getEumById(det.getItemTypeId())) {
+ case NormalItem:
+ double adjustValue = 0;
+ if (StringUtils.isNotBlank(det.getOutKey().trim())) {
+ adjustValue = new BigDecimal(reqDTO.getModelResult().get(det.getOutKey().trim()).toString()).doubleValue();
+ }
+ StAdjustDeviationDTO deviationItem = new StAdjustDeviationDTO();
+ deviationItem.setPortIdx(det.getModelParamPortOrder() == null ? 0 : det.getModelParamPortOrder());
+ deviationItem.setParamIdx(det.getModelParamOrder() == null ? 0 : det.getModelParamOrder());
+ deviationItem.setValue(adjustValue);
+ deviationList.add(deviationItem);
+ break;
+ case MergeItem:
+ break;
+ default:
+ break;
+ }
+ // 开始预测
+ predictModuleHandler.predictAdjust(predictItem, reqDTO.getPredictTime(), deviationList, scheduleScheme.getModelId(), det.getConfigId());
+ }
}
return Boolean.TRUE;
}
--
Gitblit v1.9.3