From bb288009b54b3baa6ccac357a83090c22813ff53 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 13 十二月 2024 10:21:00 +0800
Subject: [PATCH] 1、工作流优化代码更新 2、BeanUtils增加copyProperties方法 3、CollectionUtils增加PageResult方法 4、数据权限sql拼接dept_id in时左右()的处理 5、删除应用时查询菜单bug修复
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 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 6bb4bbe..fa66d48 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
@@ -19,6 +19,7 @@
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.StScheduleSuggestEntity;
+import com.iailab.module.model.mcs.sche.service.StScheduleSchemeService;
import com.iailab.module.model.mcs.sche.service.StScheduleSuggestService;
import com.iailab.module.model.mdk.vo.ItemVO;
import com.iailab.module.model.mpk.service.ChartService;
@@ -75,6 +76,12 @@
@Autowired
private PlanItemApi planItemApi;
+
+ @Autowired
+ private MmPredictAlarmConfigService mmPredictAlarmConfigService;
+
+ @Autowired
+ private StScheduleSchemeService stScheduleSchemeService;
private int HOUR_MINS = 60;
@@ -295,6 +302,8 @@
if (resultStr == null) {
return result;
}
+ String resultIndex = chartParams.get(CommonConstant.RESULT_INDEX);
+
ItemVO predictItem = mmPredictItemService.getItemByItemNo(itemCode);
if (predictItem == null || predictItem.getLastTime() == null) {
return result;
@@ -315,7 +324,7 @@
List<String> categories = DateUtils.getTimeScale(startTime, endTime, predictItem.getGranularity(), timeFormat);
List<String> legend = new ArrayList<>();
- MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), resultStr);
+ MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), resultStr, resultIndex);
PreDataViewRespDTO dataView = new PreDataViewRespDTO();
dataView.setItemId(predictItem.getId());
dataView.setItemName(predictItem.getItemName());
@@ -496,6 +505,11 @@
}
@Override
+ public List<AlarmConfigRespDTO> listAlarmConfig(Map<String, Object> params) {
+ return mmPredictAlarmConfigService.list(params);
+ }
+
+ @Override
public AlarmMessageRespDTO getLastAlarmMessage(String alarmObj) {
MmPredictAlarmMessageEntity entity = mmPredictAlarmMessageService.getLast(alarmObj);
return ConvertUtils.sourceToTarget(entity, AlarmMessageRespDTO.class);
@@ -504,6 +518,11 @@
@Override
public Boolean createScheduleSuggest(ScheduleSuggestRespDTO dto) {
return true;
+ }
+
+ @Override
+ public List<ScheduleSuggestRespDTO> listScheduleSuggest(Map<String, Object> params) {
+ return Collections.emptyList();
}
@Override
@@ -522,6 +541,11 @@
return true;
}
+ @Override
+ public List<StScheduleSchemeDTO> listScheduleScheme(Map<String, Object> params) {
+ 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