From c3c7a6918f0e2dfe597c339117e4185b641be95f Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期一, 24 二月 2025 15:10:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
index aea343c..7a3a97b 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -27,6 +27,7 @@
import com.iailab.module.model.mcs.pre.vo.MmItemOutputRespVO;
import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmMessageSaveReqVO;
import com.iailab.module.model.mcs.pre.vo.MmPredictItemRespVO;
+import com.iailab.module.model.mcs.sche.entity.StAdjustConfigDetEntity;
import com.iailab.module.model.mcs.sche.entity.StScheduleModelEntity;
import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity;
import com.iailab.module.model.mcs.sche.service.*;
@@ -113,6 +114,8 @@
@Autowired
private StScheduleModelSettingService stScheduleModelSettingService;
+ @Autowired
+ private StAdjustConfigService stAdjustConfigService;
private int HOUR_MINS = 60;
@@ -394,7 +397,7 @@
} else {
dataView.setRealData(new ArrayList<>());
}
- dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat));
+ dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat, 3));
dataView.setLineType(lineType.getCode());
switch (lineType) {
case TN:
@@ -801,6 +804,12 @@
return true;
}
+ @Override
+ public List<StAdjustConfigDetDTO> getAdjustConfigListByModelId(String modelId) {
+ List<StAdjustConfigDetEntity> list = stAdjustConfigService.getDetByModelId(modelId);
+ return ConvertUtils.sourceToTarget(list, StAdjustConfigDetDTO.class);
+ }
+
/**
* 计算功率因数 p²/（根号：p²+Q²）
**/
--
Gitblit v1.9.3