From 7fe428453d3b74eb25d6f8d5af9fa7da78366f5d Mon Sep 17 00:00:00 2001 From: zc Date: Fri, 11 Jul 2025 09:39:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B4=E5=AE=89=E5=8F=96=E6=B6=88=E4=BC=81?= =?UTF-8?q?=E5=BE=AE=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VisCarryStuffController.java | 8 ++++---- .../visitor/controller/VisitorController.java | 17 ++++++----------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java index fa2ed3f..a1cb96d 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java @@ -202,7 +202,7 @@ public class VisCarryStuffController extends BaseController { //发送企微信息 try { -// visitorController.sendWeCom(people.getPhone(), url + " --访客姓名：" + vo.getName()); + visitorController.sendWeCom(people.getPhone(), url + " --访客姓名：" + vo.getName()); } catch (Exception e) { log.error("出门证申请add-sendWeCom异常：", e); throw new ServiceException("系统异常，请重新提交或联系管理员！"); @@ -308,7 +308,7 @@ public class VisCarryStuffController extends BaseController { //发送企微信息 try { -// visitorController.sendWeCom(people.getPhone(), url + " --访客姓名：" + vo.getName()); + visitorController.sendWeCom(people.getPhone(), url + " --访客姓名：" + vo.getName()); } catch (Exception e) { log.error("出门证申请add-sendWeCom异常：", e); throw new ServiceException("系统异常，请重新提交或联系管理员！"); @@ -320,13 +320,13 @@ public class VisCarryStuffController extends BaseController { visVisitorExamineService.insertVisVisitorExamine(examine); try { -// visitorController.sendWeCom(telephone, vo.getName() + "的访客审核已驳回"); + visitorController.sendWeCom(telephone, vo.getName() + "的访客审核已驳回"); } catch (Exception e) { log.error("访客approve-sendWeCom驳回异常", e); } // 申请人发送短信（审核不通过） SysPeople sysPeople1 = sysPeopleService.selectSysPeopleById(stuffVo.getUserId()); -// visitorController.sendMessage(sysPeople1.getPhone(), "1", smsProperties.getTemplate3()); + visitorController.sendMessage(sysPeople1.getPhone(), "1", smsProperties.getTemplate3()); } visCarryStuffService.updateStaff(vo); 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 01571d1..80d7148 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 @@ -443,9 +443,6 @@ public class VisitorController extends BaseController { throw new ServiceException("您已预约"); } - // 校验图片 -// checkPhoto(visitor.getAvatar(), visitor.getName()); - log.info("新增访客信息：{}", visitor); int i = visitorService.insertVisitor(visitor); List itemList = visitor.getItemList(); @@ -455,8 +452,6 @@ public class VisitorController extends BaseController { if (!validatePhoneNumber(item.getPhone())) { throw new ServiceException("您输入的随访人员手机号格式不正确"); } - // 校验图片 -// checkPhoto(item.getAvatar(), item.getName()); item.setParentId(visitor.getId()); item.setSource(Constants.ONE); item.setUserId(visitor.getUserId()); @@ -556,7 +551,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); } @@ -1071,7 +1066,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); } @@ -1097,7 +1092,7 @@ public class VisitorController extends BaseController { phoneList.addAll(itemList.stream().map(Visitor::getPhone).collect(Collectors.toList())); phoneList = phoneList.stream().distinct().collect(Collectors.toList()); } - log.info("临时日志，发同意短信{}", JSON.toJSONString(phoneList)); + log.info("approve-发同意短信:{}", JSON.toJSONString(phoneList)); for (String phone : phoneList) { sendMessage(phone, "1", smsProperties.getTemplate2()); } @@ -1114,14 +1109,14 @@ 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); } // 申请人发送短信（审核不通过） - log.info("临时日志，发拒绝短信{}", visitor.getPhone()); -// sendMessage(visitor.getPhone(), "1", smsProperties.getTemplate3()); + log.info("approve-发拒绝短信:{}", visitor.getPhone()); + sendMessage(visitor.getPhone(), "1", smsProperties.getTemplate3()); } visitorService.approve(visitor);