钉钉通知 与钥匙柜开发

rk

3 天以前 568e38a95cb6fb20fe16b53d17f610aefc6f744f

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java

@@ -239,7 +239,7 @@
        //检查是否必须答题，并且符合答题要求
        ProblemLog problemLog = isValidProblemLog(visits,source);
        //获取申请的海康访问门禁组信息
        getHkDeviceRoles(visits,isERP);
//        getHkDeviceRoles(visits,isERP);
        //检验拜访人是否合法
        Member visitMember = isValideVisitedUser(visits.getReceptMemberId());
        if(StringUtils.isNotBlank(visits.getIdcardNo()) && Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())
@@ -258,24 +258,6 @@
        //初始化访客信息
        initVisitInfo(visits,date);

//        if(StringUtils.isNotBlank(visits.getFaceImg())&&(Constants.equalsInteger(visits.getType(),Constants.ZERO)|| Constants.equalsInteger(visits.getType(),Constants.TWO))){
//            //人脸评分
//            FacePictureCheckRequest param = new FacePictureCheckRequest();
//            String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode() +
//                    systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
//            param.setFacePicUrl(prefixUrl + visits.getFaceImg());
//            BaseResponse<FacePictureCheckResponse> response = HKService.facePictureCheck(param);
//            if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
//                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，人脸评分获取数据失败~");
//            }
//            FacePictureCheckResponse facePictureCheckResponse = response.getData();
//            if(Objects.isNull(facePictureCheckResponse) || Objects.isNull(facePictureCheckResponse.getCheckResult())){
//                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，人脸评分获取数据失败~");
//            }
//            if(!facePictureCheckResponse.getCheckResult()){
//                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), facePictureCheckResponse.getStatusMessage());
//            }
//        }
        visits.setSendTimeOutNotice(Constants.ZERO);
        visitsMapper.insert(visits);

@@ -689,7 +671,7 @@
        if(Constants.equalsInteger(visits.getType(),Constants.ZERO)
             ||  Constants.equalsInteger(visits.getType(),Constants.ONE)){
            if(  visits.getIdcardType() == null
                    ||  StringUtils.isBlank( visits.getIdcardNo() ) || StringUtils.isBlank(visits.getFaceImg()) ){
                    || StringUtils.isBlank(visits.getFaceImg()) ){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，信息填写不正确！");
            }
        }
@@ -896,38 +878,41 @@
        List<Member> addList = new ArrayList<>();
        List<Member> editList = new ArrayList<>();
        //申请人信息
        Member m = getMemberListParam(visits.getIdcardNo(),visits,addList,editList);
        Member m = getMemberListParam(visits.getPhone(),visits.getIdcardNo(),visits,addList,editList);
        //随访人员信息处理
        if(visits.getWithUserList()!= null && visits.getWithUserList().size()>0){
            for(Visits model:visits.getWithUserList()){
                model.setBirthday(Constants.getBirthdyByCardNo(model.getIdcardNo()));
                model.setStarttime(visits.getStarttime());
                model.setEndtime(visits.getEndtime());
                //校验随访人员填报数据合法性
                isValidWithVisitParam(model,addList,editList);
                model.setCreateDate(visits.getCreateDate());
                Member visitsMember = getMemberListParam(model.getIdcardNo(),model,addList,editList);
                model.setMemberId(visitsMember.getId());
            }
        }
