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 | 86 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 68 insertions(+), 18 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 4587aa1..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,18 +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); + } + } } - memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId())); - - - } @@ -278,6 +288,27 @@ @Override 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 @@ -393,12 +424,27 @@ @Override public List<Member> findList(Member member) { - QueryWrapper<Member> wrapper = new QueryWrapper<>(member); + MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>(); + queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId); + queryWrapper.selectAll(Member.class) + .selectAs(Company::getName,MemberInfoDTO::getCompanyName) + .selectAs(Company::getLinkName,MemberInfoDTO::getLinkName); + if(null != member.getType()) { - wrapper.lambda().eq(Member::getType,member.getType()); + queryWrapper.eq(Member::getType,member.getType()); } - wrapper.lambda().eq(Member::getIsdeleted,Constants.ZERO); - return memberMapper.selectList(wrapper); + if(null != member.getCompanyId()) { + queryWrapper.eq(Member::getCompanyId,member.getCompanyId()); + } + queryWrapper.eq(Member::getIsdeleted,Constants.ZERO); + + List<Member> list = memberJoinMapper.selectJoinList(Member.class,queryWrapper); + if(list!=null){ + for(Member m : list){ + m.setName(StringUtils.defaultString(m.getName(),"")+"-"+StringUtils.defaultString(m.getCompanyName(),"")); + } + } + return list; } @Override @@ -629,12 +675,14 @@ .like(Member::getPhone,pageWrap.getModel().getKeyword()) .or().like(Member::getName,pageWrap.getModel().getKeyword()) .or().like(Member::getCode,pageWrap.getModel().getKeyword())) - .isNull(!Objects.isNull(pageWrap.getModel().getHasFace())&&Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ZERO),Member::getFaceId) - .isNotNull(!Objects.isNull(pageWrap.getModel().getHasFace())&&Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ONE),Member::getFaceId) + .isNull(pageWrap.getModel().getHasFace()!=null&& Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ZERO),Member::getFaceId) + .isNotNull(pageWrap.getModel().getHasFace()!=null&& Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ONE),Member::getFaceId) .eq(Objects.nonNull(pageWrap.getModel().getCanVisit()),Member::getCanVisit,pageWrap.getModel().getCanVisit()) .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus()) .eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus()) - .eq(Member::getIsdeleted,Constants.ZERO) + .eq(Objects.isNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,Constants.ZERO) + .eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted()) + .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName()) // .eq(Member::getStatus,Constants.Status.ENABLE.getValue()) .eq(Member::getType,Constants.memberType.internal) .orderByDesc(Member::getCreateDate); @@ -707,7 +755,9 @@ .like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone()) .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), ms->ms.like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName()) .or().like(Company::getName,pageWrap.getModel().getCompanyName())) - .like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo()) + .eq(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo, + DESUtil.encrypt(Constants.EDS_PWD, pageWrap.getModel().getIdcardNo()) + ) .eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus()) .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus()) .eq(Member::getType,Constants.memberType.visitor) @@ -955,7 +1005,7 @@ } BeanUtils.copyProperties(member,memberVO); }else{ - throw new BusinessException(ResponseStatus.DATA_EMPTY); + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"璇锋牳瀹炶璁夸汉淇℃伅!"); } return memberVO; } -- Gitblit v1.9.3