From 337e1145cfec2bd18e859a4336725cb64943c175 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期五, 06 六月 2025 14:04:11 +0800
Subject: [PATCH] 建议快照 上下限 越界时间
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestSnapshotRecordServiceImpl.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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 dd85afd..333e2cc 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,6 +1,9 @@
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;
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
@@ -27,11 +30,13 @@
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;
@@ -91,7 +96,10 @@
@Override
public List<StSuggestSnapshotRecordRespVO> getListBySuggestId(String suggestId) {
- return ConvertUtils.sourceToTarget(baseDao.selectList("suggest_id", suggestId), StSuggestSnapshotRecordRespVO.class);
+ QueryWrapper<StSuggestSnapshotRecordEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("suggest_id", suggestId);
+ queryWrapper.orderByAsc("sort");
+ return ConvertUtils.sourceToTarget(baseDao.selectList(queryWrapper), StSuggestSnapshotRecordRespVO.class);
}
@Override
@@ -119,6 +127,10 @@
snapshotRecordSaveReqVO.setDataType(confDet.getDataType());
snapshotRecordSaveReqVO.setDataName(confDet.getDataName());
snapshotRecordSaveReqVO.setScheduleTime(scheduleTime);
+ snapshotRecordSaveReqVO.setSort(confDet.getSort());
+ snapshotRecordSaveReqVO.setLimitH(confDet.getLimitH());
+ snapshotRecordSaveReqVO.setLimitL(confDet.getLimitL());
+ snapshotRecordSaveReqVO.setSort(confDet.getSort());
//计算开始时间,开始时间为当前调度时间减去快照配置表配置的左侧时间长度
LocalDateTime localStartDateTime = scheduleTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().minusMinutes(confDet.getLeftLength() == null ? 60 : confDet.getLeftLength());
Date startTime = Date.from(localStartDateTime.atZone(ZoneId.systemDefault()).toInstant());
@@ -186,6 +198,17 @@
}
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);
+ }
+
});
return reqList;
}
--
Gitblit v1.9.3