From 6f2f2095fd40ca6746c50ee12ac10f5fe8c4b0ab Mon Sep 17 00:00:00 2001 From: zc Date: Fri, 12 Jun 2026 14:18:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysPeopleController.java | 20 ++++++++++--------- .../service/impl/SysSdkServiceImpl.java | 3 +++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysPeopleController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysPeopleController.java index 083b161..28532f3 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysPeopleController.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysPeopleController.java @@ -294,6 +294,7 @@ public class SysPeopleController extends BaseController List list = equipmentService.selectSysEquipmentList(equipment); for (SysEquipment e : list) { String data = sdkService.personDelete(admitGuids, e.getIp(), e.getPassword()); + log.info("remove-宇泛设备删除人员结果：{}", data); JSONObject jsons = JSONObject.parseObject(data); if (jsons == null || !jsons.containsKey("code") || !StrUtil.equals("LAN_SUS-0", jsons.getString("code"))) { throw new ServiceException("人员删除失败：设备" + e.getIp() + "删除异常"); @@ -740,19 +741,20 @@ public class SysPeopleController extends BaseController SysEquipment equipment=new SysEquipment(); equipment.setFlag("0"); + equipment.setProductId(3L); List list = equipmentService.selectSysEquipmentList(equipment); - if(list.size()>0){ - for(Long id:ids){//下发到设备上 - SysPeople people=sysPeopleService.selectSysPeopleById(id); + if (CollUtil.isNotEmpty(list)) { + for (Long id : ids) {//下发到设备上 + SysPeople people = sysPeopleService.selectSysPeopleById(id); //下发设备 - if(people.getBranchId()!=null){ - SysBranch branch=sysBranchService.selectSysBranchById(people.getBranchId()); - if (branch.getRuleId()!= null) { + if (people.getBranchId() != null) { + SysBranch branch = sysBranchService.selectSysBranchById(people.getBranchId()); + if (branch.getRuleId() != null) { //添加人员授权信息 - SysRule rule=sysRuleService.selectSysRuleById(branch.getRuleId()); - String data=sdkService.authDeviceNew(rule,people); + SysRule rule = sysRuleService.selectSysRuleById(branch.getRuleId()); + String data = sdkService.authDeviceNew(rule, people); people.setDown(1L); - if("".equals(data)){ + if ("".equals(data)) { return AjaxResult.error("该规则未绑定设备!"); } } diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/impl/SysSdkServiceImpl.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/impl/SysSdkServiceImpl.java index 6a112c6..60e24b2 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/impl/SysSdkServiceImpl.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/impl/SysSdkServiceImpl.java @@ -729,6 +729,7 @@ public class SysSdkServiceImpl implements ISysSdkService { //删除人员信息 if (operType == 1) { String data = this.personDelete(person.getId(), e.getIp(), e.getPassword()); + log.info("authDeviceAddUpdate-宇泛设备删除人员结果：{}", data); if (!verifyResult(data, sysEqDownRecord)) { i++; continue; @@ -737,12 +738,14 @@ public class SysSdkServiceImpl implements ISysSdkService { //新增人员信息 String data = this.personCreate(person, e.getIp(), e.getPassword()); + log.info("authDeviceAddUpdate-宇泛设备新增人员结果：{}", data); if (!verifyResult(data, sysEqDownRecord)) { i++; continue; } if (StringUtils.isNotEmpty(people.getFaceGuid())) { String dataImg = this.imageCreateUrl(people.getGuid(), people.getFaceGuid(), people.getAvatar(), e.getIp(), e.getPassword()); + log.info("authDeviceAddUpdate-宇泛设备新增人员人脸结果：{}", dataImg); if (!verifyResult(dataImg, sysEqDownRecord)) { i++; sysEqDownRecord.setFaceDownResult(1);