From 5df732ffe16b3f162422c2db61a78458e28c7f8d Mon Sep 17 00:00:00 2001 From: rk <94314517@qq.com> Date: 星期五, 10 十月 2025 14:45:29 +0800 Subject: [PATCH] 钥匙柜开发 天气预警通知 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 414 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 396 insertions(+), 18 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java index 6f0f506..01b1d19 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java @@ -7,10 +7,14 @@ 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.dingtalk.api.response.OapiV2DepartmentGetResponse; +import com.dingtalk.api.response.OapiV2UserGetResponse; +import com.dingtalk.api.response.OapiV2UserGetuserinfoResponse; import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.config.DataSyncConfig; import com.doumee.core.annotation.excel.ExcelImporter; import com.doumee.core.constants.ResponseStatus; +import com.doumee.core.dingTalk.DingTalk; import com.doumee.core.exception.BusinessException; import com.doumee.core.haikang.model.HKConstants; import com.doumee.core.haikang.model.param.BaseResponse; @@ -19,6 +23,7 @@ import com.doumee.core.haikang.model.param.respose.UserAddResponse; import com.doumee.core.haikang.model.param.respose.UserDelResponse; import com.doumee.core.haikang.service.HKService; +import com.doumee.dao.web.response.DDAuthorizeVO; import com.doumee.service.business.third.TmsService; import com.doumee.service.business.third.model.LoginUserInfo; import com.doumee.service.business.third.model.PageData; @@ -54,6 +59,7 @@ import com.doumee.service.business.third.model.response.TmsEmployeeListResponse; import com.doumee.service.system.SystemLoginService; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.taobao.api.ApiException; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; @@ -67,10 +73,12 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; +import shade.com.alibaba.fastjson2.JSONArray; import java.math.BigDecimal; import java.util.Date; import java.util.*; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** @@ -86,6 +94,9 @@ @Autowired private MemberJoinMapper memberJoinMapper; + + @Autowired + private JkCabinetMapper jkCabinetMapper; @Autowired private TrainTimeMapper trainTimeMapper; @@ -111,6 +122,8 @@ private MemberCardMapper memberCardMapper; @Autowired private CompanyMapper companyMapper; + @Autowired + private PositionMapper positionMapper; @Autowired private RedisTemplate<String, Object> redisTemplate; @@ -136,7 +149,10 @@ private SmsEmailService smsEmailService; @Autowired - private SystemLoginService systemLoginService; + private SystemLoginService systemLoginService; + + @Autowired + private DingTalk dingTalk; @Value("${debug_model}") private Boolean isDebug; @@ -209,9 +225,9 @@ private Member initAddMemberModel(Member member, LoginUserInfo loginUserInfo) { Member insert= new Member(); - insert.setCreator(loginUserInfo.getId()); + insert.setCreator(Objects.nonNull(loginUserInfo)?loginUserInfo.getId():null); insert.setCreateDate(new Date()); - insert.setEditor(loginUserInfo.getId()); + insert.setEditor(Objects.nonNull(loginUserInfo)?loginUserInfo.getId():null); insert.setEditDate(new Date()); insert.setHkOrgId(member.getHkOrgId()); insert.setIsdeleted(Constants.ZERO); @@ -221,6 +237,8 @@ insert.setCode(member.getCode()); insert.setType(Constants.TWO); insert.setHkDate(new Date()); + insert.setDdId(member.getDdId()); + insert.setErpId(member.getErpId()); insert.setWorkStatus(Constants.ZERO);//榛樿鍦ㄨ亴 insert.setCanVisit(Constants.ZERO);//榛樿涓嶅彲璁块棶 insert.setAuthStatus(Constants.ZERO); @@ -398,6 +416,10 @@ } } } + + + + private Member isMemberUpdateParamValid(Member member) { Member model = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>() .selectAll(Member.class) @@ -565,7 +587,7 @@ insert.setParentId(member.getParentId()); memberMapper.insert(insert); - /* TrainTime trainTime = new TrainTime(); + /* TrainTime trainTime = new TrainTime(); trainTime.setCreator(loginUserInfo.getId().toString()); trainTime.setCreateDate(new Date()); trainTime.setEdirot(loginUserInfo.getId().toString()); @@ -579,7 +601,6 @@ trainTimeMapper.insert(trainTime);*/ return insert.getId(); } - @Override @Transactional(rollbackFor = {BusinessException.class,Exception.class}) public void deleteById(Integer id,LoginUserInfo loginUserInfo) { @@ -603,6 +624,7 @@ .set(SystemUser::getUpdateUser,member.getEditor()) .set(SystemUser::getUpdateTime,member.getEditDate()) ); +// cancelAllMemberEmpower(member,memberRoleMapper,empowerMapper); saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member)); List<Cars> carsList = carsMapper.selectList(new QueryWrapper<Cars>().lambda() .eq(Cars::getMemberId,member.getId()) @@ -628,8 +650,6 @@ } } } - - @Override public void roleAuthById(Integer id,LoginUserInfo user) { Member member = memberMapper.selectById(id); @@ -698,7 +718,6 @@ memberRole.setStartTime(trainTime.getStartTime()); memberRole.setEndTime(trainTime.getEndTime()); } - memberMapper.update(null,new UpdateWrapper<Member>().lambda() .eq(Member::getId,member.getId()) .set(Member::getRoleId,member.getRoleId()) @@ -981,14 +1000,14 @@ } TrainTime trainTime = new TrainTime(); trainTime.setIsdeleted(Constants.ZERO); - trainTime.setCreator(loginUserInfo.getId()); + trainTime.setCreator(Objects.nonNull(loginUserInfo)?loginUserInfo.getId():null); trainTime.setCreateDate(new Date()); trainTime.setEdirot(trainTime.getCreator()); trainTime.setEditDate(trainTime.getCreateDate()); trainTime.setStartTime(updateMember.getTrainStartTime()); trainTime.setEndTime(updateMember.getTrainEndTime()); trainTime.setMemberId(updateMember.getId()); - trainTime.setImportInfo("鐢便��"+loginUserInfo.getRealname()+"銆戜簬"+DateUtil.getPlusTime2(trainTime.getCreateDate())+(i==0?"鍒涘缓":"鏇存柊")+"褰曞叆"); + trainTime.setImportInfo("鐢便��"+(Objects.nonNull(loginUserInfo)?loginUserInfo.getRealname():"閽夐拤鍚屾")+"銆戜簬"+DateUtil.getPlusTime2(trainTime.getCreateDate())+(i==0?"鍒涘缓":"鏇存柊")+"褰曞叆"); //瀵煎叆鍩硅鏈夋晥鏈� trainTimeMapper.insert(trainTime); } @@ -1194,6 +1213,21 @@ if(StringUtils.isNotBlank(companySpecialId)){ queryWrapper.apply(" find_in_set('"+companySpecialId+"',REPLACE(t3.company_path,'/',',')) "); } + } + if(null != member.getQueryAuth() && Constants.equalsInteger(member.getQueryAuth(),Constants.ONE)){ + List<JkCabinet> jkCabinets = jkCabinetMapper.selectList(new QueryWrapper<JkCabinet>().lambda() + .eq(JkCabinet::getIsdeleted,Constants.ZERO) + .isNotNull(JkCabinet::getAuthMemberId) + ); + if(CollectionUtils.isNotEmpty(jkCabinets)){ + List<String> memberIdList = new ArrayList<>(); + List<String> authMemberId = jkCabinets.stream().map(i->i.getAuthMemberId()).collect(Collectors.toList()); + for (String s:authMemberId) { + memberIdList.addAll(Arrays.asList(s.split(","))) ; + } + queryWrapper.in(Member::getId,memberIdList); + } + } queryWrapper.eq(Member::getIsdeleted,Constants.ZERO); queryWrapper.eq(Member::getWorkStatus,Constants.ZERO); @@ -1495,11 +1529,15 @@ .like(Member::getPhone,pageWrap.getModel().getKeyword()) .or().like(Member::getName,pageWrap.getModel().getKeyword()) .or().like(Member::getCode,pageWrap.getModel().getKeyword())) + .eq(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo, + DESUtil.encrypt(Constants.EDS_PWD, pageWrap.getModel().getIdcardNo()) + ) .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(Objects.nonNull(pageWrap.getModel().getAuthStatus()),Member::getAuthStatus,pageWrap.getModel().getAuthStatus()) .eq(Objects.nonNull(pageWrap.getModel().getWorkStatus()),Member::getWorkStatus,pageWrap.getModel().getWorkStatus()) .eq(Objects.isNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,Constants.ZERO) .eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted()) @@ -1509,8 +1547,11 @@ // .eq(Member::getStatus,Constants.Status.ENABLE.getValue()) // .eq(Member::getType,Constants.memberType.internal) .eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus()) - .orderByAsc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getPinyin) - .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate); + + .orderByAsc(Company::getSortnum) + .orderByAsc(Position::getSortnum); +// .orderByAsc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getPinyin) +// .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{ @@ -1615,7 +1656,10 @@ .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus()) .eq(Member::getType,Constants.memberType.visitor) .eq(Member::getIsdeleted,Constants.ZERO) - .orderByAsc(Member::getPinyin); + .orderByAsc(Company::getSortnum) + .orderByAsc(Position::getSortnum); + + if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){ queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId()); }else{ @@ -1824,6 +1868,12 @@ return wxAuthorizeVO; } + /** + * 寰俊鎺堟潈 鍐呴儴浜哄憳鐧诲綍 + * @param wxAuthorizeVO + * @param openId + * @param source + */ private void dealSystemUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId, Integer source) { SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda() .eq(SystemUser::getOpenid,openId) @@ -1853,6 +1903,44 @@ wxAuthorizeVO.setToken(token); } } + + /** + * 閽夐拤鎺堟潈鑾峰彇鍐呴儴浜哄憳鐧诲綍淇℃伅 + * @param ddAuthorizeVO + * @param unionId + * @param source + */ + private void dealSystemUserAuthBizByDD(DDAuthorizeVO ddAuthorizeVO, String unionId, Integer source) { + SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda() + .eq(SystemUser::getDdUnionId,unionId) + .in(SystemUser::getType,Constants.memberType.internal) + .eq(SystemUser::getDeleted,Constants.ZERO) + .last(" limit 1 ")); + //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛 + if(!Objects.isNull(user)){ + Member member = memberMapper.selectById(user.getMemberId()); + if(member == null || member.getIsdeleted() == Constants.ONE){ + return; +// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳"); + } + if(member.getStatus() != Constants.ZERO){ + return; +// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳"); + } + if(StringUtils.isNotBlank(member.getIdcardNo())){ + member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo())); + } + String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + + systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode(); + member.setPrefixUrl(prefixUrl); + ddAuthorizeVO.setMember(member); + //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token + String token = systemLoginService.loginByUserId(user.getId()); + ddAuthorizeVO.setToken(token); + } + } + + private void dealDriverUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId, Integer source) { SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda() .eq(SystemUser::getOpenid,openId) @@ -1950,7 +2038,6 @@ } } } - @Override public List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO){ @@ -2072,7 +2159,7 @@ if(importing!=null && importing){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝宸插瓨鍦ㄥ憳宸ュ鍏ヤ换鍔℃鍦ㄦ墽琛屼腑锛岃绋嶅悗鍐嶈瘯锛�"); } - redisTemplate.opsForValue().set(Constants.RedisKeys.IMPORTING_MEMBER,true); + redisTemplate.opsForValue().set(Constants.RedisKeys.IMPORTING_MEMBER,true,30, TimeUnit.MINUTES); try { ExcelImporter ie = null; List<MemberImport> dataList =null; @@ -2091,6 +2178,8 @@ ); List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda() .eq(Company::getIsdeleted,Constants.ZERO)); + List<Position> positionList = positionMapper.selectList(new QueryWrapper<Position>().lambda() + .eq(Position::getIsdeleted,Constants.ZERO)); List<Member> newList = new ArrayList<>(); for(int i=0;i<dataList.size();i++){ MemberImport model = dataList.get(i); @@ -2102,7 +2191,7 @@ &&StringUtils.isBlank(model.getCompanyName())){ continue; } - Member member = checkModelParam(model,newList,i,loginUserInfo,list,companyList,companyType); + Member member = checkModelParam(model,newList,i,loginUserInfo,list,companyList,companyType,positionList); newList.add(member); } if(newList == null || newList.size() ==0){ @@ -2156,7 +2245,8 @@ ,LoginUserInfo loginUserInfo ,List<Member> memberList ,List<Company> companyList - ,Integer companyType) { + ,Integer companyType + ,List<Position> positionList) { if(StringUtils.isBlank(model.getName()) // ||StringUtils.isBlank(model.getIdcardNo()) ||StringUtils.isBlank(model.getPhone()) @@ -2177,6 +2267,7 @@ } } + for(Member member: newList){ if(StringUtils.isNotBlank(model.getIdcardNo())&&StringUtils.isNotBlank(member.getIdcardNo())) { if (StringUtils.equals(model.getIdcardNo(), member.getIdcardNo())) { @@ -2194,10 +2285,14 @@ if(companyType != null && !Constants.equalsInteger(companyType,company.getType())){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岀粍缁囧悕绉般��"+model.getCompanyName()+"銆戠被鍨嬩笉姝g‘锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒"); } + Position position = findPositionFromList(model.getPositionName(),positionList); + if(Objects.isNull(position)){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屽矖浣嶅悕绉般��"+model.getPositionName()+"銆戜笉瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒"); + } String candNo = DESUtil.encrypt(Constants.EDS_PWD, model.getIdcardNo()); if(StringUtils.isNotBlank(model.getIdcardNo())){ if(findMemberFromListByIdcard(candNo,memberList ) !=null){ - throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戝凡瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒"); + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戝凡瀛樺湪锛岃纭銆愯瀹㈢鐞嗐�戙�愬唴閮ㄤ汉鍛樸�戜互鍙娿�愮浉鍏虫柟浜哄憳銆戜腑鏃犺韬唤璇佸瓨鍦紝璇锋鏌ヨ〃鏍煎唴瀹癸紒"); } } @@ -2225,6 +2320,18 @@ } return null; } + + private Position findPositionFromList(String positionName, List<Position> positionList) { + if(positionList !=null){ + for(Position position : positionList){ + if(StringUtils.equals(positionName,position.getName())){ + return position; + } + } + } + return null; + } + public static Member findMemberFromListByIdcard(String param, List<Member> list) { if(list !=null){ for(Member member : list){ @@ -2302,5 +2409,276 @@ } + /** + * 鍚屾閽夐拤鍐呴儴鍛樺伐淇℃伅 + */ + @Override + public void syncDDUserInfo() throws ApiException { + List<OapiV2UserGetResponse.UserGetResponse> list = dingTalk.syncAllUserInfo(); + if(CollectionUtils.isEmpty(list)){ + return; + } + List<Member> addList = new ArrayList<>(); + List<Member> updateList = new ArrayList<>(); + List<String> delIds = new ArrayList<>();//淇敼涓轰娇鐢ㄩ拤閽塱d erpId + List<Member> allList = memberMapper.selectList(new QueryWrapper<Member>().lambda() + .eq(Member::getIsdeleted,Constants.ZERO) + .eq(Member::getType,Constants.TWO)); + dealMemberChangeList(list,addList,updateList,delIds,allList); + + if(delIds.size()>0){ + syncDelMember(delIds); + } + + } + + private void syncDelMember(List<String> delIds) { + List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().in(Member::getErpId,delIds) + .eq(Member::getIsdeleted,Constants.ZERO)); + if(CollectionUtils.isNotEmpty(memberList)){ + for (Member member:memberList) { + this.deleteById(member.getId(),null); + } + } + + } + + + private void dealMemberChangeList(List<OapiV2UserGetResponse.UserGetResponse> list, List<Member> addList, List<Member> updateList, List<String> delIds, List<Member> allList) { + Date date = new Date(); + for(OapiV2UserGetResponse.UserGetResponse respone : list){ + //鏍规嵁erpid鏌ヨ浼佷笟淇℃伅锛屽垽鏂槸鏂板杩樻槸鏇存柊 + Member member = findMemberByERPId(allList,respone.getUnionid()); + if(member == null){ + //濡傛灉鏄柊澧� + //灏佽鏂板缁勭粐瀵硅薄鏁版嵁 + addList.add(getAddMemberModel(respone,new Member())); + }else{ + updateList.add(getUpdateMemberModel(respone,member)); + } + } + if(allList!=null && allList.size()>0){ + for(Member m : allList){ + if(!isMemberDeleted(m,list)){ + delIds.add(m.getErpId()); + } + } + } + } + + private Member getAddMemberModel(OapiV2UserGetResponse.UserGetResponse deptGetResponse,Member member) { + return syncDDAddMemberModel(deptGetResponse,member); + } + + + private Member getUpdateMemberModel(OapiV2UserGetResponse.UserGetResponse deptGetResponse,Member member) { + return syncDDEditMemberModel(deptGetResponse,member); + } + + + private Member syncDDAddMemberModel(OapiV2UserGetResponse.UserGetResponse deptGetResponse,Member member) { + member.setCreateDate(new Date()); + member.setErpId(deptGetResponse.getUnionid()); + member.setPhone(deptGetResponse.getMobile()); + member.setName(deptGetResponse.getName()); + member.setCode(deptGetResponse.getJobNumber()); + member.setDdId(deptGetResponse.getUserid()); + isMemberParamValidDetail(member,deptGetResponse.getDeptIdList()); + //鑾峰彇鍑虹敓鏃ユ湡 + //鑴辨晱鎿嶄綔 + Member insert = initAddMemberModel(member,null); + //娴峰悍浜哄憳鏂板涓氬姟 + insert.setHkStatus(dealHkUserBiz(insert)?Constants.ONE:Constants.TWO); + insert.setHkDate(new Date()); + memberMapper.insert(insert); + //濡傛灉鏄唴閮ㄧ粍缁囦汉鍛橈紝鏂板绯荤粺鐧婚檰璐﹀彿 + systemUserMapper.insert(createSystemUser(insert,systemDictDataBiz)); + //澶勭悊鍩硅鏈夋晥鏈熶笟鍔� + dealTrainTIme(member,0,null); + return insert; + } + + + public void isMemberParamValidDetail(Member member,List<Long> deptIdList) { + if(memberMapper.selectCount(new QueryWrapper<Member>().lambda() + .eq(Member::getPhone, member.getPhone()) + .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO}) + .eq(Member::getIsdeleted,Constants.ZERO) ) >0){ + //throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+member.getPhone()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅"); + } + if(Objects.nonNull(deptIdList)){ + List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda().in(Company::getErpId,deptIdList) + .eq(Company::getType,Constants.ONE).eq(Company::getIsdeleted,Constants.ZERO) +// .isNotNull(Company::getHkId) 鏆傛椂鏃犳硶鍚屾娴峰悍 鍏堟敞閲� + ); + if(CollectionUtils.isNotEmpty(companyList)){ + member.setHkOrgId(companyList.get(Constants.ZERO).getHkId()); + member.setCompanyId(companyList.get(Constants.ZERO).getId()); + } + } + member.setCompanyType(Constants.ONE); + SystemUser queryUserDto = new SystemUser(); + queryUserDto.setUsername(member.getPhone()); + queryUserDto.setDeleted(Boolean.FALSE); + SystemUser user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1")); + if (user != null) { + throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+queryUserDto.getUsername()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅"); + } +// // 楠岃瘉宸ュ彿 + if (StringUtils.isNotBlank(member.getCode())) { + queryUserDto = new SystemUser(); + queryUserDto.setDeleted(Boolean.FALSE); + queryUserDto.setEmpNo(member.getCode()); + user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1")); + if (user != null) { + throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿銆�"+member.getCode()+"銆戝凡瀛樺湪"); + } + } + } + + public Member syncDDEditMemberModel(OapiV2UserGetResponse.UserGetResponse deptGetResponse,Member updateMember) { + updateMember.setEditDate(new Date()); + updateMember.setErpId(deptGetResponse.getUnionid()); + updateMember.setPhone(deptGetResponse.getMobile()); + updateMember.setName(deptGetResponse.getName()); + updateMember.setCode(deptGetResponse.getJobNumber()); + updateMember.setDdId(deptGetResponse.getUserid()); + updateMember.setHkId(null); + updateMember.setAuthStatus(Constants.ZERO); + Boolean hkFlag = dealHkUserForUpdateBiz(updateMember); + memberMapper.update(null,new UpdateWrapper<Member>().lambda() + .set(Member::getStartTime,null) + .set(Member::getEndTime,null) + .set(Member::getRoleId,null) + .set(Member::getHkStatus,hkFlag?Constants.ONE:Constants.TWO) + .set(StringUtils.isNotBlank(updateMember.getPhone()),Member::getPhone,updateMember.getPhone()) + .set(StringUtils.isNotBlank(updateMember.getName()),Member::getName,updateMember.getName()) + .set(Member::getEditDate,updateMember.getEditDate()) + .set(Member::getEditor,updateMember.getEditor()) + .set(StringUtils.isNotBlank(updateMember.getName()),Member::getPinyin,Constants.getChinesePingyin(updateMember.getName())) + .set(StringUtils.isNotBlank(updateMember.getIdcardNo()),Member::getIdcardNo,updateMember.getIdcardNo()) + .set(StringUtils.isNotBlank(updateMember.getIdcardDecode()),Member::getIdcardDecode,updateMember.getIdcardDecode()) + .set( Member::getAuthStatus,Constants.ZERO) + .set(updateMember.getSex()!=null,Member::getSex,updateMember.getSex()) + .set(updateMember.getFaceStatus()!=null,Member::getFaceStatus,updateMember.getFaceStatus()) + .set(updateMember.getHkDate()!=null,Member::getHkDate,updateMember.getHkDate()) + .set(StringUtils.isNotBlank(updateMember.getRemark()),Member::getRemark,updateMember.getRemark()) + .set(StringUtils.isNotBlank(updateMember.getFaceImg()),Member::getFaceImg,updateMember.getFaceImg()) + .set(StringUtils.isNotBlank(updateMember.getDdId()),Member::getDdId,updateMember.getDdId()) + .set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId()) + .set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId()) + .set(Member::getCode,updateMember.getCode()) + .set( updateMember.getPositionId()!=null,Member::getPositionId,updateMember.getPositionId()) + .set( updateMember.getIsDangyuan()!=null,Member::getIsDangyuan,updateMember.getIsDangyuan()) + .set( updateMember.getJobDate()!=null,Member::getJobDate,updateMember.getJobDate()) + .eq(Member::getId,updateMember.getId())); + dealTrainTIme(updateMember,1,null); + cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper); + //璁板綍鎿嶄綔鏃ュ織 + saveUserActionBiz(updateMember,null,Constants.UserActionType.EDIT,userActionJoinMapper,null); + return updateMember; + } + + /** + * 鏍规嵁ERPID 鍒ゆ柇鏁版嵁鏄惁宸插湪闆嗗悎閲屽瓨鍦� + * @param allList + * @param id + * @return + */ + private Member findMemberByERPId(List<Member> allList, String id) { + if(allList!=null){ + for(Member com :allList){ + if(StringUtils.equals(com.getErpId(),id)){ + return com; + } + } + } + return null; + } + + private boolean isMemberDeleted(Member member, List<OapiV2UserGetResponse.UserGetResponse> list) { + for(OapiV2UserGetResponse.UserGetResponse m : list){ + if(StringUtils.equals(m.getUnionid(),member.getErpId())){ + return true; + } + } + return false; + } + + + @Override + public void ddPushMemberInfo(String eventType, shade.com.alibaba.fastjson2.JSONObject eventData) throws ApiException { + JSONArray jsonArray = eventData.getJSONArray("userId"); + if(jsonArray.isEmpty()){ + return; + } + if(eventType.equals("user_leave_org")){ + //鍒犻櫎瀵逛汉鍛樹俊鎭� + List<String> userIdList = new ArrayList<>(); + for (int i = 0; i < jsonArray.size(); i++) { + String deptId = jsonArray.getString(i); + userIdList.add(deptId); + } + if(CollectionUtils.isNotEmpty(userIdList)){ + syncDelMember(userIdList); + } + }else if(eventType.equals("user_add_org")||eventType.equals("user_modify_org")){ + for (int i = 0; i < jsonArray.size(); i++) { + OapiV2UserGetResponse.UserGetResponse userGetResponse = dingTalk.syncUserInfo(jsonArray.getString(i)); + Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda() + .eq(Member::getIsdeleted,Constants.ZERO) + .eq(Member::getErpId,userGetResponse.getUnionid()) + .last(" limit 1") + ); + if(Objects.isNull(member)){ + member = new Member(); + getAddMemberModel(userGetResponse,member); + }else{ + getUpdateMemberModel(userGetResponse,member); + } + } + } + } + + /** + * 閽夐拤鎺堟潈鐧诲綍 + * @param code + * @param source + * @return + * @throws ApiException + */ + @Override + public DDAuthorizeVO ddAuthorize(String code, Integer source) throws ApiException { + if(StringUtils.isBlank(code)||Objects.isNull(source)){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + OapiV2UserGetuserinfoResponse.UserGetByCodeResponse userGetByCodeResponse = dingTalk.getDDUserByCode(code); + if(Objects.isNull(userGetByCodeResponse) + || StringUtils.isBlank(userGetByCodeResponse.getUnionid())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"閽夐拤鎺堟潈澶辫触"); + } + String unionId = userGetByCodeResponse.getUnionid(); + + DDAuthorizeVO ddAuthorizeVO = new DDAuthorizeVO(); + if(StringUtils.isBlank(unionId)){ + return ddAuthorizeVO; + } + ddAuthorizeVO.setUnionId(unionId); +// if(source==1){ +// //澶勭悊鏅�氳瀹汉鍛樿嚜鍔ㄦ巿鏉冮�昏緫 +// dealVisitUserAuthBiz(wxAuthorizeVO,openId,source); +// }else if(source == 3){ +// //澶勭悊tms绠℃帶浜哄憳鑷姩鎺堟潈閫昏緫 +// dealGkUserAuthBiz(wxAuthorizeVO,openId,source); +// }else if(source == 0){ +// //濡傛灉鏄徃鏈猴紝鍒欎粠system_user鏌ヨ +// dealDriverUserAuthBiz(wxAuthorizeVO,openId,source); +// }else{ + //濡傛灉鏄唴閮ㄤ汉鍛橈紝鍒欎粠system_user鏌ヨ + dealSystemUserAuthBizByDD(ddAuthorizeVO,unionId,source); +// } + return ddAuthorizeVO; + } + } -- Gitblit v1.9.3