diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/CallNoticeServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/CallNoticeServiceImpl.java index e35d5ac..5bad4c4 100644 --- a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/CallNoticeServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/CallNoticeServiceImpl.java @@ -171,6 +171,12 @@ public class CallNoticeServiceImpl implements ICallNoticeService { wrapper.apply("mw.warn_type = {0}", warnType); } + // 处理告警标题模糊查询 + String warnTitle = (String) params.get("warnTitle"); + if (StringUtils.isNotBlank(warnTitle)) { + wrapper.like("mw.title", warnTitle); + } + // 处理告警ID精确查询 Object messageWarnIdObj = params.get("messageWarnId"); if (messageWarnIdObj != null) { diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/MessageWarnServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/MessageWarnServiceImpl.java index 2e2e3b2..5824bd4 100644 --- a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/MessageWarnServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/MessageWarnServiceImpl.java @@ -109,6 +109,7 @@ public class MessageWarnServiceImpl implements IMessageWarnService { .eq(bo.getDeviceId() != null, MessageWarn::getDeviceId, bo.getDeviceId()) .eq(StringUtils.isNotBlank(bo.getTitle()), MessageWarn::getTitle, bo.getTitle()) .eq(StringUtils.isNotBlank(bo.getMessage()), MessageWarn::getMessage, bo.getMessage()) + .like(StringUtils.isNotBlank(bo.getTitle()), MessageWarn::getTitle, bo.getTitle()) .eq(bo.getIsRead() != null, MessageWarn::getIsRead, bo.getIsRead()) .eq(bo.getWarnType() != null, MessageWarn::getWarnType, bo.getWarnType()) .like(StringUtils.isNotBlank(bo.getPondName()), MessageWarn::getPondName, bo.getPondName()) @@ -224,11 +225,11 @@ public class MessageWarnServiceImpl implements IMessageWarnService { public Boolean readAllMessages(Long userId) { MessageWarn update = new MessageWarn(); update.setIsRead(1); - + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(MessageWarn.class) .eq(MessageWarn::getUserId, userId) .eq(MessageWarn::getIsRead, 0); - + return baseMapper.update(update, wrapper) > 0; } }