From d16520069e7a89b5ac0d13d0c8ba4e30af023279 Mon Sep 17 00:00:00 2001 From: nidapeng <jp@doumee.com> Date: 星期四, 28 三月 2024 18:35:44 +0800 Subject: [PATCH] 整理 --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 40 insertions(+), 7 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java index a3b1bf8..11f0431 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java +++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java @@ -42,6 +42,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -89,6 +90,8 @@ @Autowired private UserActionJoinMapper userActionJoinMapper; + @Autowired + private MemberCardMapper memberCardMapper; @Autowired private CompanyMapper companyMapper; @@ -182,16 +185,25 @@ @Override public void roleAuthById(Integer id) { - LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); Member member = memberMapper.selectById(id); - if(member.getIsdeleted().equals(Constants.ONE)){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍛樺伐淇℃伅宸插垹闄�"); + if(member==null || member.getIsdeleted().equals(Constants.ONE)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鍛樺伐淇℃伅宸插垹闄�"); } - if(!member.getType().equals(Constants.memberType.internal)){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲唴閮ㄤ汉鍛樻棤娉曡繘琛岃鎿嶄綔"); +// List<MemberCard> cards = HkSyncOrgUserToHKServiceImpl.getNormalCardList(member,memberCardMapper); + HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,member,deviceRoleMapper,empowerMapper,deviceMapper); + } + @Override + public void empowerByList(Member member) { + if(member.getIdList()!=null && member.getIdList().size() >0){ + List<Member> members = memberMapper.selectList(new QueryWrapper<Member>().lambda() + .in(Member::getId,member.getIdList()) + .eq(Member::getIsdeleted,Constants.ZERO)); + if(members!=null){ + for(Member m : members){ + HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,m,deviceRoleMapper,empowerMapper,deviceMapper); + } + } } - List<MemberRole> roleList = memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId())); - } @@ -277,6 +289,27 @@ public void updateById(Member member) { memberMapper.updateById(member); } + @Override + public void updateFace(Member member) { + QueryWrapper<Member> wrapper = new QueryWrapper<>(member); + wrapper.lambda().ne(Member::getRemark,"浜鸿劯宸插悓姝ユ渶鏂�"); + List<Member> list =memberMapper.selectList(wrapper); + if(list!=null){ + String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode(); + for(Member m : list){ + String faceId= HkSyncOrgUserToHKServiceImpl.dealMemberFace(m,path); + if(StringUtils.isNotBlank(faceId)){ + Member update = new Member(); + update.setId(m.getId()); + update.setFaceId(faceId); + update.setRemark("浜鸿劯宸插悓姝ユ渶鏂�"); + update.setFaceStatus(Constants.ONE); + memberMapper.updateById(update); + } + } + } + } @Override public void updateStatusById(Member member) { -- Gitblit v1.9.3