整理

nidapeng

2024-03-19 6c40e04eb7c2060feb2533735cd3089d438965e5

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java

@@ -4,8 +4,10 @@
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.api.R;
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.constants.ResponseStatus;
@@ -26,20 +28,24 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.core.utils.redis.RedisUtil;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.CarEventJoinMapper;
import com.doumee.dao.business.join.DeviceEventJoinMapper;
import com.doumee.dao.business.join.VisitEventJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.ERPSyncService;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.InterfaceLogService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.Synchronized;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.PostConstruct;
@@ -57,6 +63,8 @@
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Autowired
    private DataSyncConfig dataSyncConfig;
    @Autowired
    private RedisTemplate<String, Object> redisTemplate;

@@ -79,6 +87,8 @@
    @Autowired
    private DeviceEventJoinMapper deviceEventJoinMapper;

    @Value("${debug_model}")
    private Boolean isDebug;
    @Autowired
    private CarEventJoinMapper carEventJoinMapper;

@@ -104,6 +114,12 @@
    @Autowired
    private InterfaceLogService interfaceLogService;

    @Autowired
    private ErpTool erpTool;


    @Autowired
    private WxPlatNotice wxPlatNotice;

    @Override
    @PostConstruct
@@ -121,12 +137,13 @@
     */
    @Override
    @Transactional
    @Synchronized
    public String syncCompany(OrgListRequest param){
        if(!StringUtils.equals(Constants.ONE+"", systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORG_USER_ORIGIN).getCode())){
        if( Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，当前不支持组织同步操作~");
        }
        //获取ERP组织信息（全量同步）
        List<ErpOrgListResponse>  list = ErpTool.getErpOrgList(ErpConstants.orgListUrl,param);
        List<ErpOrgListResponse>  list = erpTool.getErpOrgList(ErpConstants.orgListUrl,param);
        if(list !=null && list.size()>0){
            List<Company> addList = new ArrayList<>();
            List<Company> updateList = new ArrayList<>();
@@ -271,11 +288,12 @@
     */
    @Override
    @Transactional
    @Synchronized
    public  String syncUsers(UserListRequest param){
        if(!StringUtils.equals(Constants.ONE+"", systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORG_USER_ORIGIN).getCode())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，当前不支持人员同步操作~");
        if( Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，当前不支持组织同步操作~");
        }
        List<ErpUserListResponse>  list = ErpTool.getErpUserList(ErpConstants.userListUrl,param);
        List<ErpUserListResponse>  list = erpTool.getErpUserList(ErpConstants.userListUrl,param);
        if(list !=null && list.size()>0) {
            List<Member> addList = new ArrayList<>();
            List<Member> updateList = new ArrayList<>();
@@ -315,14 +333,21 @@
    }

   public void dealRoleEmpower(Member member ){
        List<Integer> doorIds = getRoleIdByParam(member.getRoleIds(),member);
//        List<Integer> doorIds = getRoleIdByParam(member.getRoleIds(),member);
        //添加人员卡片数据
        dealMemberCard(member,new UserUpdateRequest());
    }

    private void dealUserChangeList(List<ErpUserListResponse> list, List<Member> addList, List<Member> updateList, List<Member> delList, List<Member> allList,UserListRequest param) {
        Date date = new Date();
        int num =0;
        for(ErpUserListResponse response : list){
//            if(isDebug){
//                response.setPhone("1534569100"+num);
//                response.setFaceImg("20223402/DM1005.png");
//                response.setIdNo("34112219880427200"+num);
//            }
            num++;
            Company company =  new Company();
            if(StringUtils.isNotBlank(response.getOrgId())){
                company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,response.getOrgId()).last("limit 1"));
@@ -364,12 +389,14 @@
        Member member = new Member();
        BeanUtils.copyProperties(param,member);
        member.setCreateDate(date);
        if(StringUtils.isBlank(param.getFaceImg())){
        /*if(StringUtils.isBlank(param.getFaceImg())){
            member.setHkStatus(Constants.THREE);
        }else{
            member.setHkStatus(Constants.ZERO);
            member.setRemark("待同步安防平台");
        }
        }*/
        member.setHkStatus(Constants.ZERO);
        member.setRemark("待同步安防平台");
        member.setErpStatus(Constants.ONE);
        member.setErpDate(date);
        member.setErpId(param.getId());
@@ -383,8 +410,9 @@
        member.setRoleIds(param.getRoleIds());
        member.setCompanyId(Objects.isNull(company)?null:company.getId());
        member.setErpOrgId(param.getOrgId());
        member.setStartTime(request.getStartTime());
        member.setEndTime(request.getEndTime());
        member.setCanVisit(Constants.ONE);
//        member.setStartTime(request.getStartTime());
//        member.setEndTime(request.getEndTime());
        return  member;
    }

@@ -400,8 +428,8 @@
        member.setHkStatus(Constants.ZERO);
        member.setRemark("待同步安防平台");
        member.setRoleIds(param.getRoleIds());
        member.setStartTime(request.getStartTime());
        member.setEndTime(request.getEndTime());
//        member.setStartTime(request.getStartTime());
//        member.setEndTime(request.getEndTime());
        member.setCompanyId(Objects.isNull(company)?null:company.getId());
        member.setErpOrgId(param.getOrgId());
        return  member;
@@ -437,7 +465,7 @@
     */
    @Override
    public  boolean noticeUserFail(UserFailRequest param){
        ERPApiResponse r  = ErpTool.noticeUserStatus(ErpConstants.userStatusUrl,param);
        ERPApiResponse r  = erpTool.noticeUserStatus(ErpConstants.userStatusUrl,param);
        if(r!=null && r.isSuccess()){
            return true;
        }
@@ -478,45 +506,44 @@
    @Override
    public List<RoleListResponse> erpQueryDeviceList(RoleListRequest param){
        List<RoleListResponse> result = new ArrayList<>();
        try{
           List<DeviceRole> deviceRoleList = this.deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
                   .eq(DeviceRole::getIsdeleted,Constants.ZERO)
                   .eq(!Objects.isNull(param.getId()),DeviceRole::getId,param.getId())
                   .like(StringUtils.isNotBlank(param.getName()),DeviceRole::getName,param.getName())
                   .orderByAsc(DeviceRole::getCreateDate)
           );
           List<String> roleIds = new ArrayList<String>();
           if(CollectionUtils.isNotEmpty(deviceRoleList)){
               for (DeviceRole deviceRole:deviceRoleList) {
                   if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
                       List<String>  doorList = Arrays.asList(deviceRole.getDoorIds().split(","));
                       roleIds.addAll(doorList);
                   }
               }
               if(CollectionUtils.isNotEmpty(roleIds)){
                   List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,roleIds));
                   for (DeviceRole deviceRole:deviceRoleList) {
                       RoleListResponse roleListResponse = new RoleListResponse();
                       BeanUtils.copyProperties(deviceRole,roleListResponse);
                       if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
                           List<DeviceListResponse> DeviceListResponseList = new ArrayList<>();
                           List<String>  doorList = Arrays.asList(deviceRole.getDoorIds().split(","));
                           List<Device> roleDeviceList = deviceList.stream().filter(m-> doorList.contains(m.getId().toString())).collect(Collectors.toList());
                           for (Device device:roleDeviceList) {
                               DeviceListResponse deviceListResponse = new DeviceListResponse();
                               BeanUtils.copyProperties(device,deviceListResponse);
                               DeviceListResponseList.add(deviceListResponse);
                           }
                           roleListResponse.setDeviceList(DeviceListResponseList);
                       }
                       result.add(roleListResponse);
                   }
       List<DeviceRole> deviceRoleList = this.deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
               .eq(DeviceRole::getIsdeleted,Constants.ZERO)
               .eq(!Objects.isNull(param.getId()),DeviceRole::getId,param.getId())
               .like(StringUtils.isNotBlank(param.getName()),DeviceRole::getName,param.getName())
               .orderByAsc(DeviceRole::getCreateDate)
       );
       List<String> roleIds = new ArrayList<String>();
       if(CollectionUtils.isNotEmpty(deviceRoleList)){
           for (DeviceRole deviceRole:deviceRoleList) {
               if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
                   List<String>  doorList = Arrays.asList(deviceRole.getDoorIds().split(","));
                   roleIds.addAll(doorList);
               }
           }
       }catch (BusinessException e){
            throw e;
       }finally {
           saveInterfaceLog(param,"/visitBiz/resource/role/list",JSONObject.toJSONString(result),Constants.ZERO);
           if(CollectionUtils.isNotEmpty(roleIds)){
               List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,roleIds));
               for (DeviceRole deviceRole:deviceRoleList) {
                   RoleListResponse roleListResponse = new RoleListResponse();
                   BeanUtils.copyProperties(deviceRole,roleListResponse);
                   if(deviceRole.getType().equals("2")){
                       roleListResponse.setType(Constants.ONE);
                   }else{
                       roleListResponse.setType(Constants.ZERO);
                   }
                   if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
                       List<DeviceListResponse> DeviceListResponseList = new ArrayList<>();
                       List<String>  doorList = Arrays.asList(deviceRole.getDoorIds().split(","));
                       List<Device> roleDeviceList = deviceList.stream().filter(m-> doorList.contains(m.getId().toString())).collect(Collectors.toList());
                       for (Device device:roleDeviceList) {
                           DeviceListResponse deviceListResponse = new DeviceListResponse();
                           BeanUtils.copyProperties(device,deviceListResponse);
                           DeviceListResponseList.add(deviceListResponse);
                       }
                       roleListResponse.setDeviceList(DeviceListResponseList);
                   }
                   result.add(roleListResponse);
               }
           }
       }
       return result;
    }
@@ -532,23 +559,17 @@
    @Override
    public List<ParkListResponse> parkList(ParkListRequest param){
        List<ParkListResponse> result = new ArrayList<>();
        try{
            List<Parks> parksList = this.parksMapper.selectList(new QueryWrapper<Parks>().lambda()
                    .eq(Parks::getIsdeleted,Constants.ZERO)
                    .eq(!Objects.isNull(param.getId()),Parks::getId,param.getId())
                    .like(StringUtils.isNotBlank(param.getName()),Parks::getName,param.getName())
            );
            if(CollectionUtils.isNotEmpty(parksList)){
                for (Parks parks:parksList) {
                    ParkListResponse parkListResponse = new ParkListResponse();
                    BeanUtils.copyProperties(parks,parkListResponse);
                    result.add(parkListResponse);
                }
        List<Parks> parksList = this.parksMapper.selectList(new QueryWrapper<Parks>().lambda()
                .eq(Parks::getIsdeleted,Constants.ZERO)
                .eq(!Objects.isNull(param.getId()),Parks::getId,param.getId())
                .like(StringUtils.isNotBlank(param.getName()),Parks::getName,param.getName())
        );
        if(CollectionUtils.isNotEmpty(parksList)){
            for (Parks parks:parksList) {
                ParkListResponse parkListResponse = new ParkListResponse();
                BeanUtils.copyProperties(parks,parkListResponse);
                result.add(parkListResponse);
            }
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/park/list",JSONObject.toJSONString(result),Constants.ZERO);
        }
        return result;
    }
@@ -561,7 +582,6 @@
    @Override
    public PageData<VisitEventListResponse> visitListPage(PageWrap<VisitListRequest> param) {
        PageData<VisitEventListResponse> result = new PageData<>();
        try{
            VisitListRequest visitListRequest = param.getModel();
            IPage<VisitEvent> page = new Page<>(param.getPage(), param.getCapacity());
            MPJLambdaWrapper<VisitEvent> queryWrapper = new MPJLambdaWrapper<>();
@@ -600,11 +620,6 @@
            }
            IPage<VisitEventListResponse> pageData = visitEventJoinMapper.selectJoinPage(page, VisitEventListResponse.class,queryWrapper);
            result = PageData.from(pageData);
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/visit/list",JSONObject.toJSONString(result),Constants.ZERO);
        }
        return result;
    }

@@ -612,7 +627,7 @@
    @Override
    public PageData<DoorEventListResponse> doorEventListPage(PageWrap<DoorEventListRequest> param) {
        PageData<DoorEventListResponse> result = new PageData<>();
        try{

            DoorEventListRequest doorEventListRequest = param.getModel();
            IPage<DeviceEvent> page = new Page<>(param.getPage(), param.getCapacity());
            MPJLambdaWrapper<DeviceEvent> queryWrapper = new MPJLambdaWrapper<>();
@@ -654,11 +669,6 @@

            IPage<DoorEventListResponse> pageData = deviceEventJoinMapper.selectJoinPage(page, DoorEventListResponse.class,queryWrapper);
            result = PageData.from(pageData);
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/doorEvent/list",JSONObject.toJSONString(result),Constants.ZERO);
        }
        return result;
    }

@@ -666,7 +676,6 @@
    @Override
    public PageData<CarEventListResponse> carEventList(PageWrap<CarEventListRequest> param) {
        PageData<CarEventListResponse> result = new PageData<>();
        try{
            CarEventListRequest carEventListRequest = param.getModel();
            IPage<CarEvent> page = new Page<>(param.getPage(), param.getCapacity());
            MPJLambdaWrapper<CarEvent> queryWrapper = new MPJLambdaWrapper<>();
@@ -718,12 +727,6 @@
                    i.setVehiclePicUrl(null);
                }
            });
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/carEventList",JSONObject.toJSONString(result),Constants.ZERO);
        }

        return  result;
    }

@@ -732,7 +735,6 @@

    @Override
    public void orgUpdate(OrgUpdateRequest param){
        try{
            if(Objects.isNull(param)
                    ||Objects.isNull(param.getId())
                    ||StringUtils.isBlank(param.getName())
@@ -791,81 +793,86 @@
                companyMapper.updateById(company);
                //TODO 海康数据更新
            }
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/orgUpdate",null,Constants.ZERO);
        }
    }

    @Override
    public void userUpdate(UserUpdateRequest param){
        try{
            if(Objects.isNull(param)
                    ||Objects.isNull(param.getId())//编码
                    ||StringUtils.isBlank(param.getName())//名称
                    ||StringUtils.isBlank(param.getIdNo())//证件号
                    ||Objects.isNull(param.getIdType())//证件类型
                    ||Objects.isNull(param.getSex())//性别
                    ||Objects.isNull(param.getOrgId())//所属组织编码
            if(param.getIsdeleted() == 1){
                if(  Objects.isNull(param.getId()) ){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST);
                }
               memberMapper.update(null,new UpdateWrapper<Member>().lambda()
                        .eq(Member::getErpId,param.getId())
                       .eq(Member::getIsdeleted,Constants.ZERO)
                       .set(Member::getIsdeleted,Constants.ONE)
                       .set(Member::getHkStatus,Constants.ZERO)
                       .set(Member::getEditDate,new Date())
                       .set(Member::getRemark,"待同步安防平台")
               );
            }else {
                if( Objects.isNull(param)
                        ||Objects.isNull(param.getId())//编码
                        ||StringUtils.isBlank(param.getName())//名称
                        ||StringUtils.isBlank(param.getIdNo())//证件号
                        ||Objects.isNull(param.getIdType())//证件类型
                        ||Objects.isNull(param.getSex())//性别
                        ||Objects.isNull(param.getOrgId())//所属组织编码
//                    ||StringUtils.isBlank(param.getFaceImg())//人脸照片
                    ||StringUtils.isBlank(param.getCode())//工号
                    ||StringUtils.isBlank(param.getPhone())//手机号
             ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
                        ||StringUtils.isBlank(param.getCode())//工号
                        ||StringUtils.isBlank(param.getPhone())//手机号
                ){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST);
                }
                Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getId()).last("limit 1"));
                Company company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,param.getOrgId()).last("limit 1"));
                if(Objects.isNull(company)){
                    throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到组织信息");
                }
                List<Integer> doorIds = null;
                if(Objects.isNull(member)){
                    member = new Member();
                    BeanUtils.copyProperties(param,member);
                    member.setId(null);
                    member.setCreateDate(new Date());
                    member.setRemark("待同步安防平台");
                    member.setHkStatus(Constants.ZERO);
                    member.setErpStatus(Constants.ONE);
                    member.setErpDate(new Date());
                    member.setErpId(param.getId());
                    member.setFsStatus(Constants.ZERO);
                    member.setCompanyId(company.getId());
                    member.setType(Constants.memberType.internal);
                    member.setCanVisit(Constants.ONE);
                    String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
                    member.setIdcardNo(encryptIdNo);
                    member.setStartTime(param.getValidStartTime());
                    member.setRoleId(param.getRoleIds()!=null?JSONObject.toJSONString(param.getRoleIds()):null);
                    member.setEndTime(param.getValidEndTime());
                    member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
                    member.setErpOrgId(param.getOrgId());
                    memberMapper.insert(member);
                }else{
                    Integer id = member.getId();
                    BeanUtils.copyProperties(param,member);
                    member.setId(id);
                    member.setCompanyId(company.getId());
                    String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
                    member.setIdcardNo(encryptIdNo);
                    member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
                    member.setErpOrgId(param.getOrgId());
                    member.setEditDate(new Date());
                    member.setErpDate(new Date());
                    member.setHkStatus(Constants.ZERO);
                    member.setRemark("待同步安防平台");
                    member.setStartTime(param.getValidStartTime());
                    member.setEndTime(param.getValidEndTime());
                    memberMapper.updateById(member);
                }
                //2024年3月7日17:49:33 取消此业务处理人员门禁权限
//                getRoleIdByParam(param.getRoleIds(),member);
                //添加人员卡片数据
                dealMemberCard(member,param);
            }
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getId()).last("limit 1"));
            Company company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,param.getOrgId()).last("limit 1"));
            if(Objects.isNull(company)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到组织信息");
            }
            List<Integer> doorIds = null;
              if(Objects.isNull(member)){
                member = new Member();
                BeanUtils.copyProperties(param,member);
                member.setId(null);
                member.setCreateDate(new Date());
                  member.setRemark("待同步安防平台");
                member.setHkStatus(Constants.ZERO);
                member.setErpStatus(Constants.ONE);
                member.setErpDate(new Date());
                member.setErpId(param.getId());
                member.setFsStatus(Constants.ZERO);
                member.setCompanyId(company.getId());
                member.setType(Constants.memberType.internal);
                String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
                member.setIdcardNo(encryptIdNo);
                member.setStartTime(param.getValidStartTime());
                member.setRoleId(param.getRoleIds()!=null?JSONObject.toJSONString(param.getRoleIds()):null);
                member.setEndTime(param.getValidEndTime());
                member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
                member.setErpOrgId(param.getOrgId());
                memberMapper.insert(member);
            }else{
                Integer id = member.getId();
                BeanUtils.copyProperties(param,member);
                member.setId(id);
                member.setCompanyId(company.getId());
                String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
                member.setIdcardNo(encryptIdNo);
                member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
                member.setErpOrgId(param.getOrgId());
                member.setEditDate(new Date());
                member.setErpDate(new Date());
                member.setHkStatus(Constants.ZERO);
                member.setRemark("待同步安防平台");
                member.setStartTime(param.getValidStartTime());
                member.setEndTime(param.getValidEndTime());
                memberMapper.updateById(member);
            }
            //添加人员卡片数据
            getRoleIdByParam(param.getRoleIds(),member);
            dealMemberCard(member,param);
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/userUpdate",null,Constants.ZERO);
        }
    }

    /**
@@ -890,8 +897,8 @@
                    //如果已经开卡完成,不做任何处理
                }else if(model !=null){
                    //如果存在，但未开卡，则直接更改为待同步
                    model.setHkStatus(Constants.ZERO);
                    model.setRemark("待同步安防平台");
//                    model.setHkStatus(Constants.ZERO);
//                    model.setRemark("待同步安防平台");
                    model.setIsdeleted(Constants.ZERO);
                    memberCardMapper.updateById(model);
                }else{
@@ -915,6 +922,7 @@
    }
    private   List<Integer>  getRoleIdByParam(Integer[] param, Member member) {
        //添加人员角色关联数据
        member.setRoleId(null);
        if(!Objects.isNull(member)&&!Objects.isNull(member.getId())){
            memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
        }
@@ -960,73 +968,95 @@
        return  null;
    }


    @Override
    public void roleUserAuthor(UserAuthorRequest param){
        if(Objects.isNull(param)
                ||StringUtils.isBlank(param.getUserId())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1"));
        if(Objects.isNull(member)){
            return;
        }
        List<Integer> doorIds = getRoleIdByParam(param.getRoleIds(),member);
        //更新授权有效期
        Member update = new Member();
        update.setId(member.getId());
        update.setEditDate(new Date());
        update.setStartTime(param.getValidStartTime());
        update.setEndTime(param.getValidEndTime());
        update.setHkStatus(Constants.ZERO);//做一遍更新逻辑
        update.setRemark("待同步安防平台");
        memberMapper.updateById(update);
            if(Objects.isNull(param)
                    ||StringUtils.isBlank(param.getUserId())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
            if(Objects.nonNull(param.getValidStartTime())&&Objects.nonNull(param.getValidEndTime())){
                if(param.getValidStartTime().getTime()> param.getValidEndTime().getTime()){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，有效期时间不合法！");
                }
            }
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1"));
            if(Objects.isNull(member)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，用户信息不存在！");
            }
            List<Integer> doorIds = getRoleIdByParam(param.getRoleIds(),member);
            if(param.getRoleIds()!=null && param.getRoleIds().length>0 && StringUtils.isBlank(member.getRoleId())){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，未查询到有效门禁组数据");
            }
            memberMapper.update(null,new UpdateWrapper<Member>().lambda()
                    .eq(Member::getId,member.getId())
                    .set(Member::getRoleId,member.getRoleId())
                    .set(Member::getRemark,"待同步安防平台")
                    .set(Member::getStartTime,param.getValidStartTime())
                    .set(Member::getEndTime,param.getValidEndTime())
                    .set(Member::getEditDate,new Date())
                    .set(Member::getHkStatus,Constants.ZERO ));
    }


    @Override
    public void parkCarAuthor(CarAuthorRequest param){
        if(Objects.isNull(param)
                ||StringUtils.isBlank(param.getCarCode())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1"));
        if(Objects.isNull(member)){
            return;
        }
        //删除车量库记录数据
        parkBookMapper.update(null,new UpdateWrapper<ParkBook>().lambda()
                .eq(ParkBook::getCarCode,param.getCarCode())
                .set(ParkBook::getIsdeleted,Constants.ONE)
                .set(ParkBook::getHkStatus,Constants.ZERO)
        );
        //查询车库信息
        List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda().in(Parks::getId,param.getParkIdList()));
        if(CollectionUtils.isNotEmpty(parksList)){
            List<ParkBook> parkBookList = new ArrayList<>();
            for (Parks parks:parksList) {
                ParkBook parkBook = new ParkBook();
                parkBook.setIsdeleted(Constants.ZERO);
                parkBook.setCreateDate(new Date());
                parkBook.setCarCode(param.getCarCode());
                parkBook.setParkId(parks.getId());
                parkBook.setOrigin(Constants.ZERO);
                parkBook.setStartTime(Objects.isNull(param.getValidStartTime())?new Date():param.getValidStartTime());
                parkBook.setEndTime(param.getValidEndTime());
                parkBook.setTimeType(Objects.isNull(param.getValidEndTime())?Constants.ZERO:Constants.ONE);
                parkBook.setMemberId(member.getId());
                parkBook.setHkStatus(Constants.ZERO);
                parkBook.setRemark("待同步安防平台");
                parkBookList.add(parkBook);
            if(Objects.isNull(param)
                    ||StringUtils.isBlank(param.getCarCode())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
            parkBookMapper.insertBatchSomeColumn(parkBookList);
        }

            if(Objects.nonNull(param.getValidStartTime())&&Objects.nonNull(param.getValidEndTime())){
                if(param.getValidStartTime().getTime()> param.getValidEndTime().getTime()){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，有效期时间不合法！");
                }
            }
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1"));
            if(Objects.isNull(member)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，用户信息不存在！");
            }
            //删除车量库记录数据
            parkBookMapper.update(null,new UpdateWrapper<ParkBook>().lambda()
                    .eq(ParkBook::getCarCode,param.getCarCode())
                    .set(ParkBook::getIsdeleted,Constants.ONE)
                    .set(ParkBook::getHkStatus,Constants.ZERO)
            );
            //查询车库信息
            if(CollectionUtils.isNotEmpty(param.getParkIdList())){
                List<Parks>  parksList  = parksMapper.selectList(new QueryWrapper<Parks>().lambda()
                        .in(Parks::getId,param.getParkIdList())
                );
                if(CollectionUtils.isNotEmpty(parksList)){
                    List<ParkBook> parkBookList = new ArrayList<>();
                    for (Parks parks:parksList) {
                        ParkBook parkBook = new ParkBook();
                        parkBook.setIsdeleted(Constants.ZERO);
                        parkBook.setCreateDate(new Date());
                        parkBook.setCarCode(param.getCarCode());
                        parkBook.setParkId(parks.getId());
                        parkBook.setOrigin(Constants.ZERO);
                        parkBook.setStartTime(Objects.isNull(param.getValidStartTime())?null:param.getValidStartTime());
                        parkBook.setEndTime(Objects.isNull(param.getValidEndTime())?null:param.getValidEndTime());
                        parkBook.setTimeType(Objects.isNull(param.getValidEndTime())?Constants.ZERO:Constants.ONE);
                        parkBook.setMemberId(member.getId());
                        parkBook.setHkStatus(Constants.ZERO);
                        parkBook.setRemark("待同步安防平台");
                        parkBookList.add(parkBook);
                    }
                    parkBookMapper.insertBatchSomeColumn(parkBookList);
                }else{
                    throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，停车库信息不存在，授权失败");
                }
            }
    }


    @Override
    public void approveApply(ApproveNoticeRequest param){
        try{
            if(!Objects.isNull(param)
                ){

            }
            if(Objects.isNull(param)
                    ||Objects.isNull(param.getId())
                    ||Objects.isNull(param.getStatus())){
@@ -1042,11 +1072,16 @@
            List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().eq(Visits::getErpId,param.getId()));
            if(CollectionUtils.isNotEmpty(visitsList)){
                visitsList.forEach(i->{
                    i.setStatus(param.getStatus().equals(Constants.ZERO)?Constants.VisitStatus.pass:Constants.VisitStatus.noPass);
                    i.setStatus(!param.getStatus().equals(Constants.ZERO)?Constants.VisitStatus.pass:Constants.VisitStatus.noPass);
                    i.setEndCheckDate(DateUtil.StringToDate(param.getApproveDate(),"yyyy-MM-dd HH:mm:ss"));
                    i.setHkStatus(Constants.ZERO);
                    i.setRemark("待同步安防平台");
                    visitsMapper.updateById(i);
                    if(Objects.isNull(i.getParentId())){
                        wxPlatNotice.sendVisitAuditTemplateNotice(i,
                                systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_PREFIX).getCode(),
                                systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_AUDIT_VISIT).getCode());
                    }
                });
            }
        }catch (BusinessException e){
@@ -1057,8 +1092,8 @@
    }



    private void saveInterfaceLog(Object param, String path,String result,Integer type) {
    @Override
    public void saveInterfaceLog(Object param, String path, String result, Integer type) {
        InterfaceLog interfaceLog=new InterfaceLog();
        interfaceLog.setType(type);
        interfaceLog.setCreateDate(new Date());