From db8472b9471de96a68c7fcdb2e66124b2f16854b Mon Sep 17 00:00:00 2001 From: liriming <1343021927@qq.com> Date: 星期三, 02 四月 2025 17:14:56 +0800 Subject: [PATCH] 采纳建议接口 --- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmMessageServiceImpl.java | 19 +++++++++++++++---- 1 files changed, 15 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 057965d..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 @@ -48,6 +46,9 @@ @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); @@ -63,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