From 2fd6e6eda3be29e5d77519fd0ca75ae172a11c46 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 16 十二月 2025 18:25:17 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
index cf3faef..38fdeae 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
@@ -67,6 +67,9 @@
private DeviceMapper deviceMapper;
@Autowired
+ private InterfaceLogMapper interfaceLogMapper;
+
+ @Autowired
private MemberMapper memberMapper;
@Autowired
@@ -715,24 +718,24 @@
warningEvent.setStatus(Constants.TWO);
warningEventMapper.updateById(warningEvent);
}
-
}
-
}
}
}
public void sendDeviceNotice(WarningRule warningRule){
- if(Constants.equalsInteger(warningRule.getDeviceNotice(),Constants.ONE)&&StringUtils.isNotBlank(warningRule.getDeviceIds())&&StringUtils.isNotBlank(warningRule.getDeviceNoticeContent())){
+ if(Constants.equalsInteger(warningRule.getDeviceNotice(),Constants.ONE)
+ &&StringUtils.isNotBlank(warningRule.getDeviceIds())
+ &&StringUtils.isNotBlank(warningRule.getDeviceNoticeContent())){
List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>()
.lambda()
.eq(Device::getStatus,Constants.ZERO)
- .eq(Device::getId,Arrays.asList(warningRule.getDeviceIds().split(",")))
+ .in(Device::getId,Arrays.asList(warningRule.getDeviceIds().split(",")))
);
if(CollectionUtils.isNotEmpty(deviceList)){
for (Device device:deviceList) {
device.setSendInfo(warningRule.getDeviceNoticeContent());
- DeviceServiceImpl.sendBroadcaseBobaoHttpBiz(device);
+ DeviceServiceImpl.sendBroadcaseBobaoHttpBiz(device,interfaceLogMapper);
}
}
}
@@ -905,9 +908,9 @@
return false;
}
for (WarningRuleDetail warningRuleDetail:warningRuleDetails) {
- if(Objects.nonNull(warningRuleDetail.getRegionId())){
+ if(Objects.nonNull(warningRuleDetail.getDeviceId())){
if(warningEventList.stream().filter(i->Constants.equalsInteger(i.getWarningId(),warningRuleDetail.getWarningId())
- && StringUtils.isNotBlank(i.getRegionId()) && i.getRegionId().equals(warningRuleDetail.getRegionId())
+ && StringUtils.isNotBlank(i.getDeviceId()) && i.getDeviceId().equals(warningRuleDetail.getDeviceId())
).collect(Collectors.toList()).size()<=Constants.ZERO){
return false;
}
--
Gitblit v1.9.3