最新版本

jiangping

2024-10-08 d644d2a87c4a5c72f984cd650c48e9b800ba9e73

最新版本

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsStatusInfoRequest.java

@@ -15,7 +15,7 @@
    private String motionStatus;//'leave',运动状态  enter#进入,leave#离开
    private String plateNo;//'A12345',车牌号
    private String vehicleDoorStatus;//'open',车门状态  open-开门，close-关门
    private String stockStatus;//'rear',车头车尾状态   front#车头,rear#车尾
    private String stockStatus;//'rear',车头车尾状态 front#车头,rear#车尾
    @JSONField(name="BackgroundImage")
    @JsonProperty(value = "BackgroundImage")
    private EventImageInfoRequest backgroundImage;//月台背景大图

 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/hksync/HkSyncPushServiceImpl.java

@@ -868,6 +868,9 @@
                //各车道车辆状态
                EventPlatformCarsStatusInfoRequest status = data.getHPVehicleStatus();
                eventList.add(initPlatformEventModel(request,data,status));//封装事件（已月台通道为维度）
                if(StringUtils.isBlank(status.getPlateNo())){
                    continue;//如果车辆信息为空，不处理直接跳过
                }
                PlatformDevice model = platformDeviceMapper.selectOne(new QueryWrapper<PlatformDevice>().lambda()
                        .eq(PlatformDevice::getDeviceId,request.getSrcIndex())
                        .eq(PlatformDevice::getIsdeleted,Constants.ZERO)
@@ -875,9 +878,8 @@
                if(model ==null){
                    continue;//监控点未同步，跳过处理
                }
                if(StringUtils.isBlank(status.getPlateNo())){
                    continue;//如果车辆信息为空，不处理直接跳过
                }
                //截掉第一个颜色汉字
                status.setPlateNo(status.getPlateNo().substring(1,status.getPlateNo().length()));
                PlatformJob job = platformJobMapper.selectJoinOne(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>()
                        .selectAll(PlatformJob.class)
                        .selectAs(Platform::getName,PlatformJob::getPlatformName)