From a1a257d64eca843fa701bae6d9a8b00360b2c79b Mon Sep 17 00:00:00 2001 From: zhongpeng Date: Tue, 10 Sep 2024 11:45:40 +0800 Subject: [PATCH] =?UTF-8?q?REQ-2960=20=E5=BC=82=E5=B8=B8=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=92=89=E9=92=89=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TaiZhouServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/riven-third/src/main/java/cn/axzo/riven/third/taizhou/service/impl/TaiZhouServiceImpl.java b/riven-third/src/main/java/cn/axzo/riven/third/taizhou/service/impl/TaiZhouServiceImpl.java index 8be69aa..37a2c81 100644 --- a/riven-third/src/main/java/cn/axzo/riven/third/taizhou/service/impl/TaiZhouServiceImpl.java +++ b/riven-third/src/main/java/cn/axzo/riven/third/taizhou/service/impl/TaiZhouServiceImpl.java @@ -14,6 +14,7 @@ import cn.axzo.riven.third.entity.ThirdPerson; import cn.axzo.riven.third.entity.ThirdProject; import cn.axzo.riven.third.entity.ThirdProjectPerson; import cn.axzo.riven.third.rpc.UserCenterRpc; +import cn.axzo.riven.third.service.DingDingRobotService; import cn.axzo.riven.third.service.ThirdPersonService; import cn.axzo.riven.third.service.ThirdProjectService; import cn.axzo.riven.third.taizhou.config.TaiZhouConfig; @@ -76,6 +77,9 @@ public class TaiZhouServiceImpl implements TaiZhouService { @Autowired private UserCenterRpc userCenterRpc; + @Autowired + private DingDingRobotService dingDingRobotService; + @Override public void updateProjectIdForRemote(TaiZhouProject taiZhouProject) { @@ -365,7 +369,7 @@ public class TaiZhouServiceImpl implements TaiZhouService { //合并账号前，验证用户信息确认泰州和安心筑实名账号是同一个人 if (!comparePersonInfo(currentBindPerson, thirdPerson)) { String errorLog = String.format("泰州人员：%s 基本信息和安心筑信息不一致（姓名或者脱敏身份证不一致），不修改安心筑手机号 ", thirdPerson.getThirdPersonName()); - DingTalkUtil.sendMessage(errorLog, taiZhouConfig.getDingTalkBotAccessToken(), taiZhouConfig.getDingTalkBotSecret()); + dingDingRobotService.send(errorLog); log.error(errorLog); return; } @@ -382,7 +386,7 @@ public class TaiZhouServiceImpl implements TaiZhouService { //合并账号前，验证用户信息确认泰州和安心筑实名账号是同一个人 if (!comparePersonInfo(newPerson, thirdPerson)) { String errorLog = String.format("泰州人员：%s 基本信息和安心筑信息不一致（姓名或者脱敏身份证不一致），不修改绑定关系 ", thirdPerson.getThirdPersonName()); - DingTalkUtil.sendMessage(errorLog, taiZhouConfig.getDingTalkBotAccessToken(), taiZhouConfig.getDingTalkBotSecret()); + dingDingRobotService.send(errorLog); log.error(errorLog); return; } @@ -400,7 +404,7 @@ public class TaiZhouServiceImpl implements TaiZhouService { if (VerifyStatus.VERIFY_SUCCESS == currentBindPerson.getVerification().getVerifyStatus() && VerifyStatus.VERIFY_SUCCESS == newPerson.getVerification().getVerifyStatus()) { String errorLog = String.format("泰州人员：%s 手机号变更（姓名或者脱敏身份证不一致），发现新老手机号对应的安心筑账号均实名,异常", thirdPerson.getThirdPersonName()); - DingTalkUtil.sendMessage(errorLog, taiZhouConfig.getDingTalkBotAccessToken(), taiZhouConfig.getDingTalkBotSecret()); + dingDingRobotService.send(errorLog); log.error(errorLog); return; } @@ -461,7 +465,7 @@ public class TaiZhouServiceImpl implements TaiZhouService { userCenterRpc.updateUserPhone(oldThirdPerson.getPersonId(), thirdPerson.getThirdPersonPhone()); } else { String errorLog = String.format("泰州人员：%s 基本信息和安心筑信息不一致（姓名或者脱敏身份证不一致），不修改安心筑手机号 ", thirdPerson.getThirdPersonName()); - DingTalkUtil.sendMessage(errorLog, taiZhouConfig.getDingTalkBotAccessToken(), taiZhouConfig.getDingTalkBotSecret()); + dingDingRobotService.send(errorLog); log.error(errorLog); } } @@ -495,7 +499,7 @@ public class TaiZhouServiceImpl implements TaiZhouService { //检查泰州手机号是否重复 if (checkRepeatPhone(thirdPerson)) { String errorLog = String.format("泰州人员：%s 与其他泰州人员手机号重复，手机号为: %s ", thirdPerson.getThirdPersonName(), thirdPerson.getThirdPersonPhone()); - DingTalkUtil.sendMessage(errorLog, taiZhouConfig.getDingTalkBotAccessToken(), taiZhouConfig.getDingTalkBotSecret()); + dingDingRobotService.send(errorLog); throw new ServiceException(errorLog); } //项目开关同步检查 @@ -518,7 +522,7 @@ public class TaiZhouServiceImpl implements TaiZhouService { if (!CollectionUtils.isEmpty(list)) { String errorLog = String.format("安心筑PersonID：%s 已经绑定了其他泰州信息，不能多次绑定。 ", personId); - DingTalkUtil.sendMessage(errorLog, taiZhouConfig.getDingTalkBotAccessToken(), taiZhouConfig.getDingTalkBotSecret()); + dingDingRobotService.send(errorLog); throw new ServiceException(errorLog); } } @@ -535,13 +539,13 @@ public class TaiZhouServiceImpl implements TaiZhouService { //姓名变更 if (!db.getThirdPersonName().equals(thirdPerson.getThirdPersonName())) { String errorLog = String.format("泰州PersonID：%s 姓名发生变化:%s -> %s ", thirdPerson.getThirdUniquePersonId(), db.getThirdPersonName(), thirdPerson.getThirdPersonName()); - DingTalkUtil.sendMessage(errorLog, taiZhouConfig.getDingTalkBotAccessToken(), taiZhouConfig.getDingTalkBotSecret()); + dingDingRobotService.send(errorLog); throw new ServiceException(errorLog); } //身份证变更 if (!db.getThirdIdNumber().equals(thirdPerson.getThirdIdNumber())) { String errorLog = String.format("泰州PersonID：%s 身份证发生变化:%s -> %s ", thirdPerson.getThirdUniquePersonId(), db.getThirdIdNumber(), thirdPerson.getThirdIdNumber()); - DingTalkUtil.sendMessage(errorLog, taiZhouConfig.getDingTalkBotAccessToken(), taiZhouConfig.getDingTalkBotSecret()); + dingDingRobotService.send(errorLog); throw new ServiceException(errorLog); } }