From 5d5beff9a275aafaa95daa01839083e436c8c12b Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Wed, 6 May 2026 22:50:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=91=8A=E8=AD=A6=E7=94=B5=E8=AF=9D?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=92=8C=E6=8A=A5=E8=AD=A6=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=91=8A=E8=AD=A6=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../intc/fishery/service/impl/CallNoticeServiceImpl.java | 6 ++++++ .../intc/fishery/service/impl/MessageWarnServiceImpl.java | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) 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; } }