qdintc/fishery-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 告警电话记录和报警记录，新增告警标题查询条件。

Browse Source
This commit is contained in:
tianyongbao
2026-05-06 22:50:00 +08:00
parent f537582698
commit 72c1fddc4c
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/CallNoticeServiceImpl.java
View File

@@ -171,6 +171,12 @@ public class CallNoticeServiceImpl implements ICallNoticeService {
wrapper.apply("mw.warn_type = {0}", warnType); wrapper.apply("mw.warn_type = {0}", warnType);
} }
// 处理告警标题模糊查询
String warnTitle = (String) params.get("warnTitle");
if (StringUtils.isNotBlank(warnTitle)) {
wrapper.like("mw.title", warnTitle);
}
// 处理告警ID精确查询 // 处理告警ID精确查询
Object messageWarnIdObj = params.get("messageWarnId"); Object messageWarnIdObj = params.get("messageWarnId");
if (messageWarnIdObj != null) { if (messageWarnIdObj != null) {

5
intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/MessageWarnServiceImpl.java
View File

@@ -109,6 +109,7 @@ public class MessageWarnServiceImpl implements IMessageWarnService {
.eq(bo.getDeviceId() != null, MessageWarn::getDeviceId, bo.getDeviceId()) .eq(bo.getDeviceId() != null, MessageWarn::getDeviceId, bo.getDeviceId())
.eq(StringUtils.isNotBlank(bo.getTitle()), MessageWarn::getTitle, bo.getTitle()) .eq(StringUtils.isNotBlank(bo.getTitle()), MessageWarn::getTitle, bo.getTitle())
.eq(StringUtils.isNotBlank(bo.getMessage()), MessageWarn::getMessage, bo.getMessage()) .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.getIsRead() != null, MessageWarn::getIsRead, bo.getIsRead())
.eq(bo.getWarnType() != null, MessageWarn::getWarnType, bo.getWarnType()) .eq(bo.getWarnType() != null, MessageWarn::getWarnType, bo.getWarnType())
.like(StringUtils.isNotBlank(bo.getPondName()), MessageWarn::getPondName, bo.getPondName()) .like(StringUtils.isNotBlank(bo.getPondName()), MessageWarn::getPondName, bo.getPondName())
@@ -224,11 +225,11 @@ public class MessageWarnServiceImpl implements IMessageWarnService {
public Boolean readAllMessages(Long userId) { public Boolean readAllMessages(Long userId) {
MessageWarn update = new MessageWarn(); MessageWarn update = new MessageWarn();
update.setIsRead(1); update.setIsRead(1);
LambdaQueryWrapper<MessageWarn> wrapper = Wrappers.lambdaQuery(MessageWarn.class) LambdaQueryWrapper<MessageWarn> wrapper = Wrappers.lambdaQuery(MessageWarn.class)
.eq(MessageWarn::getUserId, userId) .eq(MessageWarn::getUserId, userId)
.eq(MessageWarn::getIsRead, 0); .eq(MessageWarn::getIsRead, 0);
return baseMapper.update(update, wrapper) > 0; return baseMapper.update(update, wrapper) > 0;
} }
} }