From e7a52d9e21eddb8ff94fb2b0ac95e4d7da541ed2 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 11 六月 2025 17:22:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestSnapshotRecordServiceImpl.java | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestSnapshotRecordServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestSnapshotRecordServiceImpl.java
index 333e2cc..c316e4d 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestSnapshotRecordServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestSnapshotRecordServiceImpl.java
@@ -1,7 +1,5 @@
package com.iailab.module.model.mcs.sche.service.impl;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.format.DateParser;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iailab.framework.common.service.impl.BaseServiceImpl;
@@ -23,26 +21,23 @@
import com.iailab.module.model.common.utils.DateUtils;
import com.iailab.module.model.mcs.pre.service.MmItemResultService;
import com.iailab.module.model.mcs.sche.dao.StSuggestSnapshotRecordDao;
+import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity;
import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotRecordEntity;
+import com.iailab.module.model.mcs.sche.service.StScheduleSuggestService;
import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotConfDetService;
import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotConfMainService;
import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotRecordService;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetRespVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainRespVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotRecordSaveReqVO;
-import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
import static com.iailab.module.model.common.utils.DateUtils.DATE_TIME_PATTERN;
@@ -65,13 +60,14 @@
@Autowired
private MmItemResultService mmItemResultService;
-
-
@Autowired
private StSuggestSnapshotConfMainService stSuggestSnapshotConfMainService;
@Autowired
private StSuggestSnapshotConfDetService stSuggestSnapshotConfDetService;
+
+ @Autowired
+ private StScheduleSuggestService stScheduleSuggestService;
@Override
@DSTransactional(rollbackFor = Exception.class)
@@ -136,7 +132,7 @@
Date startTime = Date.from(localStartDateTime.atZone(ZoneId.systemDefault()).toInstant());
snapshotRecordSaveReqVO.setStartTime(startTime);
//计算结束时间,结束时间为当前调度时间加上快照配置表配置的右侧时间长度
- LocalDateTime localEndDateTime = scheduleTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().plusMinutes(confDet.getRightLength() == null ? 60 : confDet.getLeftLength());
+ LocalDateTime localEndDateTime = scheduleTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().plusMinutes(confDet.getRightLength() == null ? 60 : confDet.getRightLength());
Date endTime = Date.from(localEndDateTime.atZone(ZoneId.systemDefault()).toInstant());
snapshotRecordSaveReqVO.setEndTime(endTime);
this.create(snapshotRecordSaveReqVO);
@@ -145,6 +141,7 @@
@Override
public List<StSuggestSnapshotRecordRespVO> getChartData(List<StSuggestSnapshotRecordRespVO> reqList) {
+ Map<String,StScheduleSuggestEntity> suggestInfos = new HashMap<>(reqList.size());
reqList.forEach(item -> {
List<Object[]> dataList = new ArrayList<>();
if(DataCategoryEnum.DATAPOINT.getCode().equals(item.getDataType())){
@@ -198,17 +195,29 @@
}
item.setDataList(dataList);
- if (!CollectionUtils.isEmpty(dataList)) {
- List<String> overLimitTimes = new ArrayList<>();
- dataList.forEach(data -> {
- BigDecimal value = new BigDecimal(data[1].toString());
- if (value.compareTo(item.getLimitH()) >= 0 || value.compareTo(item.getLimitL()) <= 0) {
- overLimitTimes.add(data[0].toString());
- }
- });
- item.setOverLimitTimes(overLimitTimes);
- }
+// 越界时间
+// if (!CollectionUtils.isEmpty(dataList)) {
+// List<String> overLimitTimes = new ArrayList<>();
+// dataList.forEach(data -> {
+// BigDecimal value = new BigDecimal(data[1].toString());
+// if ((item.getLimitH() != null &&value.compareTo(item.getLimitH()) >= 0) || (item.getLimitL() != null && value.compareTo(item.getLimitL()) <= 0)) {
+// overLimitTimes.add(data[0].toString());
+// }
+// });
+// item.setOverLimitTimes(overLimitTimes);
+// }
+ // 建议处理时间
+ String suggestId = item.getSuggestId();
+ StScheduleSuggestEntity suggestInfo;
+ if (suggestInfos.containsKey(suggestId)) {
+ suggestInfo = suggestInfos.get(suggestId);
+ }else {
+ suggestInfo = stScheduleSuggestService.getInfo(suggestId);
+ suggestInfos.put(suggestId,suggestInfo);
+ }
+ item.setStatus(suggestInfo.getStatus());
+ item.setHandleTime(suggestInfo.getHandleTime());
});
return reqList;
}
--
Gitblit v1.9.3