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/McsApiImpl.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 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 965a3cd..92e3e0e 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
@@ -8,6 +8,7 @@
import com.iailab.module.data.api.point.dto.ApiPointDTO;
import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
+import com.iailab.module.data.api.point.dto.ApiPointValueWriteDTO;
import com.iailab.module.data.common.ApiDataQueryDTO;
import com.iailab.module.model.api.mcs.McsApi;
import com.iailab.module.model.api.mcs.dto.*;
@@ -18,9 +19,12 @@
import com.iailab.module.model.mcs.pre.entity.MmPredictAlarmMessageEntity;
import com.iailab.module.model.mcs.pre.service.*;
import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmMessageSaveReqVO;
+import com.iailab.module.model.mcs.sche.entity.StScheduleModelOutEntity;
import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity;
+import com.iailab.module.model.mcs.sche.service.StScheduleModelOutService;
import com.iailab.module.model.mcs.sche.service.StScheduleSchemeService;
import com.iailab.module.model.mcs.sche.service.StScheduleSuggestService;
+import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestSaveReqVO;
import com.iailab.module.model.mdk.vo.ItemVO;
import com.iailab.module.model.mpk.service.ChartService;
import lombok.extern.slf4j.Slf4j;
@@ -45,6 +49,9 @@
public class McsApiImpl implements McsApi {
@Autowired
+ private DataPointApi dataPointApi;
+
+ @Autowired
private DmModuleService dmModuleService;
@Autowired
@@ -58,9 +65,6 @@
@Autowired
private MmItemResultLastPointService mmItemResultLastPointService;
-
- @Autowired
- private DataPointApi dataPointApi;
@Autowired
private MmItemResultJsonService mmItemResultJsonService;
@@ -235,7 +239,7 @@
@Override
public PreDataItemChartRespVO getPreDataItemChart(PreDataItemChartReqVO reqVO) {
PreDataItemChartRespVO result = new PreDataItemChartRespVO();
- ItemVO predictItem = mmPredictItemService.getItemByIdFromCache(reqVO.getItemId());
+ ItemVO predictItem = mmPredictItemService.getItemById(reqVO.getItemId());
if (predictItem == null) {
return result;
}
@@ -274,7 +278,9 @@
for (MmItemOutputEntity out : outs) {
legend.add(out.getResultName());
PreDataSampleViewRespDTO viewDto = new PreDataSampleViewRespDTO();
- viewDto.setRealData(getHisData(out.getPointid(), startTime, endTime));
+ if (StringUtils.isNotBlank(out.getPointid())) {
+ viewDto.setRealData(getHisData(out.getPointid(), startTime, endTime));
+ }
viewDto.setPreDataN(mmItemResultService.getData(out.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
viewMap.put(out.getResultName(), viewDto);
}
@@ -333,7 +339,11 @@
dataView.setRangeL(rangeL);
dataView.setLimitH(limitH);
dataView.setLimitL(limitL);
- dataView.setRealData(getHisData(outPut.getPointid(), startTime, endTime, timeFormat));
+ if (StringUtils.isNotBlank(outPut.getPointid())) {
+ dataView.setRealData(getHisData(outPut.getPointid(), startTime, endTime, timeFormat));
+ } else {
+ dataView.setRealData(new ArrayList<>());
+ }
dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat));
switch (lineType) {
case TN:
@@ -517,6 +527,7 @@
@Override
public Boolean createScheduleSuggest(ScheduleSuggestRespDTO dto) {
+ stScheduleSuggestService.create(ConvertUtils.sourceToTarget(dto, StScheduleSuggestSaveReqVO.class));
return true;
}
@@ -542,10 +553,12 @@
}
@Override
- public List<StScheduleSchemeDTO> listScheduleScheme(Map<String, Object> params) {
+ public List<StScheduleSchemeDTO> listScheduleScheme(String triggerMethod, String triggerCondition) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("triggerMethod", triggerMethod);
+ params.put("triggerCondition", triggerCondition);
return stScheduleSchemeService.list(params);
}
-
private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) {
Date[] result = new Date[3];
--
Gitblit v1.9.3