Merge remote-tracking branch 'origin/master'

jiangping

2023-12-21 b06d978a031ba9bb033b705842b9052235cc8ef1

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

@@ -421,7 +421,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);
@@ -429,8 +429,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 new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),e.getMessage());
        }finally {
            Map<String,String> param = new HashMap<>();
            param.put("accessKey",accessKey);
@@ -438,8 +439,6 @@
            saveInterfaceLog(param,"/visitBiz/accesstoken",JSONObject.toJSONString(result),Constants.ZERO);
        }


        return result;
    }

    /**
@@ -541,12 +540,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());
@@ -584,11 +590,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);
@@ -600,14 +606,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());
@@ -638,7 +644,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);
@@ -662,8 +669,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());