Merge remote-tracking branch 'origin/master'

jiangping

2024-01-05 cb6874174975a370cb60f1557704c9d49a05f9e6

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

@@ -12,20 +12,15 @@
import com.doumee.core.erp.ErpConstants;
import com.doumee.core.erp.ErpTool;
import com.doumee.core.erp.model.openapi.request.erp.*;
import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse;
import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse;
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.OrgAddRequest;
import com.doumee.core.haikang.model.param.request.OrgDelRequest;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.erp.model.openapi.request.*;
import com.doumee.core.erp.model.openapi.response.*;
import com.doumee.core.erp.model.openapi.response.erp.OrgListRespone;
import com.doumee.core.erp.model.openapi.response.erp.UserListRespone;
import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse;
import com.doumee.core.erp.model.openapi.response.erp.ErpUserListResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
@@ -39,10 +34,8 @@
import com.doumee.service.business.ERPSyncService;
import com.doumee.service.business.InterfaceLogService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.hikvision.artemis.sdk.config.ArtemisConfig;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
@@ -91,6 +84,10 @@

    @Autowired
    private CompanyMapper companyMapper;
    @Autowired
    private EmpowerMapper empowerMapper;
    @Autowired
    private ParkBookMapper parkBookMapper;

    @Autowired
    private MemberMapper memberMapper;
@@ -113,7 +110,7 @@
    public  int  initHkConfig(){
        ErpConstants.approveUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_APPROVE_URL).getCode();
        ErpConstants.orgListUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_ORGLIST_URL).getCode();
        ErpConstants.userListUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_USERSTATUS_RL).getCode();
        ErpConstants.userListUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_USERLIST_URL).getCode();
        ErpConstants.userStatusUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_USERSTATUS_RL).getCode();
        return  0;
    }
@@ -125,8 +122,11 @@
    @Override
    @Transactional
    public String syncCompany(OrgListRequest param){
        if(!StringUtils.equals(Constants.ONE+"", systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORG_USER_ORIGIN).getCode())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，当前不支持组织同步操作~");
        }
        //获取ERP组织信息（全量同步）
        List<OrgListRespone>  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<>();
@@ -162,9 +162,9 @@
     * @param delIds
     * @param allList
     */
    private void dealCompanyChangeList(List<OrgListRespone> list, List<Company> addList, List<Company> updateList, List<Integer> delIds, List<Company> allList) {
    private void dealCompanyChangeList(List<ErpOrgListResponse> list, List<Company> addList, List<Company> updateList, List<Integer> delIds, List<Company> allList) {
        Date date = new Date();
        for(OrgListRespone respone : list){
        for(ErpOrgListResponse respone : list){
            //根据erpid查询企业信息，判断是新增还是更新
            Company company = findCompanyByERPId(allList,respone.getId());
            if(company == null){
@@ -180,13 +180,15 @@
                    //如果已删除，加入删除集合中
                    delIds.add(company.getId());
                    continue;
                }else{
                    company.setIsdeleted(Constants.ZERO);
                }
                updateList.add(addUpdateCompanyModel(respone,company,date));
            }
        }
        if(allList!=null && allList.size()>0){
            for(Company  c : allList){
                if(isCompanyDeleted(c,list)){
                if(!isCompanyDeleted(c,list)){
                    delIds.add(c.getId());
                }
            }
@@ -201,7 +203,7 @@
     * @param date
     * @return
     */
    private Company addUpdateCompanyModel(OrgListRespone respone,Company company,Date date) {
    private Company addUpdateCompanyModel(ErpOrgListResponse respone, Company company, Date date) {
        company.setName(respone.getName());
        company.setErpId(respone.getId());
        company.setEditDate(date);
@@ -218,21 +220,25 @@
     * @param date
     * @return
     */
    private Company getAddCompanyModel(OrgListRespone respone, Date date) {
    private Company getAddCompanyModel(ErpOrgListResponse respone, Date date) {
        Company    company = new Company();
        company.setStatus(respone.getStatus());
        company.setIsdeleted(Constants.ZERO);
        company.setName(respone.getName());
        company.setErpId(respone.getId());
        company.setCreateDate(date);
        company.setType(Constants.ONE);
        company.setCode(respone.getCode());
        company.setErpParentId(respone.getParentOrgId());
        if(StringUtils.isNotBlank(respone.getParentOrgId())&&!respone.getParentOrgId().equals("orgRoot")){
            company.setErpParentId(respone.getParentOrgId());
        }
        company.setErpDate(date);
        company.setHkStatus(Constants.ZERO);
        return  company;
    }

    private boolean isCompanyDeleted(Company c, List<OrgListRespone> list) {
        for(OrgListRespone m : list){
    private boolean isCompanyDeleted(Company c, List<ErpOrgListResponse> list) {
        for(ErpOrgListResponse m : list){
            if(StringUtils.equals(c.getErpId(),m.getId())){
                return  true;
            }
@@ -251,17 +257,165 @@
        return  null;
    }




    /**
     * 同步ERP人员信息
     * @param param
     * @return
     */
    @Override
    public    String syncUsers(UserListRequest param){
        //TODO----------------RK------------------
        List<UserListRespone>  allList = ErpTool.getErpUserList(ErpConstants.userListUrl,param);
    @Transactional
    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(), "对不起，当前不支持人员同步操作~");
        }
        List<ErpUserListResponse>  list = ErpTool.getErpUserList(ErpConstants.userListUrl,param);
        if(list !=null && list.size()>0) {
            List<Member> addList = new ArrayList<>();
            List<Member> updateList = new ArrayList<>();
            List<Integer> delIds = new ArrayList<>();
            List<Member> delList = new ArrayList<>();
            List<Member> allList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
                    .eq(Member::getIsdeleted,Constants.ZERO)
                    .eq(Member::getType, Constants.memberType.internal));
            dealUserChangeList(list,addList,updateList,delList,allList);
            if(addList.size()>0){
                for (Member member:addList) {
                    dealRoleEmpower(member,param.getStartTime(), param.getEndTime());
                }
                memberMapper.insertBatchSomeColumn(addList);
            }
            if(updateList.size()>0){
                for(Member c : updateList){
                    dealRoleEmpower(c,param.getStartTime(), param.getEndTime());
                    c.setHkStatus(Constants.ZERO);
                    memberMapper.updateById(c);
                }
            }
            if(delList.size()>0){
                for (Member member:delList) {
                    dealRoleEmpower(member,param.getStartTime(), param.getEndTime());
                }
                delIds = delList.stream().map(m->m.getId()).collect(Collectors.toList());
                memberMapper.update(null,new UpdateWrapper<Member>().lambda()
                        .set(Member::getHkStatus,Constants.ZERO)
                        .set(Member::getIsdeleted, Constants.ONE).in(Member::getId,delIds));
            }
            return "同步数据：新增【"+addList.size()+"】条，更新【"+updateList.size()+"】条，删除【"+delIds.size()+"】条";
        }else{
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "同步ERP数据为空！");
        }

    }

    public void dealRoleEmpower(Member member,Date startTime , Date endTime){
        List<Integer> doorIds = null;
        doorIds = getRoleIdByParam(member.getRoleIds(),member);
        //如果有授权门禁数据，进行用户授权数据下发任务创建
        dealMemberRoleEmpower(member,doorIds,startTime,endTime);
    }


    private void dealUserChangeList(List<ErpUserListResponse> list, List<Member> addList, List<Member> updateList, List<Member> delList, List<Member> allList) {
        Date date = new Date();
        for(ErpUserListResponse response : list){
            Company company =  new Company();
            if(StringUtils.isNotBlank(response.getOrgId())){
                company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,response.getOrgId()).last("limit 1"));
                if(Objects.isNull(company)){
                    continue;
                }    
            }
            //根据 erpId 查询用户信息，判断是新增还是更新
            Member member = findUserByERPId(allList,response.getId());
            if(member == null){
                //如果是新增
                if(Constants.formatIntegerNum(response.getIsdeleted()) == Constants.ONE){
                    continue;
                }
                //封装新增组织对象数据
                addList.add(getAddMemberModel(response,date,company));
            }else{
                //如果是更新
                if(Constants.formatIntegerNum(response.getIsdeleted()) == Constants.ONE){
                    //如果已删除，加入删除集合中
                    member.setRoleIds(response.getRoleIds());
                    delList.add(member);
//                    delIds.add(member.getId());
                    continue;
                }
                updateList.add(addUpdateMemberModel(response,member,date,company));
            }
        }
        if(allList!=null && allList.size()>0){
            for(Member  c : allList){
                if(!Constants.equalsInteger(c.getIsdeleted(),Constants.ONE) &&  !isUserDeleted(c,list)){
                    delList.add(c);
                }
            }
        }
    }

    private Member getAddMemberModel(ErpUserListResponse param, Date date,Company company) {
        Member member = new Member();
        BeanUtils.copyProperties(param,member);
        member.setCreateDate(new Date());
        member.setHkStatus(Constants.ZERO);
        member.setErpStatus(Constants.ONE);
        member.setErpDate(new Date());
        member.setErpId(param.getId());
        member.setFsStatus(Constants.ZERO);
        member.setStatus(param.getStatus());
        member.setType(Constants.memberType.internal);
        String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
        member.setIdcardNo(encryptIdNo);
        member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
        member.setHkStatus(Constants.ZERO);
        member.setRoleIds(param.getRoleIds());
        member.setCompanyId(Objects.isNull(company)?null:company.getId());
        member.setErpOrgId(param.getOrgId());
        return  member;
    }

    private Member addUpdateMemberModel(ErpUserListResponse param, Member member, Date date,Company company) {
        BeanUtils.copyProperties(param,member);
        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.setStatus(param.getStatus());
        member.setErpDate(new Date());
        member.setHkStatus(Constants.ZERO);
        member.setRoleIds(param.getRoleIds());
        member.setCompanyId(Objects.isNull(company)?null:company.getId());
        member.setErpOrgId(param.getOrgId());
        return  member;
    }

    private boolean isUserDeleted(Member c, List<ErpUserListResponse> list) {
        for(ErpUserListResponse m : list){
            if(StringUtils.equals(c.getErpId(),m.getId().toString())){
                c.setRoleIds(m.getRoleIds());
                return  true;
            }
        }
        return false;
    }

    private Member findUserByERPId(List<Member> allList, String id) {
        if(allList!=null){
            for(Member com :allList){
                if(StringUtils.equals(com.getErpId(),id)){
                    return com;
                }
            }
        }
        return  null;
    }



    /**
@@ -284,7 +438,7 @@
        try{
            String erpAccessKey = systemDictDataBiz.queryByCode(Constants.ERP_CONFIG,Constants.ERP_ACCESS_KEY).getCode();
            String erpAccessSecret = systemDictDataBiz.queryByCode(Constants.ERP_CONFIG,Constants.ERP_ACCESS_SECRET).getCode();
            if(!accessKey.equals(erpAccessKey)||!erpAccessSecret.equals(accessSecret)){
            if(!(accessKey.equals(erpAccessKey)&&erpAccessSecret.equals(accessSecret))){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"秘钥匹配失败");
            }
            JwtPayLoad payLoad = new JwtPayLoad(erpAccessKey+"-"+erpAccessSecret);
@@ -292,8 +446,9 @@
            RedisUtil.addObject(redisTemplate,Constants.RedisKeys.ERP_TOKEN,token,Constants.RedisKeys.EXPIRE_TIME);
            result.setToken(token);
            result.setExpireTime(Constants.RedisKeys.EXPIRE_TIME);
        }catch (Exception e){

            return result;
        }catch (BusinessException e){
            throw e;
        }finally {
            Map<String,String> param = new HashMap<>();
            param.put("accessKey",accessKey);
@@ -301,8 +456,6 @@
            saveInterfaceLog(param,"/visitBiz/accesstoken",JSONObject.toJSONString(result),Constants.ZERO);
        }


        return result;
    }

    /**
@@ -348,8 +501,8 @@
                   }
               }
           }
       }catch (Exception e){
           e.printStackTrace();
       }catch (BusinessException e){
            throw e;
       }finally {
           saveInterfaceLog(param,"/visitBiz/resource/role/list",JSONObject.toJSONString(result),Constants.ZERO);
       }
@@ -380,8 +533,8 @@
                    result.add(parkListResponse);
                }
            }
        }catch (Exception e){
            e.printStackTrace();
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/park/list",JSONObject.toJSONString(result),Constants.ZERO);
        }
@@ -404,12 +557,19 @@

            queryWrapper.selectAll(VisitEvent.class);
            queryWrapper.selectAs(Visits::getName, VisitEventListResponse::getVisitorName);
            queryWrapper.selectAs(VisitEvent::getBeVisitedPersonName, VisitEventListResponse::getBeVisitedUserName);
            queryWrapper.selectAs(VisitEvent::getBeVisitedPersonOrg, VisitEventListResponse::getBeVisitedUserOrg);
            queryWrapper.selectAs(VisitEvent::getSex, VisitEventListResponse::getVisitorSex);
            queryWrapper.selectAs(VisitEvent::getVisitorWorkUint, VisitEventListResponse::getVisitorWorkUint);

            queryWrapper.leftJoin(Visits.class,Visits::getId,VisitEvent::getVisitorId);

            if(!Objects.isNull(visitListRequest)){
                queryWrapper.eq(!Objects.isNull(visitListRequest.getEventId()),VisitEvent::getEventId, visitListRequest.getEventId());
                queryWrapper.like(StringUtils.isNotBlank(visitListRequest.getVisitorName()),Visits::getName, visitListRequest.getVisitorName());
                queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getIdNo()),VisitEvent::getIdNo, visitListRequest.getIdNo());

                queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getIdNo()),Visits::getIdcardNo, DESUtil.encrypt(Constants.EDS_PWD, visitListRequest.getIdNo()) );

                queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getBeVisitedPersonId()),VisitEvent::getBeVisitedPersonId, visitListRequest.getBeVisitedPersonId());
                queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getBeVisitedPersonOrgId()),VisitEvent::getBeVisitedPersonOrgId, visitListRequest.getBeVisitedPersonOrgId());
                queryWrapper.like(StringUtils.isNotBlank(visitListRequest.getVisitorWorkUint()),VisitEvent::getVisitorWorkUint, visitListRequest.getVisitorWorkUint());
@@ -428,8 +588,8 @@
            }
            IPage<VisitEventListResponse> pageData = visitEventJoinMapper.selectJoinPage(page, VisitEventListResponse.class,queryWrapper);
            result = PageData.from(pageData);
        }catch (Exception e){
            e.printStackTrace();
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/visit/list",JSONObject.toJSONString(result),Constants.ZERO);
        }
@@ -447,11 +607,11 @@
            Utils.MP.blankToNull(doorEventListRequest);
            queryWrapper.selectAs(DeviceEvent::getEventId,DoorEventListResponse::getEventId);
            queryWrapper.selectAs(DeviceEvent::getEventType,DoorEventListResponse::getEventType);
            queryWrapper.selectAs(DeviceEvent::getSex,DoorEventListResponse::getSex);
            queryWrapper.selectAs(Member::getSex,DoorEventListResponse::getSex);
            queryWrapper.selectAs(DeviceEvent::getSrcName,DoorEventListResponse::getSrcName);
            queryWrapper.selectAs(DeviceEvent::getSrcType,DoorEventListResponse::getSrcType);
            queryWrapper.selectAs(DeviceEvent::getIdcardDecode,DoorEventListResponse::getIdcardNo);
            queryWrapper.selectAs(DeviceEvent::getName,DoorEventListResponse::getName);
            queryWrapper.selectAs(Member::getIdcardDecode,DoorEventListResponse::getIdcardNo);
            queryWrapper.selectAs(Member::getName,DoorEventListResponse::getName);
            queryWrapper.selectAs(DeviceEvent::getUserType,DoorEventListResponse::getType);
            queryWrapper.selectAs(DeviceEvent::getExtEventInOut,DoorEventListResponse::getEventInOut);
            queryWrapper.selectAs(DeviceEvent::getExtAccessChannel,DoorEventListResponse::getExtAccessChannel);
@@ -463,14 +623,14 @@

            if(!Objects.isNull(doorEventListRequest)){
                queryWrapper.eq(!Objects.isNull(doorEventListRequest.getEventId()),DeviceEvent::getEventId, doorEventListRequest.getEventId());
                queryWrapper.like(StringUtils.isNotBlank(doorEventListRequest.getName()),DeviceEvent::getName, doorEventListRequest.getName());
                queryWrapper.like(StringUtils.isNotBlank(doorEventListRequest.getName()),Member::getName, doorEventListRequest.getName());
                if(StringUtils.isNotBlank(doorEventListRequest.getIdNo())){
                    //进行加密
                    String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,doorEventListRequest.getIdNo());
                    queryWrapper.eq(DeviceEvent::getIdNum, encryptIdNo);
                    queryWrapper.eq(Member::getIdcardNo, encryptIdNo);
                }
                queryWrapper.ge(StringUtils.isNotBlank(doorEventListRequest.getStartTime()),DeviceEvent::getHappenTime, doorEventListRequest.getStartTime());
                queryWrapper.le(StringUtils.isNotBlank(doorEventListRequest.getEndTime()),DeviceEvent::getHappenTime, doorEventListRequest.getEndTime());
                queryWrapper.ge(StringUtils.isNotBlank(doorEventListRequest.getStartTime()),DeviceEvent::getCreateDate, doorEventListRequest.getStartTime());
                queryWrapper.le(StringUtils.isNotBlank(doorEventListRequest.getEndTime()),DeviceEvent::getCreateDate, doorEventListRequest.getEndTime());
                for(PageWrap.SortData sortData: param.getSorts()) {
                    if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                        queryWrapper.orderByDesc(sortData.getProperty());
@@ -482,8 +642,8 @@

            IPage<DoorEventListResponse> pageData = deviceEventJoinMapper.selectJoinPage(page, DoorEventListResponse.class,queryWrapper);
            result = PageData.from(pageData);
        }catch (Exception e){
            e.printStackTrace();
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/doorEvent/list",JSONObject.toJSONString(result),Constants.ZERO);
        }
@@ -501,7 +661,8 @@
            Utils.MP.blankToNull(carEventListRequest);
            queryWrapper.selectAs(CarEvent::getEventId,CarEventListResponse::getEventId);
            queryWrapper.selectAs(CarEvent::getEventType,CarEventListResponse::getEventType);
            queryWrapper.selectAs(CarEvent::getInoutType,CarEventListResponse::getEventType);
            queryWrapper.selectAs(CarEvent::getCreateDate,CarEventListResponse::getCreateTime);
            queryWrapper.selectAs(CarEvent::getInoutType,CarEventListResponse::getInoutType);
            queryWrapper.selectAs(CarEvent::getAlarmCar,CarEventListResponse::getAlarmCar);
            queryWrapper.selectAs(CarEvent::getCarAttributeName,CarEventListResponse::getCarAttributeName);
            queryWrapper.selectAs(CarEvent::getCardNo,CarEventListResponse::getCardNo);
@@ -525,8 +686,8 @@
                queryWrapper.eq(StringUtils.isNotBlank(carEventListRequest.getParkId()),CarEvent::getParkIndex, carEventListRequest.getParkId());
                queryWrapper.like(StringUtils.isNotBlank(carEventListRequest.getParkName()),CarEvent::getParkName, carEventListRequest.getParkName());
                queryWrapper.eq(StringUtils.isNotBlank(carEventListRequest.getPlateNo()),CarEvent::getPlateNos, carEventListRequest.getPlateNo());
                queryWrapper.ge(StringUtils.isNotBlank(carEventListRequest.getStartTime()),CarEvent::getHappenTime, carEventListRequest.getStartTime());
                queryWrapper.le(StringUtils.isNotBlank(carEventListRequest.getEndTime()),CarEvent::getHappenTime, carEventListRequest.getEndTime());
                queryWrapper.ge(StringUtils.isNotBlank(carEventListRequest.getStartTime()),CarEvent::getCreateDate, carEventListRequest.getStartTime());
                queryWrapper.le(StringUtils.isNotBlank(carEventListRequest.getEndTime()),CarEvent::getCreateDate, carEventListRequest.getEndTime());
                for(PageWrap.SortData sortData: param.getSorts()) {
                    if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                        queryWrapper.orderByDesc(sortData.getProperty());
@@ -545,8 +706,8 @@
                    i.setVehiclePicUrl(null);
                }
            });
        }catch (Exception e){
            e.printStackTrace();
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/carEventList",JSONObject.toJSONString(result),Constants.ZERO);
        }
@@ -563,35 +724,61 @@
            if(Objects.isNull(param)
                    ||Objects.isNull(param.getId())
                    ||StringUtils.isBlank(param.getName())
                    ||StringUtils.isBlank(param.getLinkName())
                    ||StringUtils.isBlank(param.getLinkPhone())
                    ||Objects.isNull(param.getEditDate())
//                    ||StringUtils.isBlank(param.getLinkName())
//                    ||StringUtils.isBlank(param.getLinkPhone())
//                    ||Objects.isNull(param.getEditDate())
            ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
            Company company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,param.getId()).last("limit 1"));
            Company parentCompany = new Company();
            if(StringUtils.isNotBlank(param.getParentId())){
                parentCompany = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,param.getParentId()).last("limit 1"));
                if(Objects.isNull(parentCompany)){
                    throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到上级组织数据");
                }
            }
            String rootOrgId = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_ROOTORG_CODE).getCode();
            if(Objects.isNull(company)){
                company = new Company();
                BeanUtils.copyProperties(param,company);
                company.setId(null);
                company.setCreateDate(new Date());
                company.setHkStatus(Constants.ZERO);
                company.setErpStatus(Constants.ONE);
                company.setErpDate(new Date());
                company.setName(param.getName());
               /* if(StringUtils.isNotBlank(param.getParentId())){
                    company.setHkId(rootOrgId);
                }*/
                company.setErpId(param.getId());
                company.setErpParentId(param.getParentId());
                company.setParentId(Objects.isNull(parentCompany)?null:parentCompany.getId());
                company.setErpParentId(param.getParentId());
                company.setFsStatus(Constants.ZERO);
                company.setType(Constants.ONE);
                company.setLinkName(param.getLinkName());
                company.setLinkPhone(param.getLinkPhone());
                companyMapper.insert(company);
                //TODO 海康数据创建
            }else{
                BeanUtils.copyProperties(param,company);
//                BeanUtils.copyProperties(param,company);
                company.setEditDate(new Date());
                company.setErpId(param.getId());
            /*    if(StringUtils.isNotBlank(param.getParentId())){
                    company.setHkId(rootOrgId);
                }*/
                company.setHkStatus(Constants.ZERO);
                company.setErpDate(new Date());
                company.setName(param.getName());
                company.setErpParentId(param.getParentId());
                company.setParentId(Objects.isNull(parentCompany)?null:parentCompany.getId());
                company.setLinkName(param.getLinkName());
                company.setLinkPhone(param.getLinkPhone());
                companyMapper.updateById(company);
                //TODO 海康数据更新
            }
        }catch (Exception e){
            e.printStackTrace();
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/orgUpdate",null,Constants.ZERO);
        }
@@ -603,23 +790,28 @@
    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())
                    ||StringUtils.isNotBlank(param.getFaceImg())
                    ||StringUtils.isNotBlank(param.getCode())
                    ||StringUtils.isNotBlank(param.getPhone())
                    ||Objects.isNull(param.getEditDate())
            ){
                    ||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);
            }
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getId()).last("limit 1"));
            if(Objects.isNull(member)){
            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.setHkStatus(Constants.ZERO);
                member.setErpStatus(Constants.ONE);
@@ -630,63 +822,195 @@
                String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
                member.setIdcardNo(encryptIdNo);
                member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
                member.setCompanyId(param.getOrgId());
                member.setErpOrgId(param.getOrgId());
                doorIds = getRoleIdByParam(param.getRoleIds(),member);
                memberMapper.insert(member);

                //TODO 海康数据创建
                //TODO 海康数据创建-------------修改-------------------
            }else{
                Integer id = member.getId();
                BeanUtils.copyProperties(param,member);
                member.setId(id);
                String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
                member.setIdcardNo(encryptIdNo);
                member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
                member.setCompanyId(param.getOrgId());
                member.setErpOrgId(param.getOrgId());
                member.setEditDate(new Date());
                doorIds = getRoleIdByParam(param.getRoleIds(),member);
                member.setErpDate(new Date());
                member.setHkStatus(Constants.ZERO);
                memberMapper.updateById(member);
                //删除用户卡片数据  人员角色关联
                memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,member.getId()));
                memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
                //TODO 海康数据更新
            }
            //添加人员角色关联数据
            if(!Objects.isNull(param.getRoleIds())&&param.getRoleIds().length>Constants.ZERO){
                //查询数据库存在的权限
                List<DeviceRole> deviceRoleList
                        = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda().eq(DeviceRole::getId,param.getRoleIds()));
                if(CollectionUtils.isNotEmpty(deviceRoleList)){
                    List<MemberRole> memberRoleList = new ArrayList<>();
                    for (DeviceRole deviceRole:deviceRoleList) {
                        MemberRole memberRole = new MemberRole();
                        memberRole.setCreateDate(new Date());
                        memberRole.setMemberId(member.getId());
                        memberRole.setIsdeleted(Constants.ZERO);
                        memberRole.setRoleId(deviceRole.getId().toString());
                        memberRoleList.add(memberRole);
                    }
                    memberRoleMapper.insertBatchSomeColumn(memberRoleList);
                }
            }

            //如果有授权门禁数据，进行用户授权数据下发任务创建
            dealMemberRoleEmpower(member,doorIds,param.getValidStartTime(),param.getValidEndTime());
            //添加人员卡片数据
            if(!Objects.isNull(param.getCardList())&&param.getCardList().size()>Constants.ZERO){
                if(CollectionUtils.isNotEmpty(param.getCardList())){
                    List<MemberCard> memberCardList = new ArrayList<>();
                    for (String id:param.getCardList()) {
                        MemberCard memberCard = new MemberCard();
                        memberCard.setCreateDate(new Date());
                        memberCard.setMemberId(member.getId());
                        memberCard.setIsdeleted(Constants.ZERO);
                        memberCard.setCode(id);
                        memberCardList.add(memberCard);
                    }
                    memberCardMapper.insertBatchSomeColumn(memberCardList);
                }
            }
        }catch (Exception e){
            e.printStackTrace();
            dealMemberCard(member,param);
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/userUpdate",null,Constants.ZERO);
        }
    }

    /**
     * 添加人员卡片数据
     * @param member
     * @param param
     */
    private void dealMemberCard(Member member, UserUpdateRequest param) {
        if(!Objects.isNull(param.getCardList())&&param.getCardList().size()>Constants.ZERO){
            if(CollectionUtils.isNotEmpty(param.getCardList())){
                List<MemberCard> memberCardList = new ArrayList<>();
                for (String id:param.getCardList()) {
                    MemberCard memberCard = new MemberCard();
                    memberCard.setCreateDate(new Date());
                    memberCard.setMemberId(member.getId());
                    memberCard.setIsdeleted(Constants.ZERO);
                    memberCard.setCode(id);
                    memberCardList.add(memberCard);
                }
                memberCardMapper.insertBatchSomeColumn(memberCardList);
            }
        }
    }

    /**
     * //如果有授权门禁数据，进行用户授权数据下发任务创建
     * @param member
     */
    private void dealMemberRoleEmpower(Member member, List<Integer> doorIds,Date startTime,Date endTime ) {
        //删除所有老的授权信息
        empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                .eq(Empower::getMemberId,member.getId())
                .set(Empower::getIsdeleted,Constants.ONE)
                .set(Empower::getSendStatus,Constants.ZERO));
//        empowerMapper.delete(new UpdateWrapper<Empower>().lambda()
//                .eq(Empower::getMemberId,member.getId())
//                );
        if(doorIds==null || doorIds.size() == 0){
          return;
        }
        List<Empower> list = new ArrayList<>();
        List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,doorIds));
        if(deviceList == null || deviceList.size() == 0){
            return;
        }
        for (Device deviceRole:deviceList) {
            Empower model = new Empower();
            model.setCreateDate(new Date());
            model.setMemberId(member.getId());
            model.setIsdeleted(Constants.ZERO);
            model.setDeviceId(deviceRole.getId());
            model.setSendStatus(Constants.ZERO);
            model.setStartTime(startTime);
            model.setEndTime(endTime);
            model.setSendType(Constants.ZERO);
            list.add(model);
        }
        //导入新增的授权信息
        empowerMapper.insertBatchSomeColumn(list);
    }

    private   List<Integer>  getRoleIdByParam(Integer[] param, Member member) {
        //添加人员角色关联数据
        memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
        if(!Objects.isNull(param)&&param.length>Constants.ZERO){
            //查询数据库存在的权限
            List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
                    .eq(DeviceRole::getType,Constants.TWO)
                    .in(DeviceRole::getId,param));
            if(CollectionUtils.isNotEmpty(deviceRoleList)){
                List<MemberRole> memberRoleList = new ArrayList<>();
                String ids = "";
                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().toString());
                    memberRoleList.add(memberRole);
                }
                memberRoleMapper.insertBatchSomeColumn(memberRoleList);
                member.setRoleId(ids);

                return  r;
            }
        }
        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);
        //如果有授权门禁数据，进行用户授权数据下发任务创建
        dealMemberRoleEmpower(member,doorIds,param.getValidStartTime(),param.getValidEndTime());

    }
    @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);
                parkBookList.add(parkBook);
            }
            parkBookMapper.insertBatchSomeColumn(parkBookList);
        }

    }


@@ -695,8 +1019,7 @@
        try{
            if(Objects.isNull(param)
                    ||Objects.isNull(param.getId())
                    ||Objects.isNull(param.getStatus())
            ){
                    ||Objects.isNull(param.getStatus())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
            if(!(param.getStatus()==Constants.ZERO||param.getStatus()==Constants.ONE)){
@@ -711,11 +1034,12 @@
                visitsList.forEach(i->{
                    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);
                    visitsMapper.updateById(i);
                });
            }
        }catch (Exception e){
            e.printStackTrace();
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/approveApply",null,Constants.ZERO);
        }