productDev/dmvisit.git

			@@ -7,12 +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.config.Jwt.JwtPayLoad;
			import com.doumee.config.Jwt.JwtTokenUtil;
			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;
			@@ -21,11 +23,12 @@
			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.utils.redis.RedisUtil;
			import com.doumee.core.wx.WXConstant;
			import com.doumee.dao.admin.request.LaborEmpowerDTO;
			import com.doumee.dao.admin.request.LaborMemberDTO;
			@@ -34,16 +37,16 @@
			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.dto.ResetPasswordDTO;
			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;
			import com.doumee.dao.web.reqeust.AccountLoginDTO;
			import com.doumee.dao.web.reqeust.CheckVisitedDTO;
			import com.doumee.dao.web.reqeust.VisitMemberDTO;
			import com.doumee.dao.web.response.MemberVO;
			@@ -52,12 +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.doumee.service.system.SystemUserService;
			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;
			@@ -67,9 +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;

			/**
			@@ -87,6 +96,9 @@
			private MemberJoinMapper memberJoinMapper;

			@Autowired
			private JkCabinetMapper jkCabinetMapper;

			@Autowired
			private TrainTimeMapper trainTimeMapper;

			@Autowired
			@@ -97,8 +109,8 @@

			@Autowired
			private EmpowerMapper empowerMapper;

			@Autowired

			private DeviceMapper deviceMapper;

			@Autowired
			@@ -110,6 +122,8 @@
			private MemberCardMapper memberCardMapper;
			@Autowired
			private CompanyMapper companyMapper;
			@Autowired
			private PositionMapper positionMapper;

			@Autowired
			private RedisTemplate<String, Object> redisTemplate;
			@@ -122,12 +136,24 @@
			@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;

			@Autowired
			private DingTalk dingTalk;

			@Value("${debug_model}")
			private Boolean isDebug;
			@Override
			@@ -146,29 +172,35 @@
			if(dealHkUserBiz(insert)){
			memberMapper.insert(insert);
			//创建系统登陆账号（默认无任何角色）
			if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
			// if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
			//如果是内部组织人员，新增系统登陆账号
			systemUserMapper.insert(createSystemUser(insert));
			systemUserMapper.insert(createSystemUser(insert,systemDictDataBiz));
			//处理培训有效期业务
			dealTrainTIme(member,0,loginUserInfo);
			}
			// }
			}else{
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
			}
			}catch (BusinessException e){
			//如果发生异常，删除已经创建的人员信息
			deleteHkUserBiz(new String[]{insert.getHkId()});
			throw e;
			}catch (Exception e){
			//如果发生异常，删除已经创建的人员信息
			e.printStackTrace();
			deleteHkUserBiz(new String[]{insert.getHkId()});
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息新建失败，请稍后重试！");
			}
			return insert;
			}
			private SystemUser createSystemUser(Member insert) {
			public static SystemUser createSystemUser(Member insert,SystemDictDataBiz systemDictDataBiz) {
			SystemUser user = new SystemUser();
			// 生成密码盐
			String salt = RandomStringUtils.randomAlphabetic(6);
			// 生成密码
			user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INITIAL_PASSWORD).getCode(), salt));
			user.setSalt(salt);
			user.setNeedChangePwd(Constants.ZERO);
			// 创建用户记录
			user.setType(insert.getType());
			user.setAvatar(insert.getFaceImg());
			@@ -182,8 +214,10 @@
			user.setUpdateUser(insert.getEditor());
			user.setUpdateTime(insert.getEditDate());
			user.setMemberId(insert.getId());
			user.setSource(Constants.ZERO);
			user.setDeleted(Boolean.FALSE);
			user.setFixed(Boolean.FALSE);
			user.setPinyin(Constants.getChinesePingyin(user.getRealname()));
			user.setStatus(Constants.ZERO);
			return user;
			}
			@@ -191,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);
			@@ -203,17 +237,25 @@
			insert.setCode(member.getCode());
			insert.setType(Constants.TWO);
			insert.setHkDate(new Date());
			insert.setWorkStatus(Constants.ONE);//默认在职
			insert.setDdId(member.getDdId());
			insert.setErpId(member.getErpId());
			insert.setWorkStatus(Constants.ZERO);//默认在职
			insert.setCanVisit(Constants.ZERO);//默认不可访问
			insert.setAuthStatus(Constants.ZERO);
			insert.setName(member.getName());
			insert.setHkId(UUID.randomUUID().toString().replace("-",""));
			insert.setHkStatus(Constants.ONE);
			insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//根据身份证号获取性别
			insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(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())));
			insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//身份证号加密
			insert.setIdcardDecode( Constants.getTuominStr(member.getIdcardNo()));
			}
			insert.setPhone(member.getPhone());
			insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//身份证号加密
			insert.setIdcardDecode( Constants.getTuominStr(member.getIdcardNo()));
			insert.setStatus(Constants.ZERO);
			return insert;
			}
			@@ -237,7 +279,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){
			@@ -245,7 +287,7 @@
			}
			//处理新增数据
			BaseResponse<UserAddResponse> result = HKService.addUser(hkAddRequest);
			if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
			if(result!=null && StringUtils.equals(result.getCode(), HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
			insert.setHkId(hkAddRequest.getPersonId());
			insert.setFaceId(result.getData().getFaceId());
			if(StringUtils.isNotBlank(insert.getFaceId())){
			@@ -260,7 +302,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);
			@@ -328,16 +370,20 @@
			if (StringUtils.isBlank(member.getPhone())\|\|!PhoneUtil.isPhone(member.getPhone())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"电话号码格式有误");
			}
			if (StringUtils.isBlank(member.getIdcardNo())\|\|!IdcardUtil.isValidCard(member.getIdcardNo())){
			if (StringUtils.isNotBlank(member.getIdcardNo()) && !IdcardUtil.isValidCard(member.getIdcardNo())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"身份证号格式有误");
			}
			if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
			.eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
			.eq(Member::getIsdeleted,Constants.ZERO)) >0){
			throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "身份证号【"+member.getIdcardNo()+"】已被使用，不能重复");
			if(StringUtils.isNotBlank(member.getIdcardNo())){
			if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
			.in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
			.eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
			.eq(Member::getIsdeleted,Constants.ZERO)) >0){
			throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "身份证号【"+member.getIdcardNo()+"】已被使用，不能重复");
			}
			}
			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()+"】已被使用，不能重复");
			}
			@@ -370,6 +416,10 @@
			}
			}
			}




			private Member isMemberUpdateParamValid(Member member) {
			Member model = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
			.selectAll(Member.class)
			@@ -387,6 +437,7 @@
			}
			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)
			.ne(Member::getId,member.getId())) >0){
			throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "手机号【"+member.getPhone()+"】已被使用，不能重复");
			@@ -394,18 +445,19 @@
			}
			if (StringUtils.isNotBlank(member.getIdcardNoNew())){
			String encrptNo = (DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNoNew()));//身份证号加密
			if(!isDebug && !StringUtils.equals(model.getIdcardNo(),encrptNo)&& !IdcardUtil.isValidCard(member.getIdcardNoNew())){
			if(!isDebug && StringUtils.isNotBlank(member.getIdcardNoNew()) &&
			!StringUtils.equals(model.getIdcardNo(),encrptNo)&& !IdcardUtil.isValidCard(member.getIdcardNoNew())){
			//如果发生改变，并且不合法，提示异常
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"修改的新身份证号格式有误");
			}
			if( !StringUtils.equals(model.getIdcardNo(),encrptNo) ){
			if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
			.eq(Member::getIdcardNo,encrptNo)
			.in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
			.eq(Member::getIsdeleted,Constants.ZERO)
			.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);
			@@ -459,6 +511,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())
			@@ -488,6 +541,8 @@
			//如果人脸没变化
			member.setFaceImg(null);
			}

			member.setPinyin(Constants.getChinesePingyin(member.getName()));
			return model;
			}

			@@ -498,16 +553,7 @@
			if (PhoneUtil.isPhone(member.getPhone())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"电话号码格式有误");
			}
			if (IdcardUtil.isValidCard(member.getIdcardNo())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"身份证号格式有误");
			}
			if (IdcardUtil.getGenderByIdCard(member.getIdcardNo()) == member.getSex()){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"性别有误");
			}
			//获取出生日期
			String birthByIdCard = IdcardUtil.getBirthByIdCard(member.getIdcardNo());
			//脱敏操作
			String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14);
			//
			//转换日期
			Member insert = new Member();
			insert.setCreator(loginUserInfo.getId());
			@@ -520,16 +566,28 @@
			insert.setImgurl(member.getImgurl());
			insert.setType(Constants.ZERO);
			insert.setName(member.getName());
			insert.setBirthday(DateUtil.fromStringToDate("yyyyMMdd",birthByIdCard));
			insert.setPhone(member.getPhone());
			insert.setIdcardNo(Utils.Secure.encryptString(member.getIdcardNo()));
			IdcardUtil.isValidCard(member.getIdcardNo());
			insert.setIdcardDecode(hide);
			if(StringUtils.isNotBlank(member.getIdcardNo())){
			if (IdcardUtil.isValidCard(member.getIdcardNo())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"身份证号格式有误");
			}
			if (IdcardUtil.getGenderByIdCard(member.getIdcardNo()) == member.getSex()){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"性别有误");
			}
			//获取出生日期
			String birthByIdCard = IdcardUtil.getBirthByIdCard(member.getIdcardNo());
			insert.setBirthday(DateUtil.fromStringToDate("yyyyMMdd",birthByIdCard));
			insert.setIdcardNo(Utils.Secure.encryptString(member.getIdcardNo()));
			IdcardUtil.isValidCard(member.getIdcardNo());
			//脱敏操作
			String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14);
			insert.setIdcardDecode(hide);
			}
			insert.setStatus(Constants.ZERO);
			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());
			@@ -543,15 +601,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.ZERO);
			member.setIsdeleted(Constants.ONE);
			member.setEditor(loginUserInfo.getId());
			member.setEditDate(new Date());
			member.setEditDate(date);
			member.setHkStatus(Constants.ZERO);
			member.setRemark("人员已删除，等待删除门禁权限");
			memberMapper.updateById(member);
			@@ -565,11 +624,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);
			@@ -638,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())
			@@ -740,7 +819,7 @@
			memberRole.setRoleId(deviceRole.getId());
			memberRoleList.add(memberRole);
			}
			memberRoleMapper.insertBatchSomeColumn(memberRoleList);
			memberRoleMapper.insert(memberRoleList);
			}
			member.setRoleId(ids);
			return 1;
			@@ -776,7 +855,10 @@
			if (CollectionUtils.isEmpty(ids)) {
			return;
			}
			Member member=new Member();
			for(Integer id : ids){
			deleteById(id,loginUserInfo);
			}
			/* Member member=new Member();
			ids.stream().forEach(s ->{
			member.setId(s);
			member.setIsdeleted(Constants.ONE);
			@@ -786,7 +868,7 @@
			member.setEditDate(new Date());
			memberMapper.updateById(member);
			saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
			});
			});*/

			}

			@@ -868,7 +950,7 @@
			loginUserInfo = updateMember.getLoginUserInfo();
			}
			//校验参数并且更新systemuser 手机号和工号信息（如果需要修改的话）
			Member model = isMemberUpdateParamValid(updateMember);
			Member model = isMemberUpdateParamValid(updateMember);
			updateMember.setEditor(loginUserInfo.getId());
			updateMember.setEditDate(new Date());
			//海康人员新增业务
			@@ -883,6 +965,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)
			@@ -894,7 +977,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())
			.eq(Member::getId,updateMember.getId()));
			dealTrainTIme(updateMember,1,loginUserInfo);
			cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
			@@ -913,21 +1000,22 @@
			}
			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);
			}
			}

			public static void saveUserActionBiz(Member updateMember,LoginUserInfo user, Constants.UserActionType type,UserActionJoinMapper userActionMapper,String content) {
			UserAction userAction=new UserAction();
			updateMember.setEditDate(updateMember.getEditDate()==null?new Date():updateMember.getEditDate());
			UserAction userAction=new UserAction();
			userAction.setIsdeleted(Constants.ZERO);
			userAction.setCreateDate(updateMember.getEditDate());
			userAction.setCreator(updateMember.getEditor());
			@@ -946,7 +1034,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);
			@@ -1070,6 +1158,7 @@
			update.setEditor(loginUserInfo.getId());
			update.setCanVisit(member.getCanVisit());
			memberMapper.updateById(update);
			member.setEditDate(update.getEditDate());
			//记录操作日志
			saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getCanVisit(),Constants.ONE)?Constants.UserActionType.CANVISIT:Constants.UserActionType.CANCEL_VISIT,userActionJoinMapper,null);
			}
			@@ -1101,17 +1190,48 @@
			queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
			queryWrapper.selectAll(Member.class)
			.selectAs(Company::getName,Member::getCompanyName) ;
			queryWrapper.selectAs(Position::getName,Member::getPositionName);
			queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
			queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
			if(StringUtils.isNotBlank(member.getName())){
			queryWrapper.like(Member::getName,member.getName());
			}

			if(Objects.nonNull(member.getCompanyType())){
			queryWrapper.eq(Company::getType,member.getCompanyType());
			}
			if(StringUtils.isNotBlank(member.getCompanyTypes())){
			queryWrapper.in(Company::getType,Arrays.asList(member.getCompanyTypes().split(",")));
			}
			if(null != member.getType()) {
			queryWrapper.eq(Member::getType,member.getType());
			}
			if(null != member.getCompanyId()) {
			queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
			}
			if(null != member.getQuerySpecial() && Constants.equalsInteger(member.getQuerySpecial(),Constants.ONE)){
			String companySpecialId = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SPECIAL_COMPANY_ID).getCode();
			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);
			queryWrapper.orderByAsc(Member::getPinyin);
			List<Member> list = memberJoinMapper.selectJoinList(Member.class,queryWrapper);
			// if(list!=null){
			// for(Member m : list){
			@@ -1129,6 +1249,8 @@
			.eq(Member::getType,Constants.TWO)
			.exists("select b.id from car_driver b where b.isdeleted=0 and b.member_id=t.id");

			queryWrapper.selectAs(Position::getName,Member::getPositionName);
			queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
			if(null != member.getType()) {
			queryWrapper.eq(Member::getType,member.getType());
			}
			@@ -1136,6 +1258,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){
			@@ -1143,6 +1266,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
			@@ -1205,6 +1368,9 @@
			}
			if (pageWrap.getModel().getName() != null) {
			queryWrapper.lambda().eq(Member::getName, pageWrap.getModel().getName());
			}
			if (pageWrap.getModel().getPositionId() != null) {
			queryWrapper.lambda().eq(Member::getPositionId, pageWrap.getModel().getPositionId());
			}
			if (pageWrap.getModel().getBirthday() != null) {
			queryWrapper.lambda().ge(Member::getBirthday, Utils.Date.getStart(pageWrap.getModel().getBirthday()));
			@@ -1331,7 +1497,7 @@
			public PageData<Member> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
			IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
			MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();

			pageWrap.getModel().setIsdeleted(Constants.formatIntegerNum(pageWrap.getModel().getIsdeleted()));
			queryWrapper.selectAll(Member.class);
			queryWrapper.selectAs(Company::getName,Member::getCompanyName);
			queryWrapper.selectAs(SystemUser::getRealname,Member::getEditorName);
			@@ -1340,9 +1506,22 @@
			queryWrapper.selectAs(Company::getCompanyNamePath,Member::getCompanyNamePath);
			queryWrapper.selectAs(Company::getCompanyPath,Member::getCompanyPath);
			queryWrapper.select(" ( select count(1) from member_card mc where mc.isdeleted = 0 and mc.member_id = t.id ) as memberCardCount ");
			queryWrapper.select(" ( select max(tt.END_TIME) from train_time tt where tt.isdeleted = 0 and tt.member_id = t.id ) as trainEndTime ");

			queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Member::getEditor);
			queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
			queryWrapper.selectAs(Position::getName,Member::getPositionName);
			queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
			queryWrapper.eq(Member::getType,pageWrap.getModel().getType());
			LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
			if(userInfo!=null && userInfo.getCompanyIdList()!=null){
			if( userInfo.getCompanyIdList().size() ==0){
			//只能看自己
			queryWrapper.eq(Member::getId,userInfo.getMemberId());
			}else{
			queryWrapper.in(Company::getId,userInfo.getCompanyIdList());
			}
			}
			// queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
			queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,
			Member::getCompanyId,pageWrap.getModel().getCompanyIds())
			@@ -1350,20 +1529,29 @@
			.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())
			.eq(Objects.nonNull(pageWrap.getModel().getCompanyType()),Company::getType,pageWrap.getModel().getCompanyType())
			.eq(Objects.nonNull(pageWrap.getModel().getPositionId()),Member::getPositionId,pageWrap.getModel().getPositionId())
			.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
			// .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{
			@@ -1402,6 +1590,19 @@
			if(StringUtils.isNotBlank(memberInfoDTO.getImgurl())){
			memberInfoDTO.setImgurlFull(prefixUrl + memberInfoDTO.getImgurl());
			}
			memberInfoDTO.setHasFace(memberInfoDTO.getFaceId()!=null?Constants.ONE:Constants.ZERO);
			if(Constants.equalsInteger(Constants.ONE,memberInfoDTO.getAuthStatus())){
			if(memberInfoDTO.getStartTime() ==null \|\| memberInfoDTO.getEndTime() ==null ){
			memberInfoDTO.setRoleTimeInfo("长期有效");
			}else{
			memberInfoDTO.setRoleTimeInfo(DateUtil.getPlusTime2(memberInfoDTO.getStartTime())+"至"+DateUtil.getPlusTime2(memberInfoDTO.getEndTime()));
			}
			}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);
			@@ -1440,8 +1641,10 @@
			queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
			queryWrapper.selectAll(Member.class)
			.selectAs(Company::getName,Member::getCompanyName)
			.selectAs(Position::getName,Member::getPositionName)
			.leftJoin(Position.class,Position::getId,Member::getPositionId)
			.selectAs(Member::getLastVisitDate,Member::getLastVisitDate)
			.select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status in (7,8) ) as visitsCount");
			.select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status in (7,8) ) as visitTimes");
			queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Member::getName,pageWrap.getModel().getName())
			.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())
			@@ -1453,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)
			.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{
			@@ -1489,7 +1695,9 @@
			.eq(Objects.nonNull(pageWrap.getModel().getCode()),Member::getCode,pageWrap.getModel().getCode())
			.orderByDesc(Member::getCreateDate);


			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);

			@@ -1551,7 +1759,7 @@
			list.add(model);
			}
			//导入新增的授权信息
			empowerMapper.insertBatchSomeColumn(list);
			empowerMapper.insert(list);
			}
			}
			}
			@@ -1577,12 +1785,16 @@
			}catch (Exception e){

			}
			List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>()
			.lambda().eq(Member::getIsdeleted,Constants.ZERO)
			.eq(Member::getType,Constants.memberType.internal)
			.eq(Member::getStatus,Constants.ZERO)
			List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
			.selectAll(Member.class)
			.leftJoin(Company.class,Company::getId,Member::getCompanyId)
			.eq(Member::getIsdeleted,Constants.ZERO)
			.eq(Company::getType,Constants.ZERO)
			.eq(Member::getStatus,Constants.ZERO
			)
			.isNotNull(Member::getHkId)
			.apply("to_days(lastVisitDate)+ "+days+" < to_days(now())" ));
			.apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" )
			.orderByAsc(Member::getPinyin));
			if(CollectionUtils.isEmpty(memberList)){
			return;
			}
			@@ -1618,28 +1830,182 @@
			/**
			* 微信授权接口
			* @param code
			* 来源:0=司机；1=访客；2=内部员工
			* @return
			*/
			@Override
			public WxAuthorizeVO wxAuthorize(String code){
			public WxAuthorizeVO wxAuthorize(String code, Integer source){
			if(StringUtils.isBlank(code)\|\|Objects.isNull(source)){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			String appId = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode();
			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)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"您的账号暂未绑定系统，请联系管理员");
			}else{
			Member member = memberMapper.selectById(user.getMemberId());
			if(member == null \|\| member.getIsdeleted() == Constants.ONE){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"账号绑定异常，请联系管理员");
			}
			if(member.getStatus() != Constants.ZERO){
			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)
			.leftJoin(Company.class,Company::getId,Member::getCompanyId)
			.eq(Member::getOpenid,openId)
			.eq(Member::getType,source)
			.eq(Member::getIsdeleted,Constants.ZERO)
			.orderByDesc(Member::getCreateDate)
			.last(" limit 1 ")
			@@ -1647,29 +2013,31 @@
			//非访客用户进行判断是否存在用户
			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();
			member.setPrefixUrl(prefixUrl);
			// JwtPayLoad payLoad = new JwtPayLoad(Integer.toString(member.getId()));
			// String token = JwtTokenUtil.generateToken(payLoad);
			// //存储token至redis
			// RedisUtil.addObject(redisTemplate,Constants.RedisKeys.INTERNAL_TOKEN+"_"+member.getId(),token,Constants.RedisKeys.EXPIRE_TIME);
			// wxAuthorizeVO.setToken(token);
			wxAuthorizeVO.setMember(member);
			//司机与内部人员提供token
			if(Constants.equalsInteger(source,Constants.ZERO)\|\|Constants.equalsInteger(source,Constants.TWO)){
			SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,member.getId())
			.eq(SystemUser::getStatus,Constants.ZERO).last(" limit 1 "));
			if(Objects.nonNull(systemUser)){
			String token = systemLoginService.loginByUserId(systemUser.getId());
			wxAuthorizeVO.setToken(token);
			}
			}
			}
			return wxAuthorizeVO;
			}




			@Override
			public List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO){
			@@ -1677,12 +2045,16 @@
			.selectAll(Member.class)
			.selectAs(Company::getName,Member::getCompanyName)
			.leftJoin(Company.class,Company::getId,Member::getCompanyId)
			.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(Member::getType,Constants.memberType.internal)
			.eq(Company::getType,Constants.ONE)
			.orderByAsc(Member::getPinyin)
			);
			List<MemberVO> memberVOList = new ArrayList<>();
			if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
			@@ -1719,7 +2091,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() +
			@@ -1734,51 +2107,6 @@



			@Override
			public WxAuthorizeVO accountLogin(AccountLoginDTO accountLoginDTO){
			System.out.println(DESUtil.decrypt(Constants.EDS_PWD,"eIaPD5AR5DBuTBE9MW14QRG07IDKXCdh"));
			if(accountLoginDTO.getAccount().length()!=18
			//&&!IdcardUtil.isValidCard(accountLoginDTO.getAccount())
			){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，身份证号码有误，请核实后重试！");
			}
			Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
			.eq(Member::getIdcardNo, DESUtil.encrypt(Constants.EDS_PWD, accountLoginDTO.getAccount()))
			.ne(Member::getType,Constants.memberType.visitor)
			);
			if(Objects.isNull(member)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到用户,请联系管理员");
			}
			if(member.getIsdeleted() == Constants.ONE){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员");
			}
			if(member.getStatus() != Constants.ZERO){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员");
			}
			String md5Password = DESUtil.encrypt(Constants.EDS_PWD, accountLoginDTO.getPassword());
			if(!md5Password.equals(member.getPassward())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"账户密码错误!");
			}
			if(StringUtils.isNotBlank(accountLoginDTO.getOpenId())){
			//先清空原有访客的openid绑定关系
			memberMapper.update(null, new UpdateWrapper<Member>().lambda()
			.ne(Member::getType,Constants.memberType.visitor)
			.eq(Member::getOpenid,accountLoginDTO.getOpenId())
			.set(Member::getOpenid,null)
			);
			//更新当前登录用户 openId
			member.setOpenid(accountLoginDTO.getOpenId());
			memberMapper.updateById(member);
			}
			WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
			JwtPayLoad payLoad = new JwtPayLoad(Integer.toString(member.getId()));
			String token = JwtTokenUtil.generateToken(payLoad);
			//存储token至redis
			RedisUtil.addObject(redisTemplate,Constants.RedisKeys.INTERNAL_TOKEN+"_"+member.getId(),token,Constants.RedisKeys.EXPIRE_TIME);
			wxAuthorizeVO.setToken(token);
			return wxAuthorizeVO;
			}



			@Override
			@@ -1787,7 +2115,7 @@
			List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO));
			if(CollectionUtils.isNotEmpty(memberList)){
			stagingHeadVO.setWorkerCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.internal)).count());
			stagingHeadVO.setLwCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.lw_visitor)).count());
			stagingHeadVO.setLwCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.driver)).count());
			stagingHeadVO.setVisitorCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.visitor)).count());
			}
			//在场车辆
			@@ -1811,7 +2139,7 @@
			new MPJLambdaWrapper<Member>()
			.select("count(1) as memberCount, t1.name as companyName")
			.leftJoin(Company.class,Company::getId,Member::getCompanyId)
			.eq(Member::getType,Constants.memberType.lw_visitor)
			.eq(Member::getType,Constants.memberType.driver)
			.groupBy(Company::getId,Company::getName)
			);
			List<Map<String,Object>> retentionMaps = retentionJoinMapper.selectMaps(new MPJLambdaWrapper<Retention>()
			@@ -1831,12 +2159,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,1,0);
			ie = new ExcelImporter(file,1,0, CellType.STRING); // 确保单元格类型为字符串);
			dataList = ie.getDataList(MemberImport.class,null);
			} catch (Exception e) {
			e.printStackTrace();
			@@ -1850,16 +2178,20 @@
			);
			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);
			model.setPhone(ScientificNotationTUtil.convertToString(model.getPhone()));
			model.setIdcardNo(ScientificNotationTUtil.convertToString(model.getIdcardNo()));
			if(StringUtils.isBlank(model.getName())
			&&StringUtils.isBlank(model.getIdcardNo())
			&&StringUtils.isBlank(model.getPhone())
			&&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){
			@@ -1886,17 +2218,17 @@
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息【"+insert.getName()+"】同步安防平台失败，请稍后重试！");
			}
			}
			memberMapper.insertBatchSomeColumn(newList);
			memberMapper.insert(newList);
			List<SystemUser> userList = new ArrayList<>();
			for(Member insert: newList){
			//创建系统登陆账号（默认无任何角色）
			if(Constants.equalsInteger(insert.getCompanyType(),Constants.ONE)){
			// if(Constants.equalsInteger(insert.getCompanyType(),Constants.ONE)){
			//如果是内部组织人员，新增系统登陆账号
			userList.add(createSystemUser(insert));
			}
			userList.add(createSystemUser(insert,systemDictDataBiz));
			// }
			}
			if(userList.size()>0){
			systemUserMapper.insertBatchSomeColumn(userList);
			systemUserMapper.insert(userList);
			}
			}catch (Exception e){
			//如果发生异常，删除已经创建的人员信息
			@@ -1904,14 +2236,19 @@
			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.getIdcardNo())
			\|\|StringUtils.isBlank(model.getPhone())
			\|\|StringUtils.isBlank(model.getCompanyName())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行人员信息不完整，请检查表格内容！");
			@@ -1919,12 +2256,23 @@
			if (!PhoneUtil.isPhone(model.getPhone())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行手机号【"+model.getPhone()+"】格式不正确，请检查表格内容！");
			}
			if ( !isDebug && !IdcardUtil.isValidCard(model.getIdcardNo())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】格式不正确，请检查表格内容！");
			if(model.getPhone().indexOf(".")>=Constants.ZERO){
			model.setPhone(
			String.valueOf(new BigDecimal(model.getPhone()).intValue())
			);
			}
			if(StringUtils.isNotBlank(model.getIdcardNo())){
			if ( !isDebug && !IdcardUtil.isValidCard(model.getIdcardNo())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】格式不正确，请检查表格内容！");
			}
			}


			for(Member member: newList){
			if(StringUtils.equals(model.getIdcardNo(),member.getIdcardNo())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】重复出现，请检查表格内容！");
			if(StringUtils.isNotBlank(model.getIdcardNo())&&StringUtils.isNotBlank(member.getIdcardNo())) {
			if (StringUtils.equals(model.getIdcardNo(), member.getIdcardNo())) {
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，第" + (index + 3) + "行身份证号【" + model.getIdcardNo() + "】重复出现，请检查表格内容！");
			}
			}
			if(StringUtils.equals(model.getPhone(),member.getPhone())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行手机号【"+model.getPhone()+"】重复出现，请检查表格内容！");
			@@ -1937,10 +2285,17 @@
			if(companyType != null && !Constants.equalsInteger(companyType,company.getType())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行组织名称【"+model.getCompanyName()+"】类型不正确，请检查表格内容！");
			}
			String candNo = DESUtil.encrypt(Constants.EDS_PWD, model.getIdcardNo());
			if(findMemberFromListByIdcard(candNo,memberList ) !=null){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】已存在，请检查表格内容！");
			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()+"】已存在，请确认【访客管理】【内部人员】以及【相关方人员】中无该身份证存在，请检查表格内容！");
			}
			}

			if(findMemberFromListByPhone(model.getPhone(),memberList ) !=null){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行手机号【"+model.getPhone()+"】已存在，请检查表格内容！");
			}
			@@ -1958,13 +2313,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){
			@@ -2000,6 +2367,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(),"手机号已注册!");
			@@ -2010,14 +2378,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);
			@@ -2031,13 +2398,287 @@
			systemUser.setUsername(registerDriverDTO.getPhone());
			systemUser.setRealname(registerDriverDTO.getName());
			systemUser.setMemberId(member.getId());
			systemUser.setMobile(registerDriverDTO.getPhone());
			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<>();//修改为使用钉钉id 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;
			}


			}