diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java index fb16133d..1535cb6f 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java @@ -100,7 +100,7 @@ public class UserAddExe { private final UserExpandInfoRepository userExpandInfoRepository; private final ImgFilesRepository imgFilesRepository; private final DaHuaConfig daHuaConfig; - @DubboReference + @DubboReference(version = "1.0.0", group = "primeport") private ZcloudDaHuaFacade zcloudDaHuaFacade; @Transactional(rollbackFor = Exception.class) @@ -448,13 +448,16 @@ public class UserAddExe { List bioList = (List) biosObj; cmd.setPersonBiosignatures(bioList); } - log.info("Dubbo调用primeport.zcloudDaHuaFacade.syncPerson, name={}, departmentId(corpId)={}", - cmd.getName(), cmd.getDepartmentId()); - SingleResponse syncResp = zcloudDaHuaFacade.syncPerson(cmd); String maskedIdCard = plainIdCard; if (plainIdCard != null && plainIdCard.length() >= 14) { maskedIdCard = plainIdCard.substring(0, 6) + "********" + plainIdCard.substring(plainIdCard.length() - 4); } + log.info("Dubbo调用primeport.zcloudDaHuaFacade.syncPerson, name={}, departmentId(corpId)={}, idCardMask={}", + cmd.getName(), cmd.getDepartmentId(), maskedIdCard); + if (cmd.getPersonBiosignatures() != null) { + log.info("Dubbo调用携带人脸生物特征, size={}", cmd.getPersonBiosignatures().size()); + } + SingleResponse syncResp = zcloudDaHuaFacade.syncPerson(cmd); result.setDahuaCode(plainIdCard); userE.setDahuaCode(plainIdCard); if (syncResp == null || !syncResp.isSuccess()) { diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java index 7d11b445..2b8aae97 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java @@ -55,7 +55,7 @@ public class UserRemoveExe { private final ZcloudRedisUtil zcloudRedisUtil; private final UserCorpRecordRepository userCorpRecordRepository; private final DaHuaConfig daHuaConfig; - @DubboReference + @DubboReference(version = "1.0.0", group = "primeport") private ZcloudDaHuaFacade zcloudDaHuaFacade; @Transactional(rollbackFor = Exception.class) diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java index 2a57aa8b..72b1fc2a 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java @@ -78,7 +78,7 @@ public class UserUpdateExe { @DubboReference private ZcloudRiskFacade zcloudRiskFacade; private final DaHuaConfig daHuaConfig; - @DubboReference + @DubboReference(version = "1.0.0", group = "primeport") private ZcloudDaHuaFacade zcloudDaHuaFacade; @@ -465,13 +465,16 @@ public class UserUpdateExe { List bioList = (List) biosObj; cmd.setPersonBiosignatures(bioList); } - log.info("Dubbo调用primeport.zcloudDaHuaFacade.updatePerson, name={}, departmentId(corpId)={}", - cmd.getName(), cmd.getDepartmentId()); - SingleResponse updateResp = zcloudDaHuaFacade.updatePerson(cmd); String maskedIdCard = plainIdCard; if (plainIdCard != null && plainIdCard.length() >= 14) { maskedIdCard = plainIdCard.substring(0, 6) + "********" + plainIdCard.substring(plainIdCard.length() - 4); } + log.info("Dubbo调用primeport.zcloudDaHuaFacade.updatePerson, name={}, departmentId(corpId)={}, idCardMask={}", + cmd.getName(), cmd.getDepartmentId(), maskedIdCard); + if (cmd.getPersonBiosignatures() != null) { + log.info("Dubbo调用携带人脸生物特征, size={}", cmd.getPersonBiosignatures().size()); + } + SingleResponse updateResp = zcloudDaHuaFacade.updatePerson(cmd); if (updateResp == null || !updateResp.isSuccess()) { String errCode = updateResp == null ? "" : updateResp.getErrCode(); String errMessage = updateResp == null ? "大华Dubbo返回为空" : updateResp.getErrMessage(); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserGatewayImpl.java index 1ecfecd4..1846ed25 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserGatewayImpl.java @@ -39,7 +39,7 @@ public class UserGatewayImpl implements UserGateway { private UserFacade userFacade; @Override - @Transactional(rollbackFor = Exception.class, propagation = org.springframework.transaction.annotation.Propagation.REQUIRES_NEW) + @Transactional(rollbackFor = Exception.class) public Boolean add(UserE userE) { UserDO d = new UserDO(); BeanUtils.copyProperties(userE, d); @@ -49,7 +49,7 @@ public class UserGatewayImpl implements UserGateway { } @Override - @Transactional(rollbackFor = Exception.class, propagation = org.springframework.transaction.annotation.Propagation.REQUIRES_NEW) + @Transactional(rollbackFor = Exception.class) public Boolean addYanshi(UserE userE) { UserDO d = new UserDO(); BeanUtils.copyProperties(userE, d); @@ -68,7 +68,7 @@ public class UserGatewayImpl implements UserGateway { } @Override - @Transactional(rollbackFor = Exception.class, propagation = org.springframework.transaction.annotation.Propagation.REQUIRES_NEW) + @Transactional(rollbackFor = Exception.class) public boolean addXgf(UserE userE) { UserDO d = new UserDO(); // 新增用户默认在职