diff --git a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java
index f94adfd..3168c6a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java
@@ -295,11 +295,10 @@
         if(!CollectionUtils.isEmpty(failControlList)){
             return ResponseData.error("门禁点：" + failControlList + "反控失败");
         }
-        //更新数据库中设备状态
-        if(deviceInfoService.updateBatchGateGroupStatus(deviceCodes, gateGroupDTO.getStatus()) <= 0){
-            log.error("更新数据库中设备状态失败");
-            return ResponseData.error("门禁点反控失败");
-        }
+//        if(deviceInfoService.updateBatchGateGroupStatus(deviceCodes, gateGroupDTO.getStatus()) <= 0){
+//            log.error("更新数据库中设备状态失败");
+//            return ResponseData.error("门禁点反控失败");
+//        }
         return ResponseData.success();
     }
 

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java
index f94adfd..3168c6a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java
@@ -295,11 +295,10 @@
         if(!CollectionUtils.isEmpty(failControlList)){
             return ResponseData.error("门禁点：" + failControlList + "反控失败");
         }
-        //更新数据库中设备状态
-        if(deviceInfoService.updateBatchGateGroupStatus(deviceCodes, gateGroupDTO.getStatus()) <= 0){
-            log.error("更新数据库中设备状态失败");
-            return ResponseData.error("门禁点反控失败");
-        }
+//        if(deviceInfoService.updateBatchGateGroupStatus(deviceCodes, gateGroupDTO.getStatus()) <= 0){
+//            log.error("更新数据库中设备状态失败");
+//            return ResponseData.error("门禁点反控失败");
+//        }
         return ResponseData.success();
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/controller/hik/HikController.java b/casic-server/src/main/java/com/casic/missiles/modular/controller/hik/HikController.java
index b8a4100..f499d2c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/controller/hik/HikController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/controller/hik/HikController.java
@@ -382,7 +382,7 @@
                             String url = HikUtil.hikApiFor302(HikUri.EVENT_PICTURE, reBody);
                             searchPicturesResponse.setFacePicUrl(url);
                             searchPicturesResponse.setBkgPicUrl(url);
-                            searchPicturesResponse.setSimilarity(null);
+                            searchPicturesResponse.setSimilarity("100%");
                             DateTime parse = DateUtil.parse(json1.getString("eventTime"));
                             String time = DateUtil.formatDateTime(parse);
                             searchPicturesResponse.setTime(time);

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java
index f94adfd..3168c6a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java
@@ -295,11 +295,10 @@
         if(!CollectionUtils.isEmpty(failControlList)){
             return ResponseData.error("门禁点：" + failControlList + "反控失败");
         }
-        //更新数据库中设备状态
-        if(deviceInfoService.updateBatchGateGroupStatus(deviceCodes, gateGroupDTO.getStatus()) <= 0){
-            log.error("更新数据库中设备状态失败");
-            return ResponseData.error("门禁点反控失败");
-        }
+//        if(deviceInfoService.updateBatchGateGroupStatus(deviceCodes, gateGroupDTO.getStatus()) <= 0){
+//            log.error("更新数据库中设备状态失败");
+//            return ResponseData.error("门禁点反控失败");
+//        }
         return ResponseData.success();
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/controller/hik/HikController.java b/casic-server/src/main/java/com/casic/missiles/modular/controller/hik/HikController.java
index b8a4100..f499d2c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/controller/hik/HikController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/controller/hik/HikController.java
@@ -382,7 +382,7 @@
                             String url = HikUtil.hikApiFor302(HikUri.EVENT_PICTURE, reBody);
                             searchPicturesResponse.setFacePicUrl(url);
                             searchPicturesResponse.setBkgPicUrl(url);
-                            searchPicturesResponse.setSimilarity(null);
+                            searchPicturesResponse.setSimilarity("100%");
                             DateTime parse = DateUtil.parse(json1.getString("eventTime"));
                             String time = DateUtil.formatDateTime(parse);
                             searchPicturesResponse.setTime(time);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/job/CockpitJob.java b/casic-server/src/main/java/com/casic/missiles/modular/job/CockpitJob.java
index 3052339..7b9b45f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/job/CockpitJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/job/CockpitJob.java
@@ -180,8 +180,10 @@
             }
             String orgIndexCode = next.getString("orgIndexCode");
             PersonSyncListDTO personSyncListDTO = new PersonSyncListDTO();
-            //物业人员（广州广电城市服务集团股份有限公司、广电物业）
-            if ("f7671dbc-4bed-4921-8b4c-2bb1831dfeb7".equals(orgIndexCode) || "fcbaea08-266d-4064-b190-d6a476de49e2".equals(orgIndexCode)) {
+            //物业人员（广州广电城市服务集团股份有限公司、广电物业/2024）
+            if ("f7671dbc-4bed-4921-8b4c-2bb1831dfeb7".equals(orgIndexCode)
+                    || "fcbaea08-266d-4064-b190-d6a476de49e2".equals(orgIndexCode)
+                    || "dec32468-0dfd-4545-92e3-8ad18ef38491".equals(orgIndexCode)) {
                 //由于安保人员和物业人员都在海康物业人员组织中，根据安保人员人脸分组获取人脸信息，根据人脸名字匹配安保人员（id不可以），设置安保人员类型
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("faceGroupIndexCode", "9f8c3c6b3d254279852d6f57862fece3");

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java
index f94adfd..3168c6a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java
@@ -295,11 +295,10 @@
         if(!CollectionUtils.isEmpty(failControlList)){
             return ResponseData.error("门禁点：" + failControlList + "反控失败");
         }
-        //更新数据库中设备状态
-        if(deviceInfoService.updateBatchGateGroupStatus(deviceCodes, gateGroupDTO.getStatus()) <= 0){
-            log.error("更新数据库中设备状态失败");
-            return ResponseData.error("门禁点反控失败");
-        }
+//        if(deviceInfoService.updateBatchGateGroupStatus(deviceCodes, gateGroupDTO.getStatus()) <= 0){
+//            log.error("更新数据库中设备状态失败");
+//            return ResponseData.error("门禁点反控失败");
+//        }
         return ResponseData.success();
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/controller/hik/HikController.java b/casic-server/src/main/java/com/casic/missiles/modular/controller/hik/HikController.java
index b8a4100..f499d2c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/controller/hik/HikController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/controller/hik/HikController.java
@@ -382,7 +382,7 @@
                             String url = HikUtil.hikApiFor302(HikUri.EVENT_PICTURE, reBody);
                             searchPicturesResponse.setFacePicUrl(url);
                             searchPicturesResponse.setBkgPicUrl(url);
-                            searchPicturesResponse.setSimilarity(null);
+                            searchPicturesResponse.setSimilarity("100%");
                             DateTime parse = DateUtil.parse(json1.getString("eventTime"));
                             String time = DateUtil.formatDateTime(parse);
                             searchPicturesResponse.setTime(time);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/job/CockpitJob.java b/casic-server/src/main/java/com/casic/missiles/modular/job/CockpitJob.java
index 3052339..7b9b45f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/job/CockpitJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/job/CockpitJob.java
@@ -180,8 +180,10 @@
             }
             String orgIndexCode = next.getString("orgIndexCode");
             PersonSyncListDTO personSyncListDTO = new PersonSyncListDTO();
-            //物业人员（广州广电城市服务集团股份有限公司、广电物业）
-            if ("f7671dbc-4bed-4921-8b4c-2bb1831dfeb7".equals(orgIndexCode) || "fcbaea08-266d-4064-b190-d6a476de49e2".equals(orgIndexCode)) {
+            //物业人员（广州广电城市服务集团股份有限公司、广电物业/2024）
+            if ("f7671dbc-4bed-4921-8b4c-2bb1831dfeb7".equals(orgIndexCode)
+                    || "fcbaea08-266d-4064-b190-d6a476de49e2".equals(orgIndexCode)
+                    || "dec32468-0dfd-4545-92e3-8ad18ef38491".equals(orgIndexCode)) {
                 //由于安保人员和物业人员都在海康物业人员组织中，根据安保人员人脸分组获取人脸信息，根据人脸名字匹配安保人员（id不可以），设置安保人员类型
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("faceGroupIndexCode", "9f8c3c6b3d254279852d6f57862fece3");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/service/impl/HikServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/service/impl/HikServiceImpl.java
index 3339e8c..8609cae 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/service/impl/HikServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/service/impl/HikServiceImpl.java
@@ -495,7 +495,7 @@
         String happenTime = DateUtil.formatDateTime(parse);
         //使用海康人脸唯一标识获取员工信息
         Map<String, Object> columnMap = new HashMap<>();
-        columnMap.put("staff_face_id", faceInfoCode);
+        columnMap.put("staff_code", faceInfoCode);
         List<StaffInfo> staffInfos = staffInfoMapper.selectByMap(columnMap);
         StaffInfo staffInfo = staffInfos.get(0);
         //存储考勤信息

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java
index f94adfd..3168c6a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/controller/DeviceController.java
@@ -295,11 +295,10 @@
         if(!CollectionUtils.isEmpty(failControlList)){
             return ResponseData.error("门禁点：" + failControlList + "反控失败");
         }
-        //更新数据库中设备状态
-        if(deviceInfoService.updateBatchGateGroupStatus(deviceCodes, gateGroupDTO.getStatus()) <= 0){
-            log.error("更新数据库中设备状态失败");
-            return ResponseData.error("门禁点反控失败");
-        }
+//        if(deviceInfoService.updateBatchGateGroupStatus(deviceCodes, gateGroupDTO.getStatus()) <= 0){
+//            log.error("更新数据库中设备状态失败");
+//            return ResponseData.error("门禁点反控失败");
+//        }
         return ResponseData.success();
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/controller/hik/HikController.java b/casic-server/src/main/java/com/casic/missiles/modular/controller/hik/HikController.java
index b8a4100..f499d2c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/controller/hik/HikController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/controller/hik/HikController.java
@@ -382,7 +382,7 @@
                             String url = HikUtil.hikApiFor302(HikUri.EVENT_PICTURE, reBody);
                             searchPicturesResponse.setFacePicUrl(url);
                             searchPicturesResponse.setBkgPicUrl(url);
-                            searchPicturesResponse.setSimilarity(null);
+                            searchPicturesResponse.setSimilarity("100%");
                             DateTime parse = DateUtil.parse(json1.getString("eventTime"));
                             String time = DateUtil.formatDateTime(parse);
                             searchPicturesResponse.setTime(time);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/job/CockpitJob.java b/casic-server/src/main/java/com/casic/missiles/modular/job/CockpitJob.java
index 3052339..7b9b45f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/job/CockpitJob.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/job/CockpitJob.java
@@ -180,8 +180,10 @@
             }
             String orgIndexCode = next.getString("orgIndexCode");
             PersonSyncListDTO personSyncListDTO = new PersonSyncListDTO();
-            //物业人员（广州广电城市服务集团股份有限公司、广电物业）
-            if ("f7671dbc-4bed-4921-8b4c-2bb1831dfeb7".equals(orgIndexCode) || "fcbaea08-266d-4064-b190-d6a476de49e2".equals(orgIndexCode)) {
+            //物业人员（广州广电城市服务集团股份有限公司、广电物业/2024）
+            if ("f7671dbc-4bed-4921-8b4c-2bb1831dfeb7".equals(orgIndexCode)
+                    || "fcbaea08-266d-4064-b190-d6a476de49e2".equals(orgIndexCode)
+                    || "dec32468-0dfd-4545-92e3-8ad18ef38491".equals(orgIndexCode)) {
                 //由于安保人员和物业人员都在海康物业人员组织中，根据安保人员人脸分组获取人脸信息，根据人脸名字匹配安保人员（id不可以），设置安保人员类型
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("faceGroupIndexCode", "9f8c3c6b3d254279852d6f57862fece3");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/service/impl/HikServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/service/impl/HikServiceImpl.java
index 3339e8c..8609cae 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/service/impl/HikServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/service/impl/HikServiceImpl.java
@@ -495,7 +495,7 @@
         String happenTime = DateUtil.formatDateTime(parse);
         //使用海康人脸唯一标识获取员工信息
         Map<String, Object> columnMap = new HashMap<>();
-        columnMap.put("staff_face_id", faceInfoCode);
+        columnMap.put("staff_code", faceInfoCode);
         List<StaffInfo> staffInfos = staffInfoMapper.selectByMap(columnMap);
         StaffInfo staffInfo = staffInfos.get(0);
         //存储考勤信息
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/service/impl/PropertyManageServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/service/impl/PropertyManageServiceImpl.java
index 2cc4573..0ec1d95 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/service/impl/PropertyManageServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/service/impl/PropertyManageServiceImpl.java
@@ -1232,17 +1232,20 @@
 
         List<SecurityScoreDTO> securityScoreDTOs = new ArrayList<>();
         caseInfos.forEach(caseInfo -> {
-            SecurityScoreDTO securityScoreDTO1 = new SecurityScoreDTO();
-            securityScoreDTO1.setPosition(caseInfo.getPosition());
-            securityScoreDTO1.setArea(caseInfo.getArea());
-            String hazardWeight = hazardScoreMap.get(caseInfo.getHazardLevelCode());
-            String categoryWeight = categoryScoreMap.get(caseInfo.getCategoryLevelCode());
-            //每个事件的扣分
-            BigDecimal score = new BigDecimal(hazardWeight).multiply(new BigDecimal(categoryWeight)).multiply(BigDecimal.valueOf(10));
+            //未解决事件
+            if ("1".equals(caseInfo.getStatus())) {
+                SecurityScoreDTO securityScoreDTO1 = new SecurityScoreDTO();
+                securityScoreDTO1.setPosition(caseInfo.getPosition());
+                securityScoreDTO1.setArea(caseInfo.getArea());
+                String hazardWeight = hazardScoreMap.get(caseInfo.getHazardLevelCode());
+                String categoryWeight = categoryScoreMap.get(caseInfo.getCategoryLevelCode());
+                //每个事件的扣分
+                BigDecimal score = new BigDecimal(hazardWeight).multiply(new BigDecimal(categoryWeight)).multiply(BigDecimal.valueOf(10));
 //            Double score = Double.valueOf(hazardWeight) * Double.valueOf(categoryWeight);
-            //使用BigDecimal过渡保证精度
-            securityScoreDTO1.setScore(score.doubleValue());
-            securityScoreDTOs.add(securityScoreDTO1);
+                //使用BigDecimal过渡保证精度
+                securityScoreDTO1.setScore(score.doubleValue());
+                securityScoreDTOs.add(securityScoreDTO1);
+            }
         });
         //过滤空position
         List<SecurityScoreDTO> collect2 = securityScoreDTOs.stream().filter(securityScoreDTO1 ->
@@ -1266,13 +1269,15 @@
         }
         //楼栋根据事件评分
         Map<String, List<SecurityScoreDTO>> collect = collect2.stream().collect(Collectors.groupingBy(SecurityScoreDTO::getPosition));
-        collect.keySet().forEach(key -> {
-            List<SecurityScoreDTO> list = collect.get(key);
-            Double sumValue = list.stream().collect(Collectors.summingDouble(s -> s.getScore().doubleValue()));
-            String dictValue = dictService.getDictNameByCode(SecurityEventDict.DEVICE_POSITION, key);
-            resultOneMap.put(dictValue, String.valueOf(new BigDecimal(resultOneMap.get(dictValue)).subtract(BigDecimal.valueOf(sumValue))));
-            resultOneMap.put(dictValue+"描述", list.size()+"件安防事件未解决;");
-        });
+        if (!CollectionUtils.isEmpty(collect)) {
+            collect.keySet().forEach(key -> {
+                List<SecurityScoreDTO> list = collect.get(key);
+                Double sumValue = list.stream().collect(Collectors.summingDouble(s -> s.getScore().doubleValue()));
+                String dictValue = dictService.getDictNameByCode(SecurityEventDict.DEVICE_POSITION, key);
+                resultOneMap.put(dictValue, String.valueOf(new BigDecimal(resultOneMap.get(dictValue)).subtract(BigDecimal.valueOf(sumValue))));
+                resultOneMap.put(dictValue+"描述", list.size()+"件安防事件未解决;");
+            });
+        }
         //各楼栋设备维修次数（发生一次维修减5分)
         //当天在设备维修期间的设备个数及所在楼栋
         List<RepairTodayDTO> todayDTOList = repairLogMapper.selectTodayList();