From 568e38a95cb6fb20fe16b53d17f610aefc6f744f Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 09 十月 2025 18:29:29 +0800
Subject: [PATCH] 钉钉通知 与钥匙柜开发
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 672 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 618 insertions(+), 54 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 2d993e6..40f62c5 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,9 +23,11 @@
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.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+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;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.*;
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
@@ -31,11 +37,13 @@
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dto.RegisterDriverDTO;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.join.RetentionJoinMapper;
import com.doumee.dao.business.join.UserActionJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
@@ -47,11 +55,15 @@
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
+import com.doumee.service.business.third.model.request.TmsEmployeeListRequest;
+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;
+import org.apache.poi.ss.usermodel.CellType;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -61,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;
/**
@@ -105,6 +119,8 @@
private MemberCardMapper memberCardMapper;
@Autowired
private CompanyMapper companyMapper;
+ @Autowired
+ private PositionMapper positionMapper;
@Autowired
private RedisTemplate<String, Object> redisTemplate;
@@ -117,14 +133,23 @@
@Autowired
private VisitsMapper visitsMapper;
@Autowired
+ private TmsService tmsService;
+ @Autowired
private SystemUserMapper systemUserMapper;
+ @Autowired
+ private CarsMapper carsMapper;
+ @Autowired
+ private ParkBookMapper parkBookMapper;
@Autowired
@Lazy
private SmsEmailService smsEmailService;
@Autowired
- private SystemLoginService systemLoginService;
+ private SystemLoginService systemLoginService;
+
+ @Autowired
+ private DingTalk dingTalk;
@Value("${debug_model}")
private Boolean isDebug;
@@ -153,6 +178,10 @@
}else{
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
+ }catch (BusinessException e){
+ //濡傛灉鍙戠敓寮傚父锛屽垹闄ゅ凡缁忓垱寤虹殑浜哄憳淇℃伅
+ deleteHkUserBiz(new String[]{insert.getHkId()});
+ throw e;
}catch (Exception e){
//濡傛灉鍙戠敓寮傚父锛屽垹闄ゅ凡缁忓垱寤虹殑浜哄憳淇℃伅
e.printStackTrace();
@@ -185,6 +214,7 @@
user.setSource(Constants.ZERO);
user.setDeleted(Boolean.FALSE);
user.setFixed(Boolean.FALSE);
+ user.setPinyin(Constants.getChinesePingyin(user.getRealname()));
user.setStatus(Constants.ZERO);
return user;
}
@@ -192,9 +222,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);
@@ -204,6 +234,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);
@@ -213,6 +245,7 @@
insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
insert.setJobDate(member.getJobDate());
insert.setIsDangyuan(member.getIsDangyuan());
+ insert.setPinyin(Constants.getChinesePingyin(member.getName()));
insert.setPositionId(member.getPositionId());
if(StringUtils.isNotBlank(member.getIdcardNo())){
insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
@@ -243,7 +276,7 @@
* @return
*/
private boolean dealHkUserBiz(Member insert) {
- String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(insert,path,Constants.ZERO);
if(hkAddRequest == null){
@@ -266,7 +299,7 @@
return false;
}
private boolean dealHkUserForUpdateBiz(Member update ) {
- String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(update,path,Constants.ONE);
@@ -380,6 +413,10 @@
}
}
}
+
+
+
+
private Member isMemberUpdateParamValid(Member member) {
Member model = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
.selectAll(Member.class)
@@ -418,7 +455,6 @@
.ne(Member::getId,member.getId())) >0){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNoNew()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
}
-
member.setSex(Constants.getSexByCardNo( member.getIdcardNoNew()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
member.setIdcardDecode( Constants.getTuominStr(member.getIdcardNoNew()));
member.setIdcardNo(encrptNo);
@@ -472,6 +508,7 @@
.set(SystemUser::getUpdateUser,member.getLoginUserInfo().getId())
.set(SystemUser::getUpdateTime,new Date())
.set(StringUtils.isNotBlank(member.getFaceImg()),SystemUser::getAvatar,member.getFaceImg())
+ .set(StringUtils.isNotBlank(member.getName()),SystemUser::getPinyin,Constants.getChinesePingyin(member.getName()))
.set(StringUtils.isNotBlank(member.getPhone()),SystemUser::getMobile,member.getPhone())
.set(StringUtils.isNotBlank(member.getPhone()),SystemUser::getUsername,member.getPhone())
.set(StringUtils.isNotBlank(member.getName()),SystemUser::getRealname,member.getName())
@@ -501,6 +538,8 @@
//濡傛灉浜鸿劯娌″彉鍖�
member.setFaceImg(null);
}
+
+ member.setPinyin(Constants.getChinesePingyin(member.getName()));
return model;
}
@@ -545,7 +584,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());
@@ -559,15 +598,16 @@
trainTimeMapper.insert(trainTime);*/
return insert.getId();
}
-
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void deleteById(Integer id,LoginUserInfo loginUserInfo) {
+
+ Date date =new Date();
Member member=new Member();
member.setId(id);
member.setIsdeleted(Constants.ONE);
member.setEditor(loginUserInfo.getId());
- member.setEditDate(new Date());
+ member.setEditDate(date);
member.setHkStatus(Constants.ZERO);
member.setRemark("浜哄憳宸插垹闄わ紝绛夊緟鍒犻櫎闂ㄧ鏉冮檺");
memberMapper.updateById(member);
@@ -581,11 +621,32 @@
.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())
+ .eq(Cars::getIsdeleted,Constants.ZERO)
+ .eq(Cars::getAuthStatus,Constants.ONE)//宸叉巿鏉冨寘鏈熺殑杞﹁締
+ );
+ if (carsList!=null && carsList.size()>0){
+ for(Cars car :carsList){
+ if(Constants.equalsInteger(car.getAuthStatus(),Constants.ONE)){
+ carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
+ .eq(Cars::getId,car.getId())
+ .set(Cars::getStartTime,null)
+// .set(Cars::getMemberId,null)
+ .set(Cars::getEndTime,null)
+ .set(Cars::getAuthTimeType,null)
+ .set(Cars::getAuthStatus,Constants.ZERO)
+ .set(Cars::getEditDate,member.getEditDate())
+ .set(Cars::getEdirot,member.getEditor())
+ );
+ //鍒犻櫎宸叉巿鏉冧笅鍙戠殑鍖呮湡鎺堟潈
+ CarsServiceImpl.dealCancelBookBiz(car.getCode(),date,parkBookMapper);
+ }
+ }
+ }
}
-
-
@Override
public void roleAuthById(Integer id,LoginUserInfo user) {
Member member = memberMapper.selectById(id);
@@ -654,7 +715,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())
@@ -887,7 +947,7 @@
loginUserInfo = updateMember.getLoginUserInfo();
}
//鏍￠獙鍙傛暟 骞朵笖鏇存柊systemuser 鎵嬫満鍙峰拰宸ュ彿淇℃伅锛堝鏋滈渶瑕佷慨鏀圭殑璇濓級
- Member model = isMemberUpdateParamValid(updateMember);
+ Member model = isMemberUpdateParamValid(updateMember);
updateMember.setEditor(loginUserInfo.getId());
updateMember.setEditDate(new Date());
//娴峰悍浜哄憳鏂板涓氬姟
@@ -902,6 +962,7 @@
.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)
@@ -913,11 +974,11 @@
.set(StringUtils.isNotBlank(updateMember.getFaceImg()),Member::getFaceImg,updateMember.getFaceImg())
.set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
.set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
- .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
+ .set(Member::getCode,updateMember.getCode())
+// .set(StringUtils.isNotBlank(updateMember.getCode()),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())
- .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
.eq(Member::getId,updateMember.getId()));
dealTrainTIme(updateMember,1,loginUserInfo);
cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
@@ -936,14 +997,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);
}
@@ -951,7 +1012,7 @@
public static void saveUserActionBiz(Member updateMember,LoginUserInfo user, Constants.UserActionType type,UserActionJoinMapper userActionMapper,String content) {
updateMember.setEditDate(updateMember.getEditDate()==null?new Date():updateMember.getEditDate());
- UserAction userAction=new UserAction();
+ UserAction userAction=new UserAction();
userAction.setIsdeleted(Constants.ZERO);
userAction.setCreateDate(updateMember.getEditDate());
userAction.setCreator(updateMember.getEditor());
@@ -970,7 +1031,7 @@
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()
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
for(Member m : list){
String faceId= HkSyncOrgUserToHKServiceImpl.dealMemberFace(m,path);
@@ -1152,6 +1213,7 @@
}
queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
queryWrapper.eq(Member::getWorkStatus,Constants.ZERO);
+ queryWrapper.orderByAsc(Member::getPinyin);
List<Member> list = memberJoinMapper.selectJoinList(Member.class,queryWrapper);
// if(list!=null){
// for(Member m : list){
@@ -1178,6 +1240,7 @@
queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
}
queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
+ queryWrapper.orderByAsc(Member::getPinyin);
List<Member> list = memberJoinMapper.selectJoinList(Member.class,queryWrapper);
if(list!=null){
for(Member m : list){
@@ -1185,6 +1248,46 @@
}
}
return list;
+ }
+ @Override
+ public void initPinyinTool(){
+ MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+ List<Member> list = memberJoinMapper.selectList(queryWrapper);
+ if(list!=null){
+ for(Member m : list){
+ if(m.getName()!=null){
+ Member u = new Member();
+ u.setId(m.getId());
+ u.setPinyin(Constants.getChinesePingyin(m.getName()));
+ memberMapper.updateById(u);
+ }
+ }
+ }
+
+ MPJLambdaWrapper<SystemUser> q1 = new MPJLambdaWrapper<>();
+ List<SystemUser> list1 = systemUserMapper.selectList(q1);
+ if(list1!=null){
+ for(SystemUser m : list1){
+ if(m.getRealname()!=null){
+ SystemUser u = new SystemUser();
+ u.setId(m.getId());
+ u.setPinyin(Constants.getChinesePingyin(m.getRealname()));
+ systemUserMapper.updateById(u);
+ }
+ }
+ }
+ MPJLambdaWrapper<Company> q2 = new MPJLambdaWrapper<>();
+ List<Company> list2 = companyMapper.selectList(q2);
+ if(list2!=null){
+ for(Company m : list2){
+ if(m.getName()!=null){
+ Company u = new Company();
+ u.setId(m.getId());
+ u.setPinyin(Constants.getChinesePingyin(m.getName()));
+ companyMapper.updateById(u);
+ }
+ }
+ }
}
@Override
@@ -1408,11 +1511,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())
@@ -1422,8 +1529,11 @@
// .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
// .eq(Member::getType,Constants.memberType.internal)
.eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
- .orderByDesc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getCreateDate)
- .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{
@@ -1472,6 +1582,9 @@
}else{
memberInfoDTO.setRoleTimeInfo("-");
}
+ memberInfoDTO.setAuthStatus(Constants.formatIntegerNum(memberInfoDTO.getAuthStatus()));
+ memberInfoDTO.setWorkStatus(Constants.formatIntegerNum(memberInfoDTO.getWorkStatus()));
+ memberInfoDTO.setSex(Constants.formatIntegerNum(memberInfoDTO.getSex()));
}
}
return PageData.from(memberIPage);
@@ -1525,7 +1638,10 @@
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
.eq(Member::getType,Constants.memberType.visitor)
.eq(Member::getIsdeleted,Constants.ZERO)
- .orderByDesc(Member::getCreateDate);
+ .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{
@@ -1563,7 +1679,7 @@
queryWrapper.selectAs(Position::getName,Member::getPositionName);
queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
-
+ queryWrapper.orderByAsc(Member::getPinyin);
IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
return PageData.from(memberIPage);
@@ -1656,9 +1772,11 @@
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(Member::getIsdeleted,Constants.ZERO)
.eq(Company::getType,Constants.ZERO)
- .eq(Member::getStatus,Constants.ZERO)
+ .eq(Member::getStatus,Constants.ZERO
+ )
.isNotNull(Member::getHkId)
- .apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" ));
+ .apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" )
+ .orderByAsc(Member::getPinyin));
if(CollectionUtils.isEmpty(memberList)){
return;
}
@@ -1694,6 +1812,7 @@
/**
* 寰俊鎺堟潈鎺ュ彛
* @param code
+ * 鏉ユ簮:0=鍙告満锛�1=璁垮锛�2=鍐呴儴鍛樺伐
* @return
*/
@Override
@@ -1705,15 +1824,164 @@
String appSecret = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_SECRET).getCode();
String getTokenUrl = WXConstant.GET_USER_INFO_URL.replace("CODE", code)
.replace("APPID", appId).replace("SECRET", appSecret);
-// JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true));
- String openId = code;
-// if(!Objects.isNull(tokenJson.get("access_token"))){
-// openId = tokenJson.getString("openid");
-// }
-// String openId = "12345";
+ JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true));
+ String openId = "";
+ if(Objects.nonNull(tokenJson)&&!Objects.isNull(tokenJson.get("access_token"))){
+ openId = tokenJson.getString("openid");
+ }
WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
+ if(StringUtils.isBlank(openId)){
+ return wxAuthorizeVO;
+ }
wxAuthorizeVO.setOpenid(openId);
- //鏍规嵁openId 鏌ヨ鐢ㄦ埛淇℃伅
+ 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鏌ヨ
+ dealSystemUserAuthBiz(wxAuthorizeVO,openId,source);
+ }
+ 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)
+ .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);
+ wxAuthorizeVO.setMember(member);
+ //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
+ String token = systemLoginService.loginByUserId(user.getId());
+ 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)
+ .in(SystemUser::getType,Constants.memberType.internal,Constants.memberType.driver)
+ .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);
+ wxAuthorizeVO.setMember(member);
+ //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
+ String token = systemLoginService.loginByUserId(user.getId());
+ wxAuthorizeVO.setToken(token);
+ }
+ }
+
+ private void dealGkUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId, Integer source) {
+ //濡傛灉鏄徃鏈烘垨鑰呭唴閮ㄤ汉鍛橈紝鍒欎粠system_user鏌ヨ
+ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getOpenid,openId)
+ .eq(SystemUser::getType,source)
+// .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
+ .eq(SystemUser::getDeleted,Constants.ZERO)
+ .last(" limit 1 "));
+ //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
+ if(!Objects.isNull(user)){
+ TmsEmployeeListRequest tp = new TmsEmployeeListRequest();
+ tp.setTel(user.getMobile());
+ TmsEmployeeListResponse response = tmsService.getEmployeeList(tp);
+ if(response == null || response.getTel()==null){
+ return;
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ处鎴蜂汉鍛樹俊鎭笉姝ｇ‘锛屽鏈夌枒闂鑱旂郴绯荤粺绠＄悊鍛樻煡鐪嬶紒");
+ }
+
+ Member member = new Member();
+ member.setPhone(user.getMobile());
+// member.setId(user.getId());
+ wxAuthorizeVO.setMember(member);
+ //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
+ String token = systemLoginService.loginByUserId(user.getId());
+ wxAuthorizeVO.setToken(token);
+ }
+ }
+
+ private void dealVisitUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId,Integer source) {
Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
.selectAll(Member.class)
.selectAs(Company::getName,Member::getCompanyName)
@@ -1727,13 +1995,15 @@
//闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
if(!Objects.isNull(member)){
if(member.getIsdeleted() == Constants.ONE){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ return;
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
}
if(member.getStatus() != Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ return;
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
}
if(StringUtils.isNotBlank(member.getIdcardNo())){
- member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, 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();
@@ -1749,11 +2019,7 @@
}
}
}
- return wxAuthorizeVO;
}
-
-
-
@Override
public List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO){
@@ -1764,12 +2030,13 @@
.selectAs(Position::getName,Member::getPositionName)
.leftJoin(Position.class,Position::getId,Member::getPositionId)
.eq(StringUtils.isNotBlank(checkVisitedDTO.getMobile()),Member::getPhone,checkVisitedDTO.getMobile())
- .eq(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName())
+ .like(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName())
.eq(Member::getIsdeleted,Constants.ZERO)
.eq(Member::getStatus,Constants.ZERO)
.eq(Member::getWorkStatus,Constants.ZERO)
.eq(Member::getCanVisit,Constants.ONE)
.eq(Company::getType,Constants.ONE)
+ .orderByAsc(Member::getPinyin)
);
List<MemberVO> memberVOList = new ArrayList<>();
if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
@@ -1806,7 +2073,8 @@
queryWrapper.and(StringUtils.isNotBlank(visitMemberDTO.getName()), ms->ms.like(Member::getPhone,visitMemberDTO.getName())
.or().like(Member::getPhone,visitMemberDTO.getName()));
}
- queryWrapper.orderByDesc(Visits::getCreateDate);
+ queryWrapper.orderByAsc(Member::getPinyin);
+// queryWrapper.orderByDesc(Visits::getCreateDate);
IPage<MemberVO> result = memberJoinMapper.selectJoinPage(page, MemberVO.class,queryWrapper);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
@@ -1873,12 +2141,12 @@
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;
try {
- ie = new ExcelImporter(file,2,0);
+ ie = new ExcelImporter(file,1,0, CellType.STRING); // 纭繚鍗曞厓鏍肩被鍨嬩负瀛楃涓�);
dataList = ie.getDataList(MemberImport.class,null);
} catch (Exception e) {
e.printStackTrace();
@@ -1892,6 +2160,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);
@@ -1903,7 +2173,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){
@@ -1948,12 +2218,17 @@
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅瀵煎叆澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
}
+
+ public static void main(String[] args) {
+ System.out.println(PhoneUtil.isPhone("18156047603"));
+ }
private Member checkModelParam(MemberImport model, List<Member> newList
,int index
,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())
@@ -1974,6 +2249,7 @@
}
}
+
for(Member member: newList){
if(StringUtils.isNotBlank(model.getIdcardNo())&&StringUtils.isNotBlank(member.getIdcardNo())) {
if (StringUtils.equals(model.getIdcardNo(), member.getIdcardNo())) {
@@ -1991,10 +2267,14 @@
if(companyType != null && !Constants.equalsInteger(companyType,company.getType())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岀粍缁囧悕绉般��"+model.getCompanyName()+"銆戠被鍨嬩笉姝ｇ‘锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
}
+ 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()+"銆戝凡瀛樺湪锛岃纭銆愯瀹㈢鐞嗐�戙�愬唴閮ㄤ汉鍛樸�戜互鍙娿�愮浉鍏虫柟浜哄憳銆戜腑鏃犺韬唤璇佸瓨鍦紝璇锋鏌ヨ〃鏍煎唴瀹癸紒");
}
}
@@ -2015,13 +2295,25 @@
private Company findCompanyFromList(String companyName, List<Company> companyList) {
if(companyList !=null){
for(Company company : companyList){
- if(StringUtils.equals(companyName,company.getName())){
+ if(StringUtils.equals(companyName,company.getCompanyNamePath())){
return company;
}
}
}
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){
@@ -2057,6 +2349,7 @@
}
if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
.eq(Member::getIsdeleted,Constants.ZERO)
+ .in(Member::getType,Constants.memberType.gkuser,Constants.memberType.visitor)
.eq(Member::getPhone,registerDriverDTO.getPhone())
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵嬫満鍙峰凡娉ㄥ唽!");
@@ -2067,14 +2360,13 @@
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵嬫満鍙峰凡娉ㄥ唽!");
};
-
smsEmailService.validateCode(registerDriverDTO.getValidCode(),registerDriverDTO.getPhone());
String salt = RandomStringUtils.randomAlphabetic(6);
- ;
+
Member member = new Member();
member.setCreateDate(new Date());
member.setIsdeleted(Constants.ZERO);
- member.setType(Constants.THREE);
+ member.setType(Constants.memberType.driver);
member.setName(registerDriverDTO.getName());
member.setPhone(registerDriverDTO.getPhone());
member.setStatus(Constants.ZERO);
@@ -2092,11 +2384,283 @@
systemUser.setSalt(salt);
systemUser.setPassword(member.getPassward());
systemUser.setStatus(Constants.ZERO);
+ systemUser.setType(Constants.memberType.driver);
systemUser.setSource(Constants.TWO);
systemUserMapper.insert(systemUser);
}
+ /**
+ * 鍚屾閽夐拤鍐呴儴鍛樺伐淇℃伅
+ */
+ @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