From e31a2e2c910d620ef88ded77c4fb67cdf9738215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Thu, 6 Mar 2025 23:05:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4dm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yanzhu/manage/service/IUniService.java | 2 +- ...roProjectInfoSubdeptsGroupServiceImpl.java | 6 ++--- .../ProProjectInfoSubdeptsServiceImpl.java | 2 +- ...roProjectInfoSubdeptsUsersServiceImpl.java | 22 ++++++++++++++----- .../manage/service/impl/UniServiceImpl.java | 11 ++++++++-- 5 files changed, 31 insertions(+), 12 deletions(-) diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IUniService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IUniService.java index 8ece2029..424c24ff 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IUniService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IUniService.java @@ -126,7 +126,7 @@ public interface IUniService { /** * 同步宇泛的人员和头像 */ - public void syncUniUser(ProProjectInfoSubdeptsUsers puser); + public void syncUniUser(ProProjectInfoSubdeptsUsers puser, boolean authFlag); /** * 同步宇泛的设备信息 diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java index bb734e73..6a16cfe5 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java @@ -157,7 +157,7 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu subdeptsUser.setCreateTime(DateUtils.getNowDate()); res = proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(subdeptsUser); // 系统添加的人员默认增加入场信息 - uniService.syncUniUser(subdeptsUser); + uniService.syncUniUser(subdeptsUser,true); if(res>0){ try { String accessToken = wxMaService.getAccessToken(); @@ -275,6 +275,8 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu FileUtil.copyFile(file,new File(savePath)); subdeptsUser.setQrCode(profilePath); res = proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(subdeptsUser); + // 系统添加的人员默认增加入场信息 + uniService.syncUniUser(subdeptsUser,true); }catch (Exception e){ log.error(e.getMessage()); } @@ -302,8 +304,6 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu FileUtil.copyFile(file,new File(savePath)); subdeptsUser.setQrCode(profilePath); res = proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(subdeptsUser); - // 系统添加的人员默认增加入场信息 - uniService.syncUniUser(subdeptsUser); }catch (Exception e){ log.error(e.getMessage()); } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java index fbea0112..507ec6b5 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java @@ -190,7 +190,7 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept subdeptsUser.setCreateTime(DateUtils.getNowDate()); int r = proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(subdeptsUser); // 系统添加的人员默认增加入场信息 - uniService.syncUniUser(subdeptsUser); + uniService.syncUniUser(subdeptsUser,true); try { if(r>0){ String accessToken = wxMaService.getAccessToken(); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java index ab3922b1..bc77177e 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java @@ -205,7 +205,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu Long userId= remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER).getData(); proProjectInfoSubdeptsUsers.setUserId(userId); int res = proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); - uniService.syncUniUser(proProjectInfoSubdeptsUsers); + uniService.syncUniUser(proProjectInfoSubdeptsUsers,true); String userPost = proProjectInfoSubdeptsUsers.getUserPost(); if(res>0 && (Objects.equals(UserPostEnums.WTDL.getCode(),userPost) || Objects.equals(UserPostEnums.XMJL.getCode(),userPost) || Objects.equals(UserPostEnums.BZZ.getCode(),userPost))){ // 生成二维码 @@ -286,7 +286,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proProjectInfoSubdeptsUsers.setSubDeptGroup(proProjectInfoSubdeptsGroup.getId()); proProjectInfoSubdeptsUsers.setSubDeptGroupName(proProjectInfoSubdeptsGroup.getGroupName()); proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); - uniService.syncUniUser(proProjectInfoSubdeptsUsers); + uniService.syncUniUser(proProjectInfoSubdeptsUsers,true); }else { ProProjectInfoSubdeptsUsers deptUser = users.get(0); deptUser.setUserName(proProjectInfoSubdeptsUsers.getUserName()); @@ -297,7 +297,13 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu deptUser.setUpdateBy(SecurityUtils.getUsername()); deptUser.setUpdateTime(DateUtils.getNowDate()); proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(deptUser); - uniService.syncUniUser(deptUser); + /** + * 考勤需要信息改变时推送信息... + */ + if(!Objects.equals(proProjectInfoSubdeptsUsers.getUserName(),deptUser.getUserName()) || !Objects.equals(proProjectInfoSubdeptsUsers.getCardCode(),deptUser.getCardCode()) || + !Objects.equals(proProjectInfoSubdeptsUsers.getUserPhone(),deptUser.getUserPhone()) || !Objects.equals(proProjectInfoSubdeptsUsers.getUserPicture(),deptUser.getUserPicture())){ + uniService.syncUniUser(proProjectInfoSubdeptsUsers,false); + } } } @@ -564,7 +570,13 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proProjectInfoSubdeptsUsers.setFaceGuid(old.getFaceGuid()); proProjectInfoSubdeptsUsers.setUserId(old.getUserId()); - uniService.syncUniUser(proProjectInfoSubdeptsUsers); + /** + * 考勤需要信息改变时推送信息... + */ + if(!Objects.equals(proProjectInfoSubdeptsUsers.getUserName(),old.getUserName()) || !Objects.equals(proProjectInfoSubdeptsUsers.getCardCode(),old.getCardCode()) || + !Objects.equals(proProjectInfoSubdeptsUsers.getUserPhone(),old.getUserPhone()) || !Objects.equals(proProjectInfoSubdeptsUsers.getUserPicture(),old.getUserPicture())){ + uniService.syncUniUser(proProjectInfoSubdeptsUsers,false); + } if(!Objects.equals(old.getUserPost(),proProjectInfoSubdeptsUsers.getUserPost())){ String userPost = proProjectInfoSubdeptsUsers.getUserPost(); @@ -1119,7 +1131,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proProjectInfoSubdeptsUsers.setApproveStatus(ApproveStatus.exempt.getCode()); proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); // 人员入场信息 - uniService.syncUniUser(proProjectInfoSubdeptsUsers); + uniService.syncUniUser(proProjectInfoSubdeptsUsers,true); } /** diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/UniServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/UniServiceImpl.java index 6a3b50fc..3d460e0e 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/UniServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/UniServiceImpl.java @@ -490,8 +490,13 @@ public class UniServiceImpl implements IUniService{ return 0l; } + /** + * 人員考勤入场 + * @param puser + * @param authFlag + */ @Override - public void syncUniUser(ProProjectInfoSubdeptsUsers puser) { + public void syncUniUser(ProProjectInfoSubdeptsUsers puser, boolean authFlag) { JSONObject jo; if(StringUtils.isNotEmpty(puser.getUserInfos())){ jo = JSON.parseObject(puser.getUserInfos()); @@ -562,7 +567,9 @@ public class UniServiceImpl implements IUniService{ } // 人员入场 - syncUserAuthDeviceByInfo(puser); + if(authFlag){ + syncUserAuthDeviceByInfo(puser); + } } }