From 6765787baa5e0b771d71f865c4deb776367410c4 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 13 八月 2024 13:38:19 +0800 Subject: [PATCH] 修复bug --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 77 +++++++++++++++++++++++++++++++------- 1 files changed, 63 insertions(+), 14 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 fa402e2..72e455e 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 @@ -12,6 +12,11 @@ import com.doumee.core.annotation.excel.ExcelImporter; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; +import com.doumee.core.haikang.model.HKConstants; +import com.doumee.core.haikang.model.param.BaseResponse; +import com.doumee.core.haikang.model.param.request.UserDelRequest; +import com.doumee.core.haikang.model.param.respose.UserDelResponse; +import com.doumee.core.haikang.service.HKService; import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; @@ -42,6 +47,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.HkSyncEmpowerServiceImpl; import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.commons.collections.CollectionUtils; @@ -189,19 +195,21 @@ if(member==null || member.getIsdeleted().equals(Constants.ONE)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鍛樺伐淇℃伅宸插垹闄�"); } - List<MemberCard> cards = HkSyncOrgUserToHKServiceImpl.getNormalCardList(member,memberCardMapper); - HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(cards,member,deviceRoleMapper,empowerMapper,deviceMapper); - - /* LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); - Member member = memberMapper.selectById(id); - if(member.getIsdeleted().equals(Constants.ONE)){ - 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); + } + } } - if(!member.getType().equals(Constants.memberType.internal)){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲唴閮ㄤ汉鍛樻棤娉曡繘琛岃鎿嶄綔"); - } - List<MemberRole> roleList = memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId())); -*/ } @@ -286,6 +294,44 @@ @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 + public void delHkForce(Member member) { + Member model =memberMapper.selectById(member.getId()); + if(model ==null) { + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒"); + } + if(!Constants.equalsObject(model.getIsdeleted(),Constants.ONE)){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鍙湁閽堝绂昏亴浜哄憳鍙繘琛岃鎿嶄綔锛�"); + } + if(Constants.equalsObject(model.getHkStatus(),Constants.ONE)){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヤ汉鍛樺凡琚垹闄わ紒"); + } + if(StringUtils.isBlank(model.getHkId())){ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ヤ汉鍛橀潪瀹夐槻骞冲彴鍒涘缓浜哄憳锛屼笉鑳借繘琛岃鎿嶄綔锛�"); + } + HkSyncEmpowerServiceImpl.doHkDeleteUser(model.getId(),model.getHkId(),new Date(),memberMapper,memberCardMapper); } @Override @@ -662,7 +708,9 @@ .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); + .eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus()) + .orderByDesc(!Constants.equalsObject(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getCreateDate) + .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate); if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){ queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId()); }else{ @@ -834,6 +882,7 @@ model.setDeviceId(deviceRole.getId()); model.setSendStatus(Constants.ZERO); model.setSendType(Constants.ZERO); + model.setFailFlag(Constants.ZERO); list.add(model); } //瀵煎叆鏂板鐨勬巿鏉冧俊鎭� @@ -982,7 +1031,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