From 8521c18416267476d4fcdf945c0e4d6520ba5a2a Mon Sep 17 00:00:00 2001 From: zc Date: Tue, 2 Sep 2025 13:41:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B4=E5=AE=89=E4=BC=98=E5=8C=96=E9=9A=8F?= =?UTF-8?q?=E8=AE=BF=E4=BA=BA=E5=91=98=E7=BB=91=E5=AE=9A=E5=AE=87=E6=B3=9B?= =?UTF-8?q?=E8=A7=84=E5=88=99=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visitor/controller/VisitorController.java | 13 +++++++++---- .../com/dcsoft/system/visitor/domain/Visitor.java | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java index bcb7736..62a2d36 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java @@ -1079,9 +1079,9 @@ public class VisitorController extends BaseController { for (Visitor visitor2 : visitors) { Visitor visitorInfo = new Visitor(); visitor2.setUserId(visitor1.getUserId()); - visitor2.setRuleGuid(s.getRuleGuid()); + visitor2.setRuleGuidMap(s.getRuleGuidMap()); log.info("======开始下发从数据人脸信息：{}", visitor1.getId()); - log.info("从数据规则id：{}", s.getRuleGuid()); + log.info("从数据规则id：{}", JSON.toJSONString(s.getRuleGuidMap())); Visitor visitorId = deviceDistribute(visitor2, 2); visitorInfo.setId(visitor2.getId()); visitorInfo.setGuid(visitorId.getGuid()); @@ -1472,6 +1472,8 @@ public class VisitorController extends BaseController { String faceId = IdUtils.simpleUUID(); s.setGuid(guid); s.setFaceGuid(faceId); + + Map map = new HashMap<>(); //通过规则获取绑定设备信息 for (SysEquipment e : equipList) { //将人员信息下发到设备 @@ -1483,7 +1485,7 @@ public class VisitorController extends BaseController { String ip = e.getIp(); String pass = e.getPassword(); //添加临时规则 - String ruleGuid = visitor.getRuleGuid(); + String ruleGuid = ""; if(type == 1) { String s1 = sdkService.ruleCreate("vis_" + visitor.getId(), ip, pass, visitor.getStartTime(), visitor.getEndTime()); log.info("设备：{}-创建规则结果：{}", e.getIp(), s1); @@ -1493,7 +1495,9 @@ public class VisitorController extends BaseController { continue; } ruleGuid = jsonObject1.getJSONObject("data").getString("ruleId"); - s.setRuleGuid(ruleGuid); + map.put(ip, ruleGuid); + } else { + ruleGuid = visitor.getRuleGuidMap().get(ip); } //添加人员规则 @@ -1536,6 +1540,7 @@ public class VisitorController extends BaseController { sysPeopleEquipment.setFaceGuid(faceId); peopleEquipmentService.insertSysPeopleEquipment(sysPeopleEquipment); } + s.setRuleGuidMap(map); return s; } diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/Visitor.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/Visitor.java index 8524297..2829b49 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/Visitor.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/Visitor.java @@ -3,6 +3,7 @@ package com.dcsoft.system.visitor.domain; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; import com.dcsoft.common.core.annotation.Excels; import com.dcsoft.common.core.web.domain.BaseEntity; @@ -297,6 +298,6 @@ public class Visitor extends BaseEntity { /** * 人脸机的ruleId */ - private String ruleGuid; + private Map ruleGuidMap; }