productDev/dmvisit.git

			@@ -1,64 +1,75 @@
			package com.doumee.service.business.impl;

			import cn.hutool.core.date.DateTime;
			import cn.hutool.core.date.DateUtil;
			import cn.hutool.core.util.IdcardUtil;
			import cn.hutool.core.util.PhoneUtil;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.doumee.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.exception.BusinessException;
			import com.doumee.core.haikang.model.HKConstants;
			import com.doumee.core.haikang.model.param.BaseResponse;
			import com.doumee.core.haikang.model.param.request.UserAddRequest;
			import com.doumee.core.haikang.model.param.request.UserDelRequest;
			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.core.utils.Constants;
			import com.doumee.core.utils.DESUtil;
			import com.doumee.core.utils.HttpsUtil;
			import com.doumee.core.utils.Utils;
			import com.doumee.core.utils.redis.RedisUtil;
			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;
			import com.doumee.dao.admin.request.LaborMemberDTO;
			import com.doumee.dao.admin.request.MemberImport;
			import com.doumee.dao.admin.request.MemberQuery;
			import com.doumee.dao.admin.response.MemberInfoDTO;
			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.web.reqeust.AccountLoginDTO;
			import com.doumee.dao.system.model.SystemUser;
			import com.doumee.dao.web.reqeust.CheckVisitedDTO;
			import com.doumee.dao.web.reqeust.VisitMemberDTO;
			import com.doumee.dao.web.response.MemberVO;
			import com.doumee.dao.web.response.WxAuthorizeVO;
			import com.doumee.service.business.MemberService;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.doumee.service.business.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 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;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.context.annotation.Lazy;
			import org.springframework.data.redis.core.RedisTemplate;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.web.multipart.MultipartFile;

			import java.math.BigDecimal;
			import java.util.Date;
			import java.util.*;
			import java.util.stream.Collectors;

			@@ -87,8 +98,8 @@

			@Autowired
			private EmpowerMapper empowerMapper;

			@Autowired

			private DeviceMapper deviceMapper;

			@Autowired
			@@ -111,36 +122,417 @@

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

			@Value("${debug_model}")
			private Boolean isDebug;
			@Override
			public Integer create(Member member) {
			memberMapper.insert(member);
			return member.getId();
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public Member create(Member member) {
			LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			if(loginUserInfo == null){
			loginUserInfo = member.getLoginUserInfo();
			}
			isMemberParamValid(member);
			//获取出生日期
			//脱敏操作
			Member insert = initAddMemberModel(member,loginUserInfo);
			//海康人员新增业务
			try {
			if(dealHkUserBiz(insert)){
			memberMapper.insert(insert);
			//创建系统登陆账号（默认无任何角色）
			// if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
			//如果是内部组织人员，新增系统登陆账号
			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;
			}
			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());
			user.setUsername(insert.getPhone());
			user.setEmpNo(insert.getCode());
			user.setRealname(insert.getName());
			user.setCompanyId(insert.getCompanyId());
			user.setMobile(insert.getPhone());
			user.setCreateTime(insert.getCreateDate());
			user.setCreateUser(insert.getCreator());
			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;
			}


			private Member initAddMemberModel(Member member, LoginUserInfo loginUserInfo) {
			Member insert= new Member();
			insert.setCreator(loginUserInfo.getId());
			insert.setCreateDate(new Date());
			insert.setEditor(loginUserInfo.getId());
			insert.setEditDate(new Date());
			insert.setHkOrgId(member.getHkOrgId());
			insert.setIsdeleted(Constants.ZERO);
			insert.setCompanyId(member.getCompanyId());
			insert.setFaceImg(member.getFaceImg());
			insert.setImgurl(member.getImgurl());
			insert.setCode(member.getCode());
			insert.setType(Constants.TWO);
			insert.setHkDate(new Date());
			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.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.setStatus(Constants.ZERO);
			return insert;
			}

			/**
			* 删除海康人员信息
			* @param hkIds
			*/
			private void deleteHkUserBiz(String[] hkIds) {
			if(hkIds ==null \|\| hkIds.length == 0){
			return;
			}
			UserDelRequest request = new UserDelRequest();
			request.setPersonIds(hkIds);
			BaseResponse<List<UserDelResponse>> result = HKService.delBatchUser(request);
			}

			/**
			* 海康人员新增业务
			* @param insert
			* @return
			*/
			private boolean dealHkUserBiz(Member insert) {
			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){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，人脸照片有误，请尝试重新上传！");
			}
			//处理新增数据
			BaseResponse<UserAddResponse> result = HKService.addUser(hkAddRequest);
			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())){
			insert.setFaceStatus(Constants.ONE);
			}else{
			insert.setFaceStatus(Constants.ZERO);
			}
			return true;
			}else if(result!=null ){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，同步安防平台失败【"+result.getMsg()+"】，请联系管理员！");
			}
			return false;
			}
			private boolean dealHkUserForUpdateBiz(Member update ) {
			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);

			//处理新增数据
			BaseResponse<UserAddResponse> result = HKService.editUser(hkAddRequest);
			if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
			update.setHkStatus(Constants.ONE);//已同步
			update.setRemark("人员信息已同步成功");
			if(StringUtils.isNotBlank(update.getFaceImg()) && Constants.equalsInteger(update.getFaceStatus(),Constants.ZERO)){
			//如果有人脸照片，处理人脸照片同步
			String faceid = HkSyncOrgUserToHKServiceImpl.dealMemberFace(update,path);
			if(StringUtils.isBlank(faceid)){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，员工人脸信息不合格，请更换人脸照片重试！");
			}else{
			update.setFaceId(faceid);
			update.setFaceStatus(Constants.ONE);
			//如果人脸跟你，重新下发权限数据
			update.setRemark("人员和人脸信息同步成功"+result.getMsg());
			//重新授权设备权限
			// HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,update,deviceRoleMapper,empowerMapper,deviceMapper);
			}
			}
			update.setHkDate(update.getEditDate());
			return true;
			}else if(result!=null ){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，同步安防平台失败【"+result.getMsg()+"】，请联系管理员！");
			}
			return false;
			}

			/**
			* 清除员工的设备权限
			* @param member
			*/
			public static void cancelAllMemberEmpower(Member member,MemberRoleMapper memberRoleMapper,EmpowerMapper empowerMapper) {
			//删除全部权限
			memberRoleMapper.update(null,new UpdateWrapper<MemberRole>().lambda()
			.eq(MemberRole::getMemberId,member.getId())
			.set(MemberRole::getIsdeleted,Constants.ONE)
			.set(MemberRole::getEdirot,member.getEditor())
			.set(MemberRole::getEditDate,member.getEditDate()));
			//把所有待下发的任务改成已取消
			empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
			.eq(Empower::getMemberId,member.getId())
			.eq(Empower::getIsdeleted,Constants.ZERO)
			.eq(Empower::getSendStatus,Constants.EmpowerStatus.wait)
			.set(Empower::getIsdeleted,Constants.ONE)
			.set(Empower::getSendStatus,Constants.EmpowerStatus.cancel));
			//所有下发过的任务，改为待删除权限
			empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
			.eq(Empower::getMemberId,member.getId())
			.set(Empower::getIsdeleted,Constants.ONE)
			.notIn(Empower::getSendStatus,Constants.EmpowerStatus.fail)
			.set(Empower::getRemark,"等待同步删除安防平台")
			.eq(Empower::getIsdeleted,Constants.ZERO)
			.eq(Empower::getIsdeleted,Constants.ZERO)
			.set(Empower::getSendStatus,Constants.ZERO));
			}

			private void isMemberParamValid(Member member) {
			if(member.getCompanyId() == null){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			if (StringUtils.isBlank(member.getPhone())\|\|!PhoneUtil.isPhone(member.getPhone())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"电话号码格式有误");
			}
			if (StringUtils.isNotBlank(member.getIdcardNo()) && !IdcardUtil.isValidCard(member.getIdcardNo())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"身份证号格式有误");
			}
			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()+"】已被使用，不能重复");
			}
			Company company = companyMapper.selectById(member.getCompanyId());
			if(company == null \|\| Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息已被删除，请刷新页面重试！");
			}
			if(StringUtils.isBlank(company.getHkId())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息未同步安防平台，请先前往【组织管理】菜单进行维护！");
			}
			member.setHkOrgId(company.getHkId());
			member.setCompanyType(company.getType());
			if(Constants.equalsInteger(company.getType(),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()+"】已存在");
			}
			}
			}
			}
			private Member isMemberUpdateParamValid(Member member) {
			Member model = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
			.selectAll(Member.class)
			.selectAs(Company::getType,Member::getCompanyType)
			.leftJoin(Company.class,Company::getId,Member::getCompanyId)
			.eq(Member::getId,member.getId())
			);
			if(model ==null \|\|Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，该员工信息不存在，请刷新页面重试！");
			}
			member.setSex(model.getSex());//默认是原来的性别
			if (StringUtils.isNotBlank(member.getPhone()) ){
			if ( !PhoneUtil.isPhone(member.getPhone())) {
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "电话号码格式有误");
			}
			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()+"】已被使用，不能重复");
			}
			}
			if (StringUtils.isNotBlank(member.getIdcardNoNew())){
			String encrptNo = (DESUtil.encrypt(Constants.EDS_PWD, 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);
			}
			}
			boolean isNeedUpdateUser = false;
			if(StringUtils.isNotBlank(member.getPhone()) && StringUtils.equals(member.getPhone(),model.getPhone())){
			// 如果手机号发生修改，校验唯一性
			SystemUser queryUserDto = new SystemUser();
			queryUserDto.setUsername(member.getPhone());
			queryUserDto.setDeleted(Boolean.FALSE);
			SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>(queryUserDto).lambda()
			.ne(SystemUser::getMemberId,model.getId()).last("limit 1"));
			if (user != null) {
			throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "手机号【" + queryUserDto.getUsername() + "】已被使用，不能重复");
			}
			isNeedUpdateUser = true;
			}
			if(StringUtils.isNotBlank(member.getCode()) && StringUtils.equals(member.getPhone(),model.getCode())){
			// 验证工号
			SystemUser queryUserDto = new SystemUser();
			queryUserDto = new SystemUser();
			queryUserDto.setDeleted(Boolean.FALSE);
			queryUserDto.setEmpNo(member.getCode());
			SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>(queryUserDto).lambda()
			.ne(SystemUser::getMemberId,model.getId()).last("limit 1"));
			if (user != null) {
			throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "工号【"+member.getCode()+"】已存在");
			}
			isNeedUpdateUser = true;
			}
			if(member.getCompanyId()!=null && !Constants.equalsInteger(member.getCompanyId(),model.getCompanyId())){
			//如果组织发生变化
			Company company = companyMapper.selectById(member.getCompanyId());
			if(company == null \|\| Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息已被删除，请刷新页面重试！");
			}
			if(StringUtils.isBlank(company.getHkId())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息未同步安防平台，请先前往【组织管理】菜单进行维护！");
			}
			model.setCompanyType(company.getType());
			member.setHkOrgId(company.getHkId());
			isNeedUpdateUser = true;
			}
			if(StringUtils.isNotBlank(model.getFaceImg())){
			isNeedUpdateUser=true;
			}
			if(isNeedUpdateUser){
			//更新系统用户账号信息
			systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
			.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())
			.set(member.getCompanyId() !=null,SystemUser::getCompanyId,member.getCompanyId())
			.set(StringUtils.isNotBlank(member.getCode()),SystemUser::getEmpNo,member.getCode())
			.eq(SystemUser::getMemberId,model.getId()));
			}
			if(Constants.equalsInteger(model.getCompanyType(),Constants.ZERO)
			&& member.getTrainEndTime()!=null
			&& member.getTrainStartTime()!=null){
			TrainTime trainTime = new TrainTime();
			trainTime.setIsdeleted(Constants.ZERO);
			trainTime.setCreator(member.getLoginUserInfo().getId());
			trainTime.setCreateDate(new Date());
			trainTime.setEdirot(trainTime.getCreator());
			trainTime.setEditDate(trainTime.getCreateDate());
			trainTime.setStartTime(member.getTrainStartTime());
			trainTime.setEndTime(member.getTrainEndTime());

			trainTime.setMemberId(member.getId());
			//导入培训有效期
			trainTimeMapper.insert(trainTime);
			}
			member.setHkId(model.getHkId());
			member.setFaceId(model.getFaceId());//人脸编码
			if(StringUtils.equals(model.getFaceImg(),member.getFaceImg())){
			//如果人脸没变化
			member.setFaceImg(null);
			}

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

			@Transactional
			@Override
			public Integer laborMemberCreate(LaborMemberDTO member) {

			LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

			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);
			//
			//转换日期
			DateTime yyyyMMdd = DateUtil.parse(birthByIdCard, "yyyyMMdd");

			Member insert = new Member();
			insert.setCreator(loginUserInfo.getId());
			insert.setCreateDate(new Date());
			@@ -152,11 +544,23 @@
			insert.setImgurl(member.getImgurl());
			insert.setType(Constants.ZERO);
			insert.setName(member.getName());
			insert.setBirthday(yyyyMMdd);
			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);
			@@ -177,20 +581,57 @@
			}

			@Override
			public void deleteById(Integer id) {
			LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			@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);

			//刪除系统登陆账户
			SystemUser user = new SystemUser();
			user.setMemberId(id);
			systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
			.eq(SystemUser::getMemberId,id)
			.set(SystemUser::getDeleted,Boolean.TRUE)
			.set(SystemUser::getUpdateUser,member.getEditor())
			.set(SystemUser::getUpdateTime,member.getEditDate())
			);
			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.ONE)
			.eq(Cars::getAuthStatus,Constants.ONE)//已授权包期的车辆
			);
			if ((carsMapper!=null && carsList.size()>0)){
			for(Cars car :carsList){
			if(Constants.equalsInteger(car.getAuthStatus(),Constants.ZERO)){
			Cars model = new Cars();
			carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
			.eq(Cars::getId,car.getId())
			.set(Cars::getStartTime,null)
			.set(Cars::getEndTime,null)
			.set(Cars::getAuthTimeType,null)
			.set(Cars::getAuthStatus,Constants.ZERO)
			.set(Cars::getEditDate,model.getEditDate())
			.set(Cars::getEdirot,model.getEdirot())
			);
			//删除已授权下发的包期授权
			CarsServiceImpl.dealCancelBookBiz(car.getCode(),date,parkBookMapper);
			}
			}
			}
			}


			@Override
			public void roleAuthById(Integer id) {
			public void roleAuthById(Integer id,LoginUserInfo user) {
			Member member = memberMapper.selectById(id);
			if(member==null \|\| member.getIsdeleted().equals(Constants.ONE)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"员工信息已删除");
			@@ -198,6 +639,176 @@
			// List<MemberCard> cards = HkSyncOrgUserToHKServiceImpl.getNormalCardList(member,memberCardMapper);
			HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,member,deviceRoleMapper,empowerMapper,deviceMapper);
			}
			@Override
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public void batchRoleAuth(Member memberRole) {
			if(memberRole.getIds() ==null
			\|\| memberRole.getIds().size() ==0 ){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			if(memberRole.getRoleIds() ==null \|\| memberRole.getRoleIds().length ==0){
			//如果是清空权限
			}else{
			if( ! (Constants.equalsInteger(memberRole.getTimeType(),Constants.ZERO)
			\|\|Constants.equalsInteger(memberRole.getTimeType(),Constants.TWO)
			\|\| (Constants.equalsInteger(memberRole.getTimeType(),Constants.ONE)
			&& memberRole.getStartTime() !=null && memberRole.getEndTime() != null ))){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			if(Constants.equalsInteger(memberRole.getTimeType(),Constants.ONE) && memberRole.getEndTime().getTime() < System.currentTimeMillis()){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"有效期截止日期不能小于当前时间！");
			}
			if(Constants.equalsInteger(memberRole.getTimeType(),Constants.ONE) && memberRole.getEndTime().getTime() <= memberRole.getStartTime().getTime()){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"有效期截止日期不能小于开始时间！");
			}
			}
			if(Constants.equalsInteger(memberRole.getTimeType(),Constants.ZERO) ){
			memberRole.setStartTime(null);
			memberRole.setEndTime(null);
			}
			for (Integer id : memberRole.getIds()){
			Member member = memberMapper.selectById(id);
			if(member==null \|\| member.getIsdeleted().equals(Constants.ONE)){
			//如果员工信息不合法直接跳过
			continue;
			}
			if(StringUtils.isBlank(member.getFaceId()) \|\| !Constants.equalsInteger(member.getFaceStatus(),Constants.ONE)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，用户【"+member.getName()+"】的人脸信息不满足授权条件，请返回完善后再进行该操作！");
			}
			member.setStartTime(memberRole.getStartTime());
			member.setEndTime(memberRole.getEndTime());
			Integer ischange = getRoleIdByParam(memberRole.getRoleIds(),member,memberRoleMapper,deviceRoleMapper);
			if(memberRole.getRoleIds()!=null && memberRole.getRoleIds().length>0 && StringUtils.isBlank(member.getRoleId())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，未查询到有效门禁组数据");
			}
			if(Constants.equalsInteger(memberRole.getTimeType(),Constants.TWO)){
			//如果按照培训日期下发
			TrainTime trainTime = trainTimeMapper.selectOne(new QueryWrapper<TrainTime>().lambda()
			.eq(TrainTime::getMemberId,id )
			.eq(TrainTime::getIsdeleted,Constants.ZERO )
			.orderByDesc(TrainTime::getId)
			.last("limit 1")
			);
			if(trainTime == null \|\| trainTime.getStartTime()==null \|\| trainTime.getEndTime() ==null \|\| trainTime.getStartTime().getTime()>=trainTime.getEndTime().getTime()){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，用户【"+member.getName()+"】培训有效期信息为空，请返回完善后再进行该操作！");
			}
			if(trainTime.getEndTime() .getTime()< System.currentTimeMillis()){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，用户【"+member.getName()+"】培训有效期已过期，请重新上传其培训有效期！");
			}
			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())
			.set(Member::getAuthStatus,Constants.ONE)
			.set(Member::getStartTime,memberRole.getStartTime())
			.set(Member::getEndTime,memberRole.getEndTime())
			.set(Member::getEditor,memberRole.getLoginUserInfo().getId())
			.set(Member::getEditDate,new Date()) );
			saveUserActionBiz(member,memberRole.getLoginUserInfo(), Constants.UserActionType.AUTH_ROLE,userActionJoinMapper,null);
			//重新授权
			HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,member,deviceRoleMapper,empowerMapper,deviceMapper);
			}
			}

			public static Integer getRoleIdByParam(Integer[] param, Member member,MemberRoleMapper memberRoleMapper,DeviceRoleMapper deviceRoleMapper) {
			//添加人员角色关联数据
			member.setRoleId(null);
			List<MemberRole> roleList = memberRoleMapper.selectList( new QueryWrapper<MemberRole>().lambda()
			.eq(MemberRole::getIsdeleted,Constants.ZERO)
			.eq(MemberRole::getMemberId,member.getId()));

			member.setRoleId("");
			if((param == null \|\| param.length==0 ) &&( roleList==null \|\| roleList.size()==0)){
			//检查用户情况权限原本就是空的，则无需处理
			return 0;
			}
			if((param == null \|\| param.length==0 ) &&( roleList!=null && roleList.size()>0) ){
			//如果清空原来有权限，接口进行权限删除原有权限即可
			memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
			return 1;
			}
			if(!Objects.isNull(param)&&param.length>Constants.ZERO){
			/* if(roleList!=null && roleList.size()>0) {
			//和原有权限进行对比，看是否权限发生变化
			boolean ischange1=false;
			for (MemberRole role : roleList) {
			ischange1=false;
			for (int j = 0; j < param.length; j++) {
			if(Constants.equalsInteger(role.getRoleId(),param[j])){
			ischange1=true;
			break;
			}
			}
			if(!ischange1){
			break;
			}
			}

			boolean ischange2 =false;
			for (int j = 0; j < param.length; j++) {
			ischange2=false;
			for (MemberRole role : roleList) {
			if(Constants.equalsInteger(role.getRoleId(),param[j])){
			ischange2=true;
			break;
			}
			}
			if(!ischange2){
			break;
			}
			}
			if(ischange2 && ischange1){
			return 0;//权限未发生改变
			}
			}*/
			//如果原来有权限，接口进行权限删除
			memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
			//查询数据库存在的权限
			List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
			.eq(DeviceRole::getType,Constants.TWO)
			.in(DeviceRole::getId,param));

			String ids = "";
			if(CollectionUtils.isNotEmpty(deviceRoleList)){
			List<MemberRole> memberRoleList = new ArrayList<>();
			List<Integer> r = new ArrayList<>();
			for (int i = 0; i < deviceRoleList.size(); i++) {
			DeviceRole deviceRole =deviceRoleList.get(i);
			if(i>0){
			ids += ",";
			}
			Integer id =deviceRole.getId();
			ids += "["+id+"]";
			String doorids =deviceRole.getDoorIds();
			if(StringUtils.isNotBlank(doorids)){
			String[] ss = doorids.split(",");
			try {
			for(String s :ss){
			r.add(Integer.parseInt(s));
			}
			}catch (Exception e){
			//脏数据不处理
			}
			}
			MemberRole memberRole = new MemberRole();
			memberRole.setCreateDate(new Date());
			memberRole.setMemberId(member.getId());
			memberRole.setIsdeleted(Constants.ZERO);
			memberRole.setRoleId(deviceRole.getId());
			memberRoleList.add(memberRole);
			}
			memberRoleMapper.insert(memberRoleList);
			}
			member.setRoleId(ids);
			return 1;
			}

			return 0;
			}

			@Override
			public void empowerByList(Member member) {
			if(member.getIdList()!=null && member.getIdList().size() >0){
			@@ -220,88 +831,191 @@
			}

			@Override
			public void deleteByIdInBatch(List<Integer> ids) {
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public void deleteByIdInBatch(List<Integer> ids,LoginUserInfo loginUserInfo) {
			if (CollectionUtils.isEmpty(ids)) {
			return;
			}
			LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			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);
			member.setHkStatus(Constants.ZERO);
			member.setRemark("人员已删除，等待删除门禁权限");
			member.setEditor(loginUserInfo.getId());
			member.setEditDate(new Date());
			memberMapper.updateById(member);
			saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
			});*/

			UserAction userAction=new UserAction();
			userAction.setIsdeleted(Constants.ZERO);
			userAction.setCreateDate(new Date());
			userAction.setCreator(loginUserInfo.getId());
			userAction.setType(9);
			userAction.setRemark("由【"+loginUserInfo.getUsername()+"】于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【删除】");
			userAction.setMemberId(s+"");
			userActionJoinMapper.insert(userAction);

			});





			/* memberMapper.deleteBatchIds(ids);*/
			}

			/**
			* 拉黑或者冻结员工信息
			* @param ids
			* @param type
			* @param loginUserInfo
			*/
			@Override
			public void batchBlock(List<Integer> ids,Integer type) {
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public void batchBlock(List<Integer> ids,Integer type,LoginUserInfo loginUserInfo) {
			if (CollectionUtils.isEmpty(ids)) {
			return;
			}
			LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			Member member=new Member();
			for (Integer id:ids) {
			member = memberMapper.selectById(id);
			if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
			UserAction userAction=new UserAction();
			// userAction.setBeforeStatus(member.getStatus());
			member.setStatus(Constants.TWO);
			Member member = memberMapper.selectById(id);
			if(!Objects.isNull(member)&&member.getStatus()!=Constants.TWO){
			member.setStatus(Constants.TWO);//恢复正常状态
			member.setEditor(loginUserInfo.getId());
			member.setEditDate(new Date());
			member.setAuthStatus(Constants.ZERO);//未授权
			memberMapper.updateById(member);

			userAction.setIsdeleted(Constants.ZERO);
			userAction.setCreateDate(new Date());
			userAction.setCreator(loginUserInfo.getId());
			Date date = new Date();
			member.setEditDate(date);
			member.setEditor(loginUserInfo.getId());
			//删除员工门禁权限
			cancelAllMemberEmpower(member,memberRoleMapper,empowerMapper);
			if(Constants.equalsInteger(type,Constants.ONE)){
			userAction.setType(Constants.ONE);
			userAction.setRemark("由【"+loginUserInfo.getUsername()+"】于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【冻结】");
			saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.FREEZE,userActionJoinMapper,JSONObject.toJSONString(member));
			}
			if(Constants.equalsInteger(type,Constants.TWO)){
			userAction.setType(Constants.TWO);
			userAction.setRemark("由【"+loginUserInfo.getUsername()+"】于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【拉黑】");

			saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.BLACKLIST,userActionJoinMapper,JSONObject.toJSONString(member));
			}
			userAction.setMemberId(id+"");

			userActionJoinMapper.insert(userAction);
			}
			}
			/* memberMapper.deleteBatchIds(ids);*/
			}
			/**
			* 拉黑或者冻结员工信息
			* @param ids
			* @param type
			* @param loginUserInfo
			*/
			@Override
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public void batchRemoveBlock(List<Integer> ids,Integer type,LoginUserInfo loginUserInfo) {
			if (CollectionUtils.isEmpty(ids)) {
			return;
			}
			for (Integer id:ids) {
			Member member = memberMapper.selectById(id);
			if(!Objects.isNull(member)&&member.getStatus()==Constants.TWO){
			member.setStatus(Constants.ZERO);//恢复正常状态
			member.setEditor(loginUserInfo.getId());
			member.setEditDate(new Date());
			member.setAuthStatus(Constants.ZERO);//未授权
			memberMapper.updateById(member);
			Date date = new Date();
			member.setEditDate(date);
			member.setEditor(loginUserInfo.getId());
			if(Constants.equalsInteger(type,Constants.ONE)){
			saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.CANCEL_FREEZE,userActionJoinMapper,JSONObject.toJSONString(member));
			}
			if(Constants.equalsInteger(type,Constants.TWO)){
			saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.CANCEL_BLACKLIST,userActionJoinMapper,JSONObject.toJSONString(member));
			}
			}
			}
			}




			@Override
			public void updateById(Member member) {
			memberMapper.updateById(member);
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public void updateById(Member updateMember) {
			LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			if(loginUserInfo == null){
			loginUserInfo = updateMember.getLoginUserInfo();
			}
			//校验参数并且更新systemuser 手机号和工号信息（如果需要修改的话）
			Member model = isMemberUpdateParamValid(updateMember);
			updateMember.setEditor(loginUserInfo.getId());
			updateMember.setEditDate(new Date());
			//海康人员新增业务
			if(dealHkUserForUpdateBiz(updateMember)){
			updateMember.setHkId(null);
			updateMember.setAuthStatus(Constants.ZERO);
			memberMapper.update(null,new UpdateWrapper<Member>().lambda()
			.set(Member::getStartTime,null)
			.set(Member::getEndTime,null)
			.set(Member::getRoleId,null)
			.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.getHkStatus()!=null,Member::getHkStatus,updateMember.getHkStatus())
			.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(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
			.set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
			.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);
			//记录操作日志
			saveUserActionBiz(updateMember,loginUserInfo,Constants.UserActionType.EDIT,userActionJoinMapper,null);
			}else{
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
			}
			}

			private void dealTrainTIme(Member updateMember, int i,LoginUserInfo loginUserInfo) {
			if( updateMember.getTrainEndTime()!=null
			&& updateMember.getTrainStartTime()!=null){
			if(updateMember.getTrainEndTime().getTime() <System.currentTimeMillis() \|\| updateMember.getTrainEndTime().getTime()<updateMember.getTrainStartTime().getTime()){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"请填写正确有效的培训有效期信息！");
			}
			TrainTime trainTime = new TrainTime();
			trainTime.setIsdeleted(Constants.ZERO);
			trainTime.setCreator(loginUserInfo.getId());
			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?"创建":"更新")+"录入");
			//导入培训有效期
			trainTimeMapper.insert(trainTime);
			}
			}

			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.setIsdeleted(Constants.ZERO);
			userAction.setCreateDate(updateMember.getEditDate());
			userAction.setCreator(updateMember.getEditor());
			userAction.setBeforeStatus(updateMember.getStatus());
			userAction.setType(type.getKey());
			userAction.setContent(content);
			String info = type.getInfo();
			userAction.setRemark(info.replace("${param1}",user!=null?user.getRealname():"系统").replace("${param2}", com.doumee.core.utils.DateUtil.getPlusTime2(updateMember.getEditDate()!=null?updateMember.getEditDate():new Date())));
			userAction.setMemberId(updateMember.getId()+"");
			userActionMapper.insert(userAction);
			}

			@Override
			public void updateFace(Member member) {
			public boolean updateFace(Member member) {
			QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
			wrapper.lambda().ne(Member::getRemark,"人脸已同步最新");
			List<Member> list =memberMapper.selectList(wrapper);
			if(list!=null){
			String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
			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);
			@@ -312,9 +1026,11 @@
			update.setRemark("人脸已同步最新");
			update.setFaceStatus(Constants.ONE);
			memberMapper.updateById(update);
			return true;
			}
			}
			}
			return false;
			}
			@Override
			public void delHkForce(Member member) {
			@@ -322,10 +1038,10 @@
			if(model ==null) {
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，人员信息不存在！");
			}
			if(!Constants.equalsObject(model.getIsdeleted(),Constants.ONE)){
			if(!Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，只有针对离职人员可进行该操作！");
			}
			if(Constants.equalsObject(model.getHkStatus(),Constants.ONE)){
			if(Constants.equalsInteger(model.getHkStatus(),Constants.ONE)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该人员已被删除！");
			}
			if(StringUtils.isBlank(model.getHkId())){
			@@ -333,95 +1049,99 @@
			}
			HkSyncEmpowerServiceImpl.doHkDeleteUser(model.getId(),model.getHkId(),new Date(),memberMapper,memberCardMapper);
			}
			@Override
			public void updateHead(Member member) {
			Member model =memberMapper.selectById(member.getId());
			if(model ==null) {
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，人员信息不存在！");
			}
			if(model.getCompanyId()!=null) {
			if(Constants.equalsInteger(member.getHeadStatus(),Constants.ONE)){
			//如果是取消主管
			companyMapper.update(null,new UpdateWrapper<Company>().lambda()
			.eq(Company::getId,model.getCompanyId())
			.set(Company::getHeadId,member.getId()));
			//记录操作日志
			saveUserActionBiz(member,member.getLoginUserInfo(), Constants.UserActionType.BE_HEAD,userActionJoinMapper,null);
			}else{
			//如果是设为主管
			companyMapper.update(null,new UpdateWrapper<Company>().lambda()
			.eq(Company::getId,model.getCompanyId())
			.set(Company::getHeadId,null)
			);
			saveUserActionBiz(member,member.getLoginUserInfo(),Constants.UserActionType.NOT_HEAD,userActionJoinMapper,null);
			}
			}
			}

			@Override
			public void updateStatusById(Member member) {
			Member model =memberMapper.selectById(member.getId());
			if(model ==null) {
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，人员信息不存在！");
			}
			LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			if(loginUserInfo == null){
			loginUserInfo = member.getLoginUserInfo();
			}
			Member update = new Member();
			update.setEditDate(new Date());
			update.setEditor(loginUserInfo.getId());
			update.setStatus(member.getStatus());
			memberMapper.updateById(update);
			}


			@Override
			public void updateVisitsStatusById(Member member) {
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public void updateWorkStatus(Member member) {
			Member model =memberMapper.selectById(member.getId());
			if(model ==null) {
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，人员信息不存在！");
			}
			LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			Member result=memberMapper.selectById(member.getId());
			Integer status=result.getStatus();
			if(loginUserInfo == null){
			loginUserInfo = member.getLoginUserInfo();
			}
			Member update = new Member();
			update.setId(member.getId());
			update.setEditDate(new Date());
			update.setEditor(loginUserInfo.getId());
			update.setStatus(Constants.Status.FREEZE.getValue());
			update.setId(member.getId());
			update.setWorkStatus(Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)?Constants.ONE:Constants.ZERO);
			if(Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)){
			//如果是离职
			cancelAllMemberEmpower(update,memberRoleMapper,empowerMapper);
			}
			update.setAuthStatus(Constants.ZERO);
			memberMapper.updateById(update);

			UserAction userAction=new UserAction();
			userAction.setIsdeleted(Constants.ZERO);
			userAction.setCreateDate(new Date());
			userAction.setCreator(loginUserInfo.getId());
			if(Constants.equalsInteger(result.getType(),Constants.TWO)){
			userAction.setType(Constants.ONE);
			userAction.setRemark("由【"+loginUserInfo.getUsername()+"】于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【冻结】");
			}
			if(Constants.equalsInteger(result.getType(),Constants.ZERO)){
			userAction.setType(Constants.TWO);
			userAction.setRemark("由【"+loginUserInfo.getUsername()+"】于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【拉黑】");

			}
			userAction.setMemberId(result.getId()+"");
			userAction.setBeforeStatus(status);
			userActionJoinMapper.insert(userAction);
			}


			@Override
			public void updateRemoveStatusById(List<Member> members) {
			LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

			Date date=new Date();
			members.stream().forEach(s ->{
			Member result=memberMapper.selectById(s.getId());
			Integer status=result.getStatus();
			Member update = new Member();
			update.setEditDate(date);
			update.setEditor(loginUserInfo.getId());
			update.setStatus(Constants.Status.ENABLE.getValue());
			update.setId(s.getId());
			memberMapper.updateById(update);

			//解冻业务处理用户授权导入记录
			this.thawMember(result);

			UserAction userAction=new UserAction();
			userAction.setIsdeleted(Constants.ZERO);
			userAction.setCreateDate(new Date());
			userAction.setCreator(loginUserInfo.getId());
			if(Constants.equalsInteger(result.getType(),Constants.TWO)){
			userAction.setType(Constants.ZERO);
			userAction.setBeforeStatus(Constants.ONE);
			}
			if(Constants.equalsInteger(result.getType(),Constants.ONE)){
			userAction.setBeforeStatus(status);
			userAction.setType(Constants.TWO);
			}
			userAction.setMemberId(result.getId()+"");
			userActionJoinMapper.insert(userAction);
			});
			//记录操作日志
			saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)?Constants.UserActionType.WORK_OFF:Constants.UserActionType.WORK_ON,userActionJoinMapper,null);
			}




			@Override
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public void updateCanVisitById(Member member) {
			LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			if(loginUserInfo == null){
			loginUserInfo = member.getLoginUserInfo();
			}
			Member model =memberMapper.selectById(member.getId());
			if(model ==null) {
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，人员信息不存在！");
			}
			if(Constants.equalsInteger(member.getCanVisit(),model.getCanVisit())){
			//如果没有发生变化，直接返回
			return;
			}
			Member update = new Member();
			update.setEditDate(new Date());
			update.setId(member.getId());
			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);
			}

			@Override
			@@ -450,9 +1170,53 @@
			MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
			queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
			queryWrapper.selectAll(Member.class)
			.selectAs(Company::getName,MemberInfoDTO::getCompanyName)
			.selectAs(Company::getLinkName,MemberInfoDTO::getLinkName);
			.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,'/',',')) ");
			}
			}
			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){
			// m.setName(StringUtils.defaultString(m.getName(),"")+"-"+StringUtils.defaultString(m.getCompanyName(),""));
			// }
			// }
			return list;
			}
			@Override
			public List<Member> findDriveList(Member member) {
			MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
			queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
			queryWrapper.selectAll(Member.class)
			.selectAs(Company::getName,Member::getCompanyName)
			.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());
			}
			@@ -460,7 +1224,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){
			@@ -468,6 +1232,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
			@@ -484,7 +1288,6 @@
			if(pageWrap.getModel().getType() != null){
			if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
			queryWrapper.select(" * , (select v.COMPANY_NAME from visits v where v.MEMBER_ID = member.id and v.STATUS = 2 order by v.CREATE_DATE desc limit 1 ) as companyName , " +
			" (select v.STARTTIME from visits v where v.MEMBER_ID = member.id and v.STATUS = 2 order by v.CREATE_DATE desc limit 1 ) as lastVisitDate , " +
			" (select count(1) from visits v where v.MEMBER_ID = member.id and v.STATUS = 2 ) as visitTimes ");
			}
			}
			@@ -531,6 +1334,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()));
			@@ -630,36 +1436,6 @@
			}

			@Override
			public PageData<MemberInfoDTO> findLaborMemberInfoPage(PageWrap<MemberInfoDTO> pageWrap) {
			IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
			MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
			MemberInfoDTO model = pageWrap.getModel();
			Utils.MP.blankToNull(model);
			Date end =pageWrap.getModel().getTrainTimeEndTime() !=null? Utils.Date.getEnd(pageWrap.getModel().getTrainTimeEndTime()):new Date();
			queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
			/* .leftJoin(TrainTime.class,TrainTime::getMemberId,Member::getId)
			.leftJoin(Empower.class,Empower::getMemberId,Member::getId);*/

			queryWrapper.selectAll(Member.class)
			.selectAs(Company::getName,MemberInfoDTO::getCompanyName)
			.selectAs(Company::getLinkName,MemberInfoDTO::getLinkName)
			/.select(" (select Max(tt.END_TIME) from train_time tt where tt.ISDELETED=0 and tt.MEMBER_ID=t.id) as trainTimeEndTime")/
			.select(" (select Max(e.END_TIME) from empower e where e.ISDELETED=0 and e.MEMBER_ID=t.id) as empowerEndTime");

			queryWrapper.eq(Member::getType,Constants.ZERO);
			queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
			.like(StringUtils.isNotBlank(model.getName()),Member::getName,model.getName())
			.like(StringUtils.isNotBlank(model.getPhone()),Member::getPhone,model.getPhone())
			.like(StringUtils.isNotBlank(model.getIdcardDecode()),Member::getIdcardDecode,model.getIdcardDecode())
			.having(pageWrap.getModel().getTrainTimeEndTime()!=null,"trainTimeEndTime < "+ DateUtil.format(end,"yyyy-MM-dd HH:mm:ss"));
			IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
			if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
			memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode())));
			}
			return PageData.from(memberIPage);
			}

			@Override
			public long count(Member member) {
			QueryWrapper<Member> wrapper = new QueryWrapper<Member>(member);
			wrapper.lambda().like(StringUtils.isNotBlank(member.getRoleIdParam()), Member::getRoleId, member.getRoleIdParam());
			@@ -684,14 +1460,35 @@
			}

			@Override
			public PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
			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);
			queryWrapper.selectAs(Company::getType,Member::getCompanyType);
			queryWrapper.selectAs(Company::getHeadId,Member::getHeadId);
			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())
			.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyword()),ms->ms
			@@ -703,20 +1500,33 @@
			.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().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(Member::getType,Constants.memberType.internal)
			.eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
			.orderByDesc(!Constants.equalsObject(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getCreateDate)
			.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{
			queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
			// queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
			}
			IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
			if(pageWrap.getModel().getCompanyId()!=null){
			if(pageWrap.getModel().getIncludeChild()!=null &&pageWrap.getModel().getIncludeChild() ){
			//如果包含下级组织
			Company company = companyMapper.selectById(pageWrap.getModel().getCompanyId());//查询组织信息
			queryWrapper.likeRight(Company::getCompanyPath,company.getCompanyPath());
			}else{
			//不包含下级组织
			queryWrapper.eq(Company::getId,pageWrap.getModel().getCompanyId());
			}
			}
			IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);

			if(CollectionUtils.isNotEmpty(memberIPage.getRecords())){
			//FTP文件访问前缀
			@@ -726,16 +1536,32 @@
			List<DeviceRole> deviceRoleList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
			.select(DeviceRole::getId,DeviceRole::getName)
			.eq(DeviceRole::getIsdeleted,Constants.ZERO));
			for (MemberInfoDTO memberInfoDTO:memberIPage.getRecords()) {
			for (Member memberInfoDTO:memberIPage.getRecords()) {
			//获得门禁组名称数组
			memberInfoDTO.setCanVisit(Constants.formatIntegerNum(memberInfoDTO.getCanVisit()));
			memberInfoDTO.setWorkStatus(Constants.formatIntegerNum(memberInfoDTO.getWorkStatus()));
			memberInfoDTO.setHeadStatus(Constants.equalsInteger(memberInfoDTO.getHeadId(),memberInfoDTO.getId())?Constants.ONE:Constants.ZERO);
			memberInfoDTO.setRoleNames(this.dealRoleDatas(memberInfoDTO.getRoleId(),deviceRoleList));
			//拼接前缀
			if(StringUtils.isNotBlank(memberInfoDTO.getFaceImg())){
			memberInfoDTO.setFaceImg(prefixUrl + memberInfoDTO.getFaceImg());
			memberInfoDTO.setFaceImgFull(prefixUrl + memberInfoDTO.getFaceImg());
			}
			if(StringUtils.isNotBlank(memberInfoDTO.getImgurl())){
			memberInfoDTO.setImgurl(prefixUrl + 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);
			@@ -768,14 +1594,16 @@
			}

			@Override
			public PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap) {
			public PageData<Member> findVisitPage(PageWrap<MemberQuery> pageWrap) {
			IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
			MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
			queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
			queryWrapper.selectAll(Member.class)
			.selectAs(Company::getName,MemberInfoDTO::getCompanyName)
			.selectAs(Member::getLastVisitDate,MemberInfoDTO::getVisitsLastDate)
			.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");
			.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 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())
			@@ -787,28 +1615,27 @@
			.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(Member::getPinyin);
			if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
			queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
			}else{
			queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
			queryWrapper.eq((pageWrap.getModel().getCompanyId())!=null,Member::getCompanyId,pageWrap.getModel().getCompanyId());
			}
			IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
			IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
			return PageData.from(memberIPage);

			}


			@Override
			public PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> pageWrap) {
			public PageData<Member> findUnusualPage(PageWrap<MemberQuery> pageWrap) {
			IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
			MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
			int actiontype =Constants.equalsInteger(pageWrap.getModel().getType(),Constants.ONE)?Constants.UserActionType.BLACKLIST.getKey():Constants.UserActionType.FREEZE.getKey();
			queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
			queryWrapper.selectAll(Member.class)
			.selectAs(Company::getName,MemberInfoDTO::getCompanyName)
			.select(" (select ua.CREATE_DATE from user_action ua where ua.MEMBER_ID=t.id and ua.ISDELETED=0 order by ua.CREATE_DATE desc limit 1) as optTime")
			.select(" (select s.REALNAME from user_action uac left join system_user s on uac.CREATOR = s.ID where uac.MEMBER_ID=t.id and uac.ISDELETED=0 order by uac.CREATE_DATE desc limit 1) as creatorName")
			.select(" (select STARTTIME from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 order by CREATE_DATE desc limit 1) as visitsLastDate")
			.selectAs(Company::getCompanyNamePath,Member::getCompanyName)
			.select(" (select ua.remark from user_action ua where ua.MEMBER_ID=t.id and ua.ISDELETED=0 and ua.type="+actiontype+" order by ua.CREATE_DATE desc limit 1) as optRemark")
			.eq(Member::getIsdeleted,Constants.ZERO);
			queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getCreaterId()),Member::getEditor,pageWrap.getModel().getCreaterId());
			queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Member::getType,pageWrap.getModel().getType());
			@@ -820,12 +1647,14 @@
			.or().like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName()))
			.like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
			.eq(Member::getStatus,Constants.Status.FREEZE.getValue())
			.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Company::getId,pageWrap.getModel().getCompanyId())
			.eq((pageWrap.getModel().getCompanyId())!=null,Company::getId,pageWrap.getModel().getCompanyId())
			.eq(Objects.nonNull(pageWrap.getModel().getCode()),Member::getCode,pageWrap.getModel().getCode())
			.orderByDesc(Member::getCreateDate);


			IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
			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);

			}
			@@ -886,7 +1715,7 @@
			list.add(model);
			}
			//导入新增的授权信息
			empowerMapper.insertBatchSomeColumn(list);
			empowerMapper.insert(list);
			}
			}
			}
			@@ -898,6 +1727,7 @@
			* 定时冻结内部人员
			*/
			@Override
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public void memberFreeze(){
			SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_FREEZE);
			if(Objects.isNull(systemDictData)\|\|
			@@ -905,43 +1735,42 @@
			){
			return;
			}
			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)
			int days = 30;
			try {
			days = Integer.parseInt(systemDictData.getCode());
			}catch (Exception e){

			}
			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)
			.exists(" SELECT 1 FROM device_event b WHERE b.ext_event_person_no = HK_ID AND TO_DAYS( NOW()) - TO_DAYS( b.CREATE_DATE ) > "+systemDictData.getCode()+" ")
			);
			.apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" )
			.orderByAsc(Member::getPinyin));
			if(CollectionUtils.isEmpty(memberList)){
			return;
			}
			List<Integer> memberIds = memberList.stream().map(m->m.getId()).collect(Collectors.toList());

			for (Integer id:memberIds) {
			UserAction userAction=new UserAction();
			userAction.setIsdeleted(Constants.ZERO);
			userAction.setCreateDate(new Date());
			userAction.setType(1);
			userAction.setRemark("由定时任务于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【冻结】");
			userAction.setMemberId(id+"");
			userActionJoinMapper.insert(userAction);
			}


			//冻结状态
			memberMapper.update(null,new UpdateWrapper<Member>()
			.lambda().set(Member::getStatus,Constants.TWO)
			.set(Member::getEditDate,new Date())
			.in(Member::getId,memberIds)
			);
			//处理下发数据
			empowerMapper.update(null,new UpdateWrapper<Empower>()
			.lambda()
			.set(Empower::getIsdeleted,Constants.ONE)
			.set(Empower::getSendStatus,Constants.ZERO)
			.set(Empower::getEditDate,new Date())
			.in(Empower::getMemberId,memberIds)
			);
			Date date = new Date();
			for (Integer id:memberIds) {
			Member updateMember = new Member();
			updateMember.setId(id);
			updateMember.setEditDate(date);
			cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
			saveUserActionBiz(updateMember,null,Constants.UserActionType.FREEZE,userActionJoinMapper,JSONObject.toJSONString(updateMember));
			}


			}


			@@ -957,27 +1786,138 @@
			/**
			* 微信授权接口
			* @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 = null;
			if(!Objects.isNull(tokenJson.get("access_token"))){
			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;
			}

			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);
			}
			}
			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 ")
			@@ -985,55 +1925,59 @@
			//非访客用户进行判断是否存在用户
			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 MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO){
			Integer validType = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.BEVISITED_USER_VALID).getCode());
			if(Objects.isNull(checkVisitedDTO)\|\|StringUtils.isBlank(checkVisitedDTO.getMobile())\|\|(validType.equals(Constants.ONE)&&StringUtils.isBlank(checkVisitedDTO.getName()))){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
			.eq(Member::getPhone,checkVisitedDTO.getMobile())
			.eq(validType.equals(Constants.ONE),Member::getName,checkVisitedDTO.getName())
			public List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO){
			List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
			.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())
			.like(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName())
			.eq(Member::getIsdeleted,Constants.ZERO)
			// .eq(Member::getStatus,Constants.ZERO)
			.eq(Member::getStatus,Constants.ZERO)
			.eq(Member::getWorkStatus,Constants.ZERO)
			.eq(Member::getCanVisit,Constants.ONE)
			.eq(Member::getType,Constants.memberType.internal)
			.last(" limit 1 ")
			.eq(Company::getType,Constants.ONE)
			.orderByAsc(Member::getPinyin)
			);
			MemberVO memberVO = new MemberVO();
			if(!Objects.isNull(member)){
			if(!member.getStatus().equals(Constants.ZERO)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"被访人账号异常，请确认后再试");
			List<MemberVO> memberVOList = new ArrayList<>();
			if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
			for (Member member:memberList) {
			MemberVO memberVO = new MemberVO();
			BeanUtils.copyProperties(member,memberVO);
			memberVOList.add(memberVO);
			}
			BeanUtils.copyProperties(member,memberVO);
			}else{
			throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"请核实被访人信息!");
			}
			return memberVO;
			return memberVOList;
			}


			@@ -1060,7 +2004,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() +
			@@ -1075,50 +2020,6 @@



			@Override
			public WxAuthorizeVO accountLogin(AccountLoginDTO accountLoginDTO){
			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
			@@ -1127,7 +2028,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());
			}
			//在场车辆
			@@ -1151,7 +2052,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>()
			@@ -1164,6 +2065,242 @@
			return stagingHeadVO;
			}

			@Override
			@Transactional(rollbackFor = {BusinessException.class,Exception.class})
			public String importBatch(MultipartFile file,Integer companyType, LoginUserInfo loginUserInfo){
			Boolean importing = (Boolean) redisTemplate.opsForValue().get(Constants.RedisKeys.IMPORTING_MEMBER);
			if(importing!=null && importing){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，已存在员工导入任务正在执行中，请稍后再试！");
			}
			redisTemplate.opsForValue().set(Constants.RedisKeys.IMPORTING_MEMBER,true);
			try {
			ExcelImporter ie = null;
			List<MemberImport> dataList =null;
			try {
			ie = new ExcelImporter(file,1,0, CellType.STRING); // 确保单元格类型为字符串);
			dataList = ie.getDataList(MemberImport.class,null);
			} catch (Exception e) {
			e.printStackTrace();
			}
			if(dataList == null \|\| dataList.size() ==0){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，录入数据为空！");
			}
			List<Member> list = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
			.selectAll(Member.class)
			.eq(Member::getIsdeleted,Constants.ZERO)
			);
			List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
			.eq(Company::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);
			newList.add(member);
			}
			if(newList == null \|\| newList.size() ==0){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，录入有效数据为空！");
			}
			dealHkUserBizBatch(newList);
			return "导入成功";
			}catch (BusinessException e){
			throw e;
			}catch (Exception e){
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"员工信息导入失败，请稍后重试");
			}finally {
			redisTemplate.delete(Constants.RedisKeys.IMPORTING_MEMBER);
			}
			}

			private void dealHkUserBizBatch(List<Member> newList) {
			List<String> hkIds = new ArrayList<>();
			try {
			for(Member insert: newList){
			if(dealHkUserBiz(insert)){
			//创建系统登陆账号（默认无任何角色）
			}else{
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息【"+insert.getName()+"】同步安防平台失败，请稍后重试！");
			}
			}
			memberMapper.insert(newList);
			List<SystemUser> userList = new ArrayList<>();
			for(Member insert: newList){
			//创建系统登陆账号（默认无任何角色）
			// if(Constants.equalsInteger(insert.getCompanyType(),Constants.ONE)){
			//如果是内部组织人员，新增系统登陆账号
			userList.add(createSystemUser(insert,systemDictDataBiz));
			// }
			}
			if(userList.size()>0){
			systemUserMapper.insert(userList);
			}
			}catch (Exception e){
			//如果发生异常，删除已经创建的人员信息
			deleteHkUserBiz(hkIds.toArray(new String[0]));
			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) {
			if(StringUtils.isBlank(model.getName())
			// \|\|StringUtils.isBlank(model.getIdcardNo())
			\|\|StringUtils.isBlank(model.getPhone())
			\|\|StringUtils.isBlank(model.getCompanyName())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行人员信息不完整，请检查表格内容！");
			}
			if (!PhoneUtil.isPhone(model.getPhone())){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行手机号【"+model.getPhone()+"】格式不正确，请检查表格内容！");
			}
			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.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()+"】重复出现，请检查表格内容！");
			}
			}
			Company company = findCompanyFromList(model.getCompanyName(),companyList);
			if(company == null){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行组织名称【"+model.getCompanyName()+"】不存在，请检查表格内容！");
			}
			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(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()+"】已存在，请检查表格内容！");
			}
			Member member = new Member();
			member.setPhone(model.getPhone());
			member.setName(model.getName());
			member.setIdcardNo(model.getIdcardNo());
			member.setCompanyId(company.getId());
			Member insert = initAddMemberModel(member,loginUserInfo);
			insert.setCompanyType(company.getType());
			insert.setHkOrgId(company.getHkId());
			return insert;
			}

			private Company findCompanyFromList(String companyName, List<Company> companyList) {
			if(companyList !=null){
			for(Company company : companyList){
			if(StringUtils.equals(companyName,company.getCompanyNamePath())){
			return company;
			}
			}
			}
			return null;
			}
			public static Member findMemberFromListByIdcard(String param, List<Member> list) {
			if(list !=null){
			for(Member member : list){
			if(StringUtils.equals(param,member.getIdcardNo())){
			return member;
			}
			}
			}
			return null;
			}
			private Member findMemberFromListByPhone(String phone, List<Member> list) {
			if(list !=null){
			for(Member member : list){
			if(StringUtils.equals(phone,member.getPhone())){
			return member;
			}
			}
			}
			return null;
			}


			@Override
			@Transactional(rollbackFor = {Exception.class,BusinessException.class})
			public void registerDriver(RegisterDriverDTO registerDriverDTO){
			if(Objects.isNull(registerDriverDTO)
			\|\| StringUtils.isBlank(registerDriverDTO.getName())
			\|\| StringUtils.isBlank(registerDriverDTO.getPassword())
			\|\| StringUtils.isBlank(registerDriverDTO.getValidCode())
			\|\| StringUtils.isBlank(registerDriverDTO.getPhone())
			){
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			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(),"手机号已注册!");
			};
			if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
			.eq(SystemUser::getDeleted,Constants.ZERO)
			.and(i->i.eq(SystemUser::getMobile,registerDriverDTO.getPhone()).or().eq(SystemUser::getUsername,registerDriverDTO.getPhone()))
			)>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.memberType.driver);
			member.setName(registerDriverDTO.getName());
			member.setPhone(registerDriverDTO.getPhone());
			member.setStatus(Constants.ZERO);
			member.setPassward(Utils.Secure.encryptPassword(registerDriverDTO.getPassword(), salt));
			memberMapper.insert(member);


			SystemUser systemUser = new SystemUser();
			systemUser.setCreateTime(new Date());
			systemUser.setDeleted(Boolean.FALSE);
			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);

			}



			}