From 8194ff92d11480e4d271ae370e72168780882ec5 Mon Sep 17 00:00:00 2001 From: zc Date: Fri, 8 Aug 2025 14:57:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B4=E5=AE=89=E4=BC=98=E5=8C=96=E8=AE=BF?= =?UTF-8?q?=E5=AE=A2=E4=BA=BA=E8=84=B8=E6=9C=BA=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/controller/SysFileController.java | 8 ++-- .../system/uniubi/service/ISysSdkService.java | 2 +- .../service/impl/SysSdkServiceImpl.java | 4 +- .../visitor/controller/VisitorController.java | 42 ++++++++++--------- .../dcsoft/system/visitor/domain/Visitor.java | 5 +++ 5 files changed, 35 insertions(+), 26 deletions(-) diff --git a/dcsoft-modules/dcsoft-file/src/main/java/com/dcsoft/file/controller/SysFileController.java b/dcsoft-modules/dcsoft-file/src/main/java/com/dcsoft/file/controller/SysFileController.java index fc82563..a82d92b 100644 --- a/dcsoft-modules/dcsoft-file/src/main/java/com/dcsoft/file/controller/SysFileController.java +++ b/dcsoft-modules/dcsoft-file/src/main/java/com/dcsoft/file/controller/SysFileController.java @@ -318,10 +318,10 @@ public class SysFileController throw new RuntimeException(e); } } - initFlowRules(); - //上传前进行人脸检测 - String imgBase64 = MinioUtil.getBase64String(file); - checkPhoto(imgBase64); +// initFlowRules(); +// //上传前进行人脸检测 +// String imgBase64 = MinioUtil.getBase64String(file); +// checkPhoto(imgBase64); // 上传并返回访问地址 String fileNames = FileUploadUtils.uploadMinio(file, this.bucketName1, fileName); diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/ISysSdkService.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/ISysSdkService.java index 04c322c..b5f92b7 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/ISysSdkService.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/ISysSdkService.java @@ -26,7 +26,7 @@ public interface ISysSdkService { String personDelete(String id, String ip, String pass); //创建规则 - String ruleCreate(String id, String ip, String pass, Date startDate, Date endDate); + String ruleCreate(String name, String ip, String pass, Date startDate, Date endDate); //人员接口-人员更新 String personUpdate(Person person, String ip, String pass); 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 7f6b981..49be802 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 @@ -71,11 +71,11 @@ public class SysSdkServiceImpl implements ISysSdkService { } @Override - public String ruleCreate(String ruleId, String ip, String pass, Date startTime, Date endTime) { + public String ruleCreate(String name, String ip, String pass, Date startTime, Date endTime) { String url = "http://" + ip + ":8090/rule/create"; JSONObject paramMap = new JSONObject(); paramMap.put("pass", pass); - paramMap.put("ruleId", ruleId); + paramMap.put("name", name); paramMap.put("type", 1); List segment = Arrays.asList("00:00:00", "23:59:59"); Map dayMap = new HashMap<>(); 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 739082b..d0d833b 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 @@ -565,7 +565,7 @@ public class VisitorController extends BaseController { //发送企微信息 try { -// sendWeCom(sysPeople.getPhone(), url + " --访客姓名：" + visitor.getName()); + sendWeCom(sysPeople.getPhone(), url + " --访客姓名：" + visitor.getName()); } catch (Exception e) { log.error("访客add-sendWeCom异常：", e); } @@ -1084,7 +1084,7 @@ public class VisitorController extends BaseController { log.info("approve发送审核链接：{}", url); try { -// sendWeCom(nextPeople.getPhone(), url + " --访客姓名：" + visitor.getName()); + sendWeCom(nextPeople.getPhone(), url + " --访客姓名：" + visitor.getName()); } catch (Exception e) { log.error("访客approve-sendWeCom异常：", e); } @@ -1117,6 +1117,7 @@ public class VisitorController extends BaseController { for (Visitor visitor2 : visitors) { Visitor visitorInfo = new Visitor(); visitor2.setUserId(visitor1.getUserId()); + visitor2.setRuleGuid(s.getRuleGuid()); Visitor visitorId = deviceDistribute(visitor2, 2); visitorInfo.setId(visitor2.getId()); visitorInfo.setGuid(visitorId.getGuid()); @@ -1129,8 +1130,6 @@ public class VisitorController extends BaseController { visitorService.updateVisitorInfoGuid(listVisitorId); } - - // 同意后，给被访人和访客们发送审核结束短信 List phoneList = new ArrayList<>(); phoneList.add(visitor.getPhone()); @@ -1144,7 +1143,7 @@ public class VisitorController extends BaseController { log.info("approve-发同意短信:{}", JSON.toJSONString(phoneList)); for (String phone : phoneList) { try { -// sendMessage(phone, "1", parkName, smsProperties.getTemplate2()); + sendMessage(phone, "1", parkName, smsProperties.getTemplate2()); } catch (Exception e) { log.error(e.getMessage()); } @@ -1162,7 +1161,7 @@ public class VisitorController extends BaseController { visitorService.updateVisitorReviewProcess(visitor); try { -// sendWeCom(telephone, visitor.getName() + "的访客审核已驳回"); + sendWeCom(telephone, visitor.getName() + "的访客审核已驳回"); } catch (Exception e) { log.error("访客approve-sendWeCom驳回异常：", e); } @@ -1170,7 +1169,7 @@ public class VisitorController extends BaseController { log.info("approve-发拒绝短信:{}", visitor.getPhone()); try { -// sendMessage(visitor.getPhone(), "1", parkName, smsProperties.getTemplate3()); + sendMessage(visitor.getPhone(), "1", parkName, smsProperties.getTemplate3()); } catch (Exception e) { log.error(e.getMessage()); } @@ -1517,26 +1516,31 @@ public class VisitorController extends BaseController { person.setName(visitor.getName()); person.setPhone(visitor.getPhone()); person.setId(guid); + + String ip = e.getIp(); + String pass = e.getPassword(); + //添加临时规则 + String ruleGuid = visitor.getRuleGuid(); + if(type == 1) { + String s1 = sdkService.ruleCreate("vis_" + visitor.getId(), ip, pass, visitor.getStartTime(), visitor.getEndTime()); + JSONObject jsonObject1 = JSONObject.parseObject(s1); + if (!StringUtils.equals("LAN_SUS-0", jsonObject1.getString("code"))) { + log.error("临时访客创建规则下发失败visitorId:{},ip:{}", visitor.getId(), e.getIp()); + continue; + } + ruleGuid = jsonObject1.getJSONObject("data").getString("ruleId"); + s.setRuleGuid(ruleGuid); + } + //添加人员规则 JSONObject jsonObject = new JSONObject(); - jsonObject.put("ruleId", type == 1 ? "vis_" + visitor.getId() : "vis_" + visitor.getParentId()); + jsonObject.put("ruleId", ruleGuid); JSONObject jsonObject2 = new JSONObject(); jsonObject2.put("timezoneRule", jsonObject); List objects = new ArrayList<>(); objects.add(jsonObject2); person.setRule(objects); - String ip = e.getIp(); - String pass = e.getPassword(); - //添加临时规则 - if(type == 1) { - String s1 = sdkService.ruleCreate(jsonObject.getString("ruleId"), ip, pass, visitor.getStartTime(), visitor.getEndTime()); - JSONObject jsonObject1 = JSONObject.parseObject(s1); - if (!StringUtils.equals("LAN_SUS-0", jsonObject1.getString("code"))) { - log.error("临时访客创建规则下发失败visitorId:{},ip:{}", visitor.getId(), e.getIp()); - continue; - } - } //创建人员 String s2 = sdkService.personCreate(person, ip, pass); JSONObject jsonObject3 = JSONObject.parseObject(s2); 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 c535dcb..560fd57 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 @@ -299,4 +299,9 @@ public class Visitor extends BaseEntity { */ private Integer approveNode; + /** + * 人脸机的ruleId + */ + private String ruleGuid; + }