XA/xa-master-prod
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

兴安优化随访人员绑定宇泛规则错误问题

Browse Source
This commit is contained in:
zc
2025-09-02 13:41:33 +08:00
parent f4342c40f8
commit 8521c18416
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java
View File

@@ -1079,9 +1079,9 @@ public class VisitorController extends BaseController {
for (Visitor visitor2 : visitors) { for (Visitor visitor2 : visitors) {
Visitor visitorInfo = new Visitor(); Visitor visitorInfo = new Visitor();
visitor2.setUserId(visitor1.getUserId()); visitor2.setUserId(visitor1.getUserId());
visitor2.setRuleGuid(s.getRuleGuid()); visitor2.setRuleGuidMap(s.getRuleGuidMap());
log.info("======开始下发从数据人脸信息：{}", visitor1.getId()); log.info("======开始下发从数据人脸信息：{}", visitor1.getId());
log.info("从数据规则id：{}", s.getRuleGuid()); log.info("从数据规则id：{}", JSON.toJSONString(s.getRuleGuidMap()));
Visitor visitorId = deviceDistribute(visitor2, 2); Visitor visitorId = deviceDistribute(visitor2, 2);
visitorInfo.setId(visitor2.getId()); visitorInfo.setId(visitor2.getId());
visitorInfo.setGuid(visitorId.getGuid()); visitorInfo.setGuid(visitorId.getGuid());
@@ -1472,6 +1472,8 @@ public class VisitorController extends BaseController {
String faceId = IdUtils.simpleUUID(); String faceId = IdUtils.simpleUUID();
s.setGuid(guid); s.setGuid(guid);
s.setFaceGuid(faceId); s.setFaceGuid(faceId);
Map<String, String> map = new HashMap<>();
//通过规则获取绑定设备信息 //通过规则获取绑定设备信息
for (SysEquipment e : equipList) { for (SysEquipment e : equipList) {
//将人员信息下发到设备 //将人员信息下发到设备
@@ -1483,7 +1485,7 @@ public class VisitorController extends BaseController {
String ip = e.getIp(); String ip = e.getIp();
String pass = e.getPassword(); String pass = e.getPassword();
//添加临时规则 //添加临时规则
String ruleGuid = visitor.getRuleGuid(); String ruleGuid = "";
if(type == 1) { if(type == 1) {
String s1 = sdkService.ruleCreate("vis_" + visitor.getId(), ip, pass, visitor.getStartTime(), visitor.getEndTime()); String s1 = sdkService.ruleCreate("vis_" + visitor.getId(), ip, pass, visitor.getStartTime(), visitor.getEndTime());
log.info("设备：{}-创建规则结果：{}", e.getIp(), s1); log.info("设备：{}-创建规则结果：{}", e.getIp(), s1);
@@ -1493,7 +1495,9 @@ public class VisitorController extends BaseController {
continue; continue;
} }
ruleGuid = jsonObject1.getJSONObject("data").getString("ruleId"); 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); sysPeopleEquipment.setFaceGuid(faceId);
peopleEquipmentService.insertSysPeopleEquipment(sysPeopleEquipment); peopleEquipmentService.insertSysPeopleEquipment(sysPeopleEquipment);
} }
s.setRuleGuidMap(map);
return s; return s;
} }

3
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/Visitor.java
View File

@@ -3,6 +3,7 @@ package com.dcsoft.system.visitor.domain;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
import com.dcsoft.common.core.annotation.Excels; import com.dcsoft.common.core.annotation.Excels;
import com.dcsoft.common.core.web.domain.BaseEntity; import com.dcsoft.common.core.web.domain.BaseEntity;
@@ -297,6 +298,6 @@ public class Visitor extends BaseEntity {
/** /**
* 人脸机的ruleId * 人脸机的ruleId
*/ */
private String ruleGuid; private Map<String, String> ruleGuidMap;
} }