Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-10-08 a815619eb84db0d484065757261d7fb3ff96343a

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java

@@ -994,7 +994,7 @@
        if (!bookings.getCreator().equals(businessOverDTO.getUserId())) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "非你的预约记录,无法进行取消");
        }
        if (System.currentTimeMillis() > bookings.getStartTime().getTime()) {
        if (Objects.nonNull(bookings.getStartTimeReal()) && System.currentTimeMillis() > bookings.getStartTimeReal().getTime()) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "会议已开始,无法进行取消");
        }
        if(bookings.getStatus().equals(MeetConstants.ONE)){

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java

@@ -149,7 +149,7 @@
            RoomTime s = list.get(i);
            s.setIsUse(false);
            s.setIsChoose(false);
            String now = format.format(roomTime.getYudingDate())+" "+s.getStartTime()+":00";
            String now = format.format(roomTime.getYudingDate())+" "+s.getEndTime()+":00";
            try {
                Date com=format1.parse(now);
                if(flag){

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java

@@ -415,7 +415,7 @@
    @TableField(exist = false)
    private String queryType;

    @ApiModelProperty(value = "电子锁状态：0=未上锁 1=不分上锁 2=全部上锁")
    @ApiModelProperty(value = "电子锁状态：0=未上锁 1=部分上锁 2=全部上锁")
    @TableField(exist = false)
    private Integer  lockStatus;


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

@@ -74,11 +74,11 @@
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "对不起，组织类型不正确，请按要求填写~");
        }
        //查询名称不能重复
        if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
      /*  if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
                .eq(Company::getName,company.getName())
                .eq(Company::getIsdeleted,Constants.ZERO)) >0){
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "对不起，组织名称不能重复~");
        }
        }*/
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(user ==null){
            user = company.getLoginUserInfo();
@@ -275,12 +275,12 @@
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "对不起，组织类型不正确，请按要求填写~");
        }
        //查询名称不能重复
        if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
 /*       if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
                .eq(Company::getName,company.getName())
                .ne(Company::getId,company.getId())
                .eq(Company::getIsdeleted,Constants.ZERO)) >0){
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "对不起，组织名称不能重复~");
        }
        }*/
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(user == null){
            user = company.getLoginUserInfo();

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

@@ -361,12 +361,30 @@
            List<PlatformWmsDetail> platformWmsDetailList = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>().lambda()
                    .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
                    .eq(PlatformWmsDetail::getJobId,platformJob.getId()));

            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformWmsDetailList)){
                platformJob.setTotalNum(
                        platformWmsDetailList.stream().map(m->m.getIoQty()).reduce(BigDecimal.ZERO,BigDecimal::add)
                );
                platformWmsJob.setPlatformWmsDetailList(platformWmsDetailList);
                platformJob.setPlatformWmsJob(platformWmsJob);

                if(Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.zyczh)
                        || Constants.equalsInteger(platformJob.getType(),Constants.platformJobType.wxczh)){

                    Integer unLockCount = platformWmsDetailList.stream().filter(i->Constants.equalsInteger(i.getLockStatus(),Constants.ZERO)).collect(Collectors.toList()).size();
                    if(Constants.equalsInteger(unLockCount,Constants.ZERO)){
                        platformJob.setLockStatus(Constants.TWO);  //全部上锁
                    }else if(Constants.equalsInteger(unLockCount,platformWmsDetailList.size())){
                        platformJob.setLockStatus(Constants.ZERO);  //未上锁
                    }else{
                        platformJob.setLockStatus(Constants.ONE);   //部分上锁
                    }

                }



            }
        } 
    }
@@ -408,7 +426,7 @@
                    platformJob.setWaitTime(waitTime);
                }
            }else{
                platformJob.setWaitTime("等待叫号");
                platformJob.setWaitTime("预计等待：-小时-分钟");
            }
        }else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())
        || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){
@@ -430,7 +448,6 @@
                    .ne(PlatformLog::getParam3,Constants.ZERO+"")
                    .orderByDesc(PlatformLog::getCreateDate));
            platformJob.setWorkTime(platformLogList.stream().map(m->Long.valueOf(m.getParam3())).reduce(Long.valueOf(0),Long::sum));


        }
    }
@@ -463,7 +480,6 @@
            //查询前方排队数量
            this.queryWaitNum(platformJob);
        }


        driverHomeVO.setPlatformJobList(platformJobList);


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

@@ -107,6 +107,7 @@
    public List<PlatformReason> findList(PlatformReason platformReason) {
        QueryWrapper<PlatformReason> wrapper = new QueryWrapper<>(platformReason);
        wrapper.eq("isdeleted",Constants.ZERO);
        wrapper.eq("STATUS",Constants.ZERO);
        wrapper.orderByAsc("SORTNUM");
        return platformReasonMapper.selectList(wrapper);
    }

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

@@ -158,6 +158,7 @@
        IPage<PlatformWaterGas> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<PlatformWaterGas> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.lambda().eq(PlatformWaterGas::getIsdeleted, Constants.ZERO);
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(PlatformWaterGas::getId, pageWrap.getModel().getId());
        }

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

@@ -81,7 +81,7 @@
                        //查询下发状态
                        BaseResponse<TaskPersonDetailListResponse> response = HKService.taskPersoDetail(param);
                        if(response!=null
                                && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)
                                && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
                                && response.getData()!=null
                                && response.getData().getList() != null
                                && response.getData().getList().size() > 0

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

@@ -22,6 +22,7 @@

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Autowired
    private InterfaceLogService interfaceLogService;


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

@@ -57,7 +57,7 @@
        ctgtParam.setUserCode(param.getUsername());
        ctgtParam.setLoginType("2");
        BaseResponse<ApplyCTGTResponse> response = HKService.applyCTGT(ctgtParam);
        if(response !=null && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE) &&response.getData()!=null &&StringUtils.isNotBlank(response.getData().getCTGT())){
        if(response !=null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) &&response.getData()!=null &&StringUtils.isNotBlank(response.getData().getCTGT())){
            //处理新增成功的数据，修改海康同步状态
            String ctgt = response.getData().getCTGT();
            ApplySTequest stParam = new ApplySTequest();

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

@@ -161,7 +161,7 @@
        param.setParkSyscode(c.getParkHkId());
        BaseResponse response = HKService.carChargeDeletion(param);
        if(response!=null
                && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)){
                && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
            return true;
        }else{
            return  false;

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

@@ -865,17 +865,16 @@
                if( data.getHPVehicleStatus() ==null  ){
                    continue;//如何推送状态集合为空，不处理跳过
                }
                //各车道车辆状态
                EventPlatformCarsStatusInfoRequest status = data.getHPVehicleStatus();
                eventList.add(initPlatformEventModel(request,data,status));//封装事件（已月台通道为维度）
                PlatformDevice model = platformDeviceMapper.selectOne(new QueryWrapper<PlatformDevice>().lambda()
                        .eq(PlatformDevice::getDeviceId,request.getSrcIndex())
                        .eq(PlatformDevice::getIsdeleted,Constants.ZERO)
                        .last("limit 1"));
                if(model ==null){
                    continue;//监控点未同步，跳过处理

                }
                    //各车道车辆状态
                EventPlatformCarsStatusInfoRequest status = data.getHPVehicleStatus();
                eventList.add(initPlatformEventModel(request,data,status));//封装事件（已月台通道为维度）
                if(StringUtils.isBlank(status.getPlateNo())){
                    continue;//如果车辆信息为空，不处理直接跳过
                }