From d79c5f396b23520e6370e9d9b6abc31938a0e83f Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 29 四月 2025 18:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmMessageServiceImpl.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmMessageServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmMessageServiceImpl.java
index f181254..a58b9ed 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmMessageServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmMessageServiceImpl.java
@@ -9,13 +9,11 @@
import com.iailab.module.model.mcs.pre.service.MmPredictAlarmMessageService;
import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmMessagePageReqVO;
import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmMessageSaveReqVO;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
/**
* @author PanZhibao
@@ -47,6 +45,17 @@
}
@Override
+ public List<MmPredictAlarmMessageEntity> getList(List<String> alarmObjList, Date predictTime) {
+ if (CollectionUtils.isEmpty(alarmObjList)) {
+ return new ArrayList<>();
+ }
+ QueryWrapper<MmPredictAlarmMessageEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("alarm_obj", alarmObjList);
+ queryWrapper.eq("alarm_time", predictTime);
+ return baseDao.selectList(queryWrapper);
+ }
+
+ @Override
public List<MmPredictAlarmMessageEntity> getList(String alarmObj, Date alarmTime) {
QueryWrapper<MmPredictAlarmMessageEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("alarm_obj", alarmObj)
@@ -55,6 +64,16 @@
}
@Override
+ public List<MmPredictAlarmMessageEntity> getList(String alarmObj, Date alarmTime, String title) {
+ QueryWrapper<MmPredictAlarmMessageEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("alarm_obj", alarmObj)
+ .eq("alarm_time", alarmTime)
+ .eq(StringUtils.isNotBlank(title),"title", title);
+
+ return baseDao.selectList(queryWrapper);
+ }
+
+ @Override
public void create(MmPredictAlarmMessageSaveReqVO reqVO) {
MmPredictAlarmMessageEntity entity = BeanUtils.toBean(reqVO, MmPredictAlarmMessageEntity.class);
entity.setId(UUID.randomUUID().toString());
--
Gitblit v1.9.3