//        if(visits.getWithUserList()!= null && visits.getWithUserList().size()>0){
//            for(Visits model:visits.getWithUserList()){
//                model.setBirthday(Constants.getBirthdyByCardNo(model.getIdcardNo()));
//                model.setStarttime(visits.getStarttime());
//                model.setEndtime(visits.getEndtime());
//                //校验随访人员填报数据合法性
//                isValidWithVisitParam(model,addList,editList);
//                model.setCreateDate(visits.getCreateDate());
//                Member visitsMember = getMemberListParam(model.getIdcardNo(),model,addList,editList);
//                model.setMemberId(visitsMember.getId());
//            }
//        }
        return  m;
    }

    private Member getMemberListParam(String cardno, Visits visits, List<Member> addList, List<Member> editList) {
    private Member getMemberListParam(String phone,String cardno, Visits visits, List<Member> addList, List<Member> editList) {
        if(StringUtils.isNotBlank(visits.getCarNos())
                &&Objects.isNull(Constants.getVehiclePlateNo(visits.getCarNos()))
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，车牌号【"+visits.getCarNos()+"】不合法，请核实后重试~");
        }
        if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&cardno.length()!=18
            //&&!IdcardUtil.isValidCard(cardno)
        ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，身份证【"+cardno+"】号码有误，请核实后重试！");
        }

//        if(StringUtils.isNotBlank(cardno)&&Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&cardno.length()!=18
//            //&&!IdcardUtil.isValidCard(cardno)
//        ){
//            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，身份证【"+cardno+"】号码有误，请核实后重试！");
//        }
        Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
                .eq(Member::getType,Constants.memberType.visitor)
                .eq(Member::getIdcardType,visits.getIdcardType())
                .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, cardno)).last("limit 1" )
                .eq(Member::getPhone,phone)
//                .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, cardno))
                .last("limit 1" )
        );
        if(member == null){
            member = new Member();
@@ -935,12 +920,14 @@
            member.setCreateDate(visits.getCreateDate());
            member.setIsdeleted(Constants.ZERO);
            member.setIdcardNo(visits.getIdcardNo());
            member.setBirthday(Constants.getBirthdyByCardNo(cardno));
            member.setIdcardDecode(visits.getIdcardDecode());
            member.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, cardno));//身份证号加密
            member.setIdcardDecode(Constants.getTuominStr(cardno));//脱敏手机号
            if(StringUtils.isNotBlank(cardno)){
                member.setBirthday(Constants.getBirthdyByCardNo(cardno));
                member.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, cardno));//身份证号加密
                member.setIdcardDecode(Constants.getTuominStr(cardno));//脱敏手机号
                member.setSex(Constants.getSexByCardNo(cardno));
            }
            member.setFaceImg(visits.getFaceImg());
            member.setSex(Constants.getSexByCardNo(cardno));
            member.setImgurl(StringUtils.isNotBlank(visits.getImgurl())?visits.getImgurl():null);
            member.setIdcardType(visits.getIdcardType());
            member.setName(visits.getName());
@@ -948,7 +935,6 @@
            member.setOpenid(visits.getOpenid());
            member.setType(Constants.memberType.visitor);
            member.setStatus(Constants.ZERO);
            member.setSex(Constants.getSexByCardNo(cardno));
            member.setHkStatus(Constants.ZERO);
            member.setErpStatus(Constants.ZERO);
            member.setVisitCompanyName(visits.getCompanyName());
@@ -958,7 +944,7 @@
        }else{
            if(!Constants.equalsInteger(Constants.ZERO,member.getStatus() )){
                //如果用户状态异常，则提示
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，【"+member.getName()+"】身份证号【"+cardno+"】在黑名单内，无法申请进入园区");
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，【"+member.getName()+"】在黑名单内，无法申请进入园区");
            }
            //核查预约用户是否存在未签离的预约记录
//            isExsitNoOutVisisRecord(member);
@@ -966,13 +952,15 @@
            member.setImgurl(StringUtils.isNotBlank(visits.getImgurl())?visits.getImgurl():null);
            member.setEditDate(visits.getCreateDate());
            member.setIsdeleted(Constants.ZERO);
            member.setSex(Constants.getSexByCardNo(cardno));
            member.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, cardno));//身份证号加密
            member.setIdcardDecode(Constants.getTuominStr(cardno));//脱敏身份证号
            if(StringUtils.isNotBlank(cardno)){
                member.setBirthday(Constants.getBirthdyByCardNo(cardno));
                member.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, cardno));//身份证号加密
                member.setIdcardDecode(Constants.getTuominStr(cardno));//脱敏手机号
                member.setSex(Constants.getSexByCardNo(cardno));
            }
            member.setName(visits.getName());
            member.setPhone(visits.getPhone());
            member.setOpenid(visits.getOpenid());
            member.setSex(Constants.getSexByCardNo(cardno));
            member.setHkStatus(Constants.ZERO);
            member.setErpStatus(Constants.ZERO);
            member.setVisitCompanyName(visits.getCompanyName());
@@ -986,16 +974,14 @@
                                ,Constants.VisitStatus.xfFail
                                ,Constants.VisitStatus.signout
                                ,Constants.VisitStatus.invalid)
                .eq(Visits::getIdcardDecode, Constants.getTuominStr(cardno))
                .and(ms -> ms.eq(Visits::getPhone, visits.getPhone())
                        .or().eq(Visits::getIdcardDecode, Constants.getTuominStr(cardno)))
                .and(ms -> ms.eq(Visits::getPhone, visits.getPhone()))
                .and(ms -> ms.apply(" visits.STARTTIME <= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.ENDTIME >= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' ")
                        .or().apply(" visits.STARTTIME <= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.ENDTIME >= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' ")
                        .or().apply(" visits.STARTTIME >= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.STARTTIME <= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' ")
                        .or().apply(" visits.ENDTIME >= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.ENDTIME <= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' ")
                )
        ) > Constants.ZERO) {
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，手机号【"+member.getPhone()+"】或身份证【"+ member.getIdcardDecode() +"】存在预约时间冲突，无法申请哦！");
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，手机号【"+member.getPhone()+"】存在预约时间冲突，无法申请哦！");
        }
        return  member;
    }
@@ -1292,6 +1278,7 @@

        queryWrapper.selectAll(Visits.class);
        queryWrapper.select("  ( select count(distinct(v.CAR_NOS)) from visits v where v.PARENT_ID = t.ID and v.CAR_NOS is not null  and v.CAR_NOS != ''  and v.CAR_NOS != t.CAR_NOS ) as carNum  ");
        queryWrapper.select("  ( select count(distinct(v.id)) from retention v where v.member_id = t.member_id and v.type=1 )",Visits::getRetentionNum);
        queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
        queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
        queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
@@ -1594,12 +1581,15 @@


    @Override
    public void  visitsSelfCancel(Integer visitId,Integer memberId){
    public void  visitsSelfCancel(Integer visitId,Integer memberId,String openid){
        Visits visits = visitsMapper.selectById(visitId);
        if(Objects.isNull(visits)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!(Constants.equalsInteger(memberId,visits.getMemberId()))){
/*        if(!(Constants.equalsInteger(memberId,visits.getMemberId()))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无此操作权限");
        }*/
        if(!StringUtils.equals(openid,visits.getOpenid())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无此操作权限");
        }
        this.visitsCancelBiz(visits);
@@ -1613,7 +1603,8 @@
        }
        if(!(
                 CollectionUtils.isNotEmpty(loginUserInfo.getPermissions()) &&
                        loginUserInfo.getPermissions().stream().filter(i->i.equals("business:visits:cancel")).collect(Collectors.toList()).size()>0)){
                        loginUserInfo.getPermissions().stream().filter(i->i.equals("business:visits:cancel"))
                                .collect(Collectors.toList()).size()>0)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无此操作权限");
        }
        this.visitsCancelBiz(visits);
@@ -1630,7 +1621,8 @@
                .eq(Visits::getId,visits.getId());
        //访客报备
        if(Constants.equalsInteger(visits.getType(),Constants.TWO)){
            if(!(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.waitCheck)||Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.submitCheck)
            if(!(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.waitCheck)
                    ||Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.submitCheck)
                    || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.pass))){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"访客记录状态错误，无法进行该操作");
            }
@@ -1753,7 +1745,7 @@
        }
        List<DeviceRole> roleList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
                .eq(DeviceRole::getType, Constants.ONE));
        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();

      HkSyncVisitServiceImpl.getUpdateModelByResponseIccm(visits,new Date(),roleList,path);
@@ -1891,8 +1883,10 @@
//                    List<String> memberIds = daysList.stream().map(i->i.getMemberId().toString()).collect(Collectors.toList());

                    List<String> memberIds  = inoutRecordList.stream().filter(i->
                                    Objects.isNull(i.getCarCode())&&
                                    Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
                                    Objects.isNull(i.getCarCode())
                                            && Constants.equalsInteger(i.getMemberType(),Constants.ONE)
                                            && Constants.equalsInteger(i.getInOrOut(),Constants.ZERO)
                                            && Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
                            )
                            .map(i->i.getMemberPhone())
                            .collect(Collectors.toList());
@@ -1906,7 +1900,10 @@


                visitVO.setName(days);
                weekVisitList.add(visitVO);

                InterestedListVO carVO = new InterestedListVO();
                carVO.setNum(Constants.ZERO);
                carVO.setName(days);

                if(CollectionUtils.isNotEmpty(inoutRecordList)){
@@ -1914,27 +1911,27 @@
//                    List<CarEvent> daysList = carEventList.stream().filter(i->StringUtils.isNotBlank(i.getHappenTime()) && i.getHappenTime().substring(0,10).equals(days)).collect(Collectors.toList());
//                    List<String> carCodeList = daysList.stream().map(i->i.getPlateNos()).collect(Collectors.toList());
                    List<String> carCodeList  = inoutRecordList.stream().filter(i->
                                    Objects.isNull(i.getCarCode())&&
                                            Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
                                    Objects.nonNull(i.getCarCode())
                                            && Constants.equalsInteger(i.getInOrOut(),Constants.ZERO)
                                            &&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
                            )
                            .map(i->i.getMemberPhone())
                            .map(i->i.getCarCode())
                            .collect(Collectors.toList());
                    if(CollectionUtils.isNotEmpty(carCodeList)){
                        carVO.setNum(new HashSet<String>(carCodeList).size());
                    }
                }
                if(Objects.isNull(carVO.getNum())){
                    visitVO.setNum(Constants.ZERO);
                    carVO.setNum(Constants.ZERO);
                }
                weekVisitList.add(visitVO);
                weekCarList.add(carVO);
            }
            pcWorkPlatformDataVO.setWeekVisitList(weekVisitList );
            pcWorkPlatformDataVO.setWeekCarList(weekCarList);

            List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
                    .eq(Company::getType,Constants.ZERO)
                    .eq(Company::getIsdeleted,Constants.ZERO)
                    .orderByAsc(Company::getSortnum)
            );

            if(CollectionUtils.isNotEmpty(companyList)){
@@ -1943,6 +1940,7 @@
                    List<Integer> lwCompanyIds = lwCompanyList.stream().map(i->i.getId()).collect(Collectors.toList());
                    List<Retention> retentionList = retentionMapper.selectList(
                            new QueryWrapper<Retention>().lambda()
                                    .eq(Retention::getIsdeleted,Constants.ZERO)
                                    .eq(Retention::getType,Constants.FOUR)
                                    .in(Retention::getCompanyId,lwCompanyIds)
                    );
@@ -1962,6 +1960,7 @@
                    List<Integer> internalCompanyIds = internalCompanyList.stream().map(i->i.getId()).collect(Collectors.toList());
                    List<Retention> retentionList = retentionMapper.selectList(
                            new QueryWrapper<Retention>().lambda()
                                    .eq(Retention::getIsdeleted,Constants.ZERO)
                                    .eq(Retention::getType,Constants.TWO)
                                    .in(Retention::getCompanyId,internalCompanyIds)
                    );