From 5decddf6a5dd2cda32880c07c545b8246ceada2d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 11 十二月 2025 11:54:20 +0800
Subject: [PATCH] 钥匙柜开门添加 指纹方式

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 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..0a94c19 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,9 +718,7 @@
                         warningEvent.setStatus(Constants.TWO);
                         warningEventMapper.updateById(warningEvent);
                     }
-
                 }
-
             }
         }
     }
@@ -732,7 +733,7 @@
             if(CollectionUtils.isNotEmpty(deviceList)){
                 for (Device device:deviceList) {
                     device.setSendInfo(warningRule.getDeviceNoticeContent());
-                    DeviceServiceImpl.sendBroadcaseBobaoHttpBiz(device);
+                    DeviceServiceImpl.sendBroadcaseBobaoHttpBiz(device,interfaceLogMapper);
                 }
             }
         }
@@ -905,9 +906,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