前端调试，字段调整

lishuai

2023-12-20 26a5fcd889f8650d28e56a87de3f9c3b48c5bbfb

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

@@ -270,32 +270,47 @@
        if(list !=null && list.size()>0) {
            List<Member> addList = new ArrayList<>();
            List<Member> updateList = new ArrayList<>();
            List<Integer> delIds = 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,delIds,allList);
            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());
                    memberMapper.updateById(c);
                }
            }
            if(delIds.size()>0){
                //删除所有需要删除的组织信息(逻辑删除）
            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));
            }

        }else{
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "同步ERP数据为空！");
        }
        return  null;
    }

    private void dealUserChangeList(List<UserListRespone> list, List<Member> addList, List<Member> updateList, List<Integer> delIds, List<Member> allList) {
    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<UserListRespone> list, List<Member> addList, List<Member> updateList,List<Member> delList, List<Member> allList) {
        Date date = new Date();
        for(UserListRespone response : list){
            //根据 erpId 查询用户信息，判断是新增还是更新
@@ -311,7 +326,10 @@
                //如果是更新
                if(Constants.formatIntegerNum(response.getIsdeleted()) == Constants.ONE){
                    //如果已删除，加入删除集合中
                    delIds.add(member.getId());
                    member.setRoleIds(response.getRoleIds());
                    delList.add(member);
//                    delIds.add(member.getId());

                    continue;
                }
                updateList.add(addUpdateMemberModel(response,member,date));
@@ -320,7 +338,8 @@
        if(allList!=null && allList.size()>0){
            for(Member  c : allList){
                if(isUserDeleted(c,list)){
                    delIds.add(c.getId());
                    delList.add(c);
//                    delIds.add(c.getId());
                }
            }
        }
@@ -341,6 +360,7 @@
        member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
        member.setCompanyId(param.getOrgId());
        member.setHkStatus(Constants.ZERO);
        member.setRoleIds(param.getRoleIds());
        return  member;
    }

@@ -353,12 +373,14 @@
        member.setEditDate(new Date());
        member.setErpDate(new Date());
        member.setHkStatus(Constants.ZERO);
        member.setRoleIds(param.getRoleIds());
        return  member;
    }

    private boolean isUserDeleted(Member c, List<UserListRespone> list) {
        for(UserListRespone m : list){
            if(StringUtils.equals(c.getErpId(),m.getId().toString())){
                c.setRoleIds(m.getRoleIds());
                return  true;
            }
        }
@@ -740,9 +762,10 @@
            }
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getId()).last("limit 1"));
            List<Integer> doorIds = null;
            if(Objects.isNull(member)){
              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);
@@ -758,20 +781,24 @@
                memberMapper.insert(member);
                //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.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()));
                //TODO 海康数据更新
            }
            //如果有授权门禁数据，进行用户授权数据下发任务创建
            dealMemberRoleEmpower(member,doorIds,param);
            dealMemberRoleEmpower(member,doorIds,param.getValidStartTime(),param.getValidEndTime());
            //添加人员卡片数据
            dealMemberCard(member,param);
        }catch (Exception e){
@@ -807,18 +834,21 @@
     * //如果有授权门禁数据，进行用户授权数据下发任务创建
     * @param member
     */
    private void dealMemberRoleEmpower(Member member, List<Integer> doorids,UserUpdateRequest param) {
    private void dealMemberRoleEmpower(Member member, List<Integer> doorIds,Date startTime,Date endTime ) {
        //删除所有老的授权信息
        empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
//        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())
                .set(Empower::getIsdeleted,Constants.ONE)
                .set(Empower::getSendStatus,Constants.ZERO)
                );
        if(doorids==null || doorids.size() == 0){
        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));
        List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,doorIds));
        if(deviceList == null || deviceList.size() == 0){
            return;
        }
@@ -829,8 +859,8 @@
            model.setIsdeleted(Constants.ZERO);
            model.setDeviceId(deviceRole.getId());
            model.setSendStatus(Constants.ZERO);
            model.setStartTime(param.getValidStartTime());
            model.setEndTime(param.getValidEndTime());
            model.setStartTime(startTime);
            model.setEndTime(endTime);
            model.setSendType(Constants.ZERO);
            list.add(model);
        }
@@ -886,19 +916,65 @@

    @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.getPartIdList()));
        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);
        }

    }


    @Override
    public void approveApply(ApproveNoticeRequest param){
        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)){