1、优化采购批次相关内容2、优化访客停车白名单下发3、新增权限组排序4、优化设备相关5、优化页面相关展示bug

xiaogang

2023-03-20 6e13e0fa577df5511157a7841617106bd2f5c0b2

 service-job/src/main/java/com/java110/job/task/parkingSpace/ReleaseCarParkingSpaceTemplate.java

@@ -4,24 +4,16 @@
import com.java110.core.log.LoggerFactory;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.machine.CarBlackWhiteDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.ownerCarAttr.OwnerCarAttrDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.dto.task.TaskDto;
import com.java110.dto.visit.VisitDto;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IVisitInnerServiceSMO;
import com.java110.intf.user.ICarBlackWhiteV1InnerServiceSMO;
import com.java110.intf.user.IOwnerCarAttrInnerServiceSMO;
import com.java110.intf.user.IOwnerCarAttrV1InnerServiceSMO;
import com.java110.intf.user.IOwnerCarV1InnerServiceSMO;
import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
import com.java110.job.quartz.TaskSystemQuartz;
import com.java110.po.car.CarBlackWhitePo;
import com.java110.po.car.OwnerCarPo;
import com.java110.po.ownerCarAttr.OwnerCarAttrPo;
import com.java110.po.parking.ParkingSpacePo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,15 +34,6 @@

    @Autowired
    private IVisitInnerServiceSMO visitInnerServiceSMOImpl;

    @Autowired
    private IOwnerCarAttrInnerServiceSMO ownerCarAttrInnerServiceSMOImpl;

    @Autowired
    private IOwnerCarAttrV1InnerServiceSMO ownerCarAttrV1InnerServiceSMOImpl;

    @Autowired
    private IOwnerCarV1InnerServiceSMO ownerCarV1InnerServiceSMOImpl;

    @Autowired
    private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
@@ -85,95 +68,55 @@
        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        visitDto.setCommunityId(communityDto.getCommunityId());
        visitDto.setDepartureEndTime(df.format(new Date()));
        visitDto.setState("1"); //审核通过
        visitDto.setFlag("1");
        visitDto.setCarNumNoEmpty("1"); //车辆不为空
        visitDto.setFlag("1"); //车位不为空
//        visitDto.setState(visitDto.STATE_C); //访客记录审核通过
        List<VisitDto> visitDtos = visitInnerServiceSMOImpl.queryVisits(visitDto);
        if (visitDtos == null || visitDtos.size() < 1) {
            return;
        }
        for (VisitDto visit : visitDtos) {
            if (StringUtil.isEmpty(visit.getPsId()) || visit.getPsId().equals("-1")) {
                continue;
            }
            ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
            parkingSpaceDto.setPsId(visit.getPsId());
            List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
            if (parkingSpaceDtos == null || parkingSpaceDtos.size() == 0) {
            if (parkingSpaceDtos == null || parkingSpaceDtos.size() != 1) {
                continue;
            }
            if (parkingSpaceDtos != null && parkingSpaceDtos.size() > 1) {
                throw new IllegalArgumentException("查询车位错误！");
            }
            if (StringUtil.isEmpty(parkingSpaceDtos.get(0).getState()) || !parkingSpaceDtos.get(0).getState().equals("H")) { //出售 S，出租 H ，空闲 F
                continue;
            }
            OwnerCarDto ownerCarDto = new OwnerCarDto();
            ownerCarDto.setCommunityId(communityDto.getCommunityId());
            ownerCarDto.setCarTypeCd(OwnerCarDto.CAR_TYPE_TEMP); //临时车
            ownerCarDto.setCarNum(visit.getCarNum());
            List<OwnerCarDto> ownerCarDtos = ownerCarV1InnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
            if (ownerCarDtos == null || ownerCarDtos.size() != 1) {
                continue;
            }
            OwnerCarAttrDto ownerCarAttrDto = new OwnerCarAttrDto();
            ownerCarAttrDto.setCarId(ownerCarDtos.get(0).getCarId());
            ownerCarAttrDto.setSpecCd("6443000036"); //是否是预约车
            //查询车辆属性
            List<OwnerCarAttrDto> ownerCarAttrDtos = ownerCarAttrInnerServiceSMOImpl.queryOwnerCarAttrs(ownerCarAttrDto);
            if (ownerCarAttrDtos == null || ownerCarAttrDtos.size() != 1) { //只看是否是预约车属性
                continue;
            }
            if (!ownerCarAttrDtos.get(0).getValue().equals("true")) { //不是预约车的不走定时任务
                continue;
            }
            //释放车位并删除过期的车辆
            OwnerCarPo ownerCarPo = new OwnerCarPo();
            ownerCarPo.setCarId(ownerCarDtos.get(0).getCarId());
            ownerCarPo.setCommunityId(communityDto.getCommunityId());
            ownerCarPo.setCarTypeCd(OwnerCarDto.CAR_TYPE_TEMP);
            ownerCarPo.setState(OwnerCarDto.STATE_FINISH); //车位释放状态
            ownerCarPo.setStatusCd("1"); //不可用状态
            //修改车辆状态，改为车辆释放状态并删除
            ownerCarV1InnerServiceSMOImpl.updateOwnerCar(ownerCarPo);
            //修改车辆属性状态
            OwnerCarAttrPo ownerCarAttrPo = new OwnerCarAttrPo();
            ownerCarAttrPo.setCarId(ownerCarDtos.get(0).getCarId());
            ownerCarAttrPo.setStatusCd("1");
            //删除过期车辆属性
            ownerCarAttrV1InnerServiceSMOImpl.updateOwnerCarAttr(ownerCarAttrPo);
            //修改车位状态
            ParkingSpacePo parkingSpacePo = new ParkingSpacePo();
            parkingSpacePo.setPsId(ownerCarDtos.get(0).getPsId());
            parkingSpacePo.setPsId(visit.getPsId());
            parkingSpacePo.setState("F");//车位状态 出售 S，出租 H ，空闲 F
            //车位状态改为空闲状态
            parkingSpaceInnerServiceSMOImpl.updateParkingSpace(parkingSpacePo);
            //删除白名单车辆信息
            if (!StringUtil.isEmpty(visit.getCarNum())) {
                CarBlackWhiteDto carBlackWhiteDto = new CarBlackWhiteDto();
                carBlackWhiteDto.setCarNum(visit.getCarNum());
                carBlackWhiteDto.setCommunityId(visit.getCommunityId());
                carBlackWhiteDto.setBlackWhite("2222"); //1111 黑名单 2222 白名单
                carBlackWhiteDto.setStartTime(visit.getVisitTime());
                carBlackWhiteDto.setEndTime(visit.getFreeTime());
                List<CarBlackWhiteDto> carBlackWhiteDtos = carBlackWhiteV1InnerServiceSMOImpl.queryCarBlackWhites(carBlackWhiteDto);
                if (carBlackWhiteDtos == null || carBlackWhiteDtos.size() != 1) {
                    continue;
                }
                CarBlackWhitePo carBlackWhitePo = new CarBlackWhitePo();
                carBlackWhitePo.setBwId(carBlackWhiteDtos.get(0).getBwId());
                carBlackWhitePo.setStatusCd("1");
                carBlackWhiteV1InnerServiceSMOImpl.deleteCarBlackWhite(carBlackWhitePo);
                //向第三方物联网推送删除白名单信息
                JSONObject postParameters = new JSONObject();
                postParameters.put("extBwId", carBlackWhiteDtos.get(0).getBwId());
                postParameters.put("carNum", carBlackWhiteDtos.get(0).getCarNum());
                postParameters.put("extPaId", carBlackWhiteDtos.get(0).getPaId());
                postParameters.put("extCommunityId", carBlackWhiteDtos.get(0).getCommunityId());
                postParameters.put("startTime", carBlackWhiteDtos.get(0).getStartTime());
                postParameters.put("endTime", carBlackWhiteDtos.get(0).getEndTime());
                postParameters.put("blackWhite", carBlackWhiteDtos.get(0).getBlackWhite());
                hcCarBlackWhiteAsynImpl.deleteCarBlackWhite(postParameters);
            //查看黑白名单表里是否有该车辆信息
            CarBlackWhiteDto carBlackWhiteDto = new CarBlackWhiteDto();
            carBlackWhiteDto.setCarNum(visit.getCarNum());
            carBlackWhiteDto.setCommunityId(visit.getCommunityId());
            carBlackWhiteDto.setBlackWhite("2222"); //1111 黑名单 2222 白名单
            carBlackWhiteDto.setStartTime(visit.getVisitTime());
            carBlackWhiteDto.setEndTime(visit.getFreeTime());
            List<CarBlackWhiteDto> carBlackWhiteDtos = carBlackWhiteV1InnerServiceSMOImpl.queryCarBlackWhites(carBlackWhiteDto);
            if (carBlackWhiteDtos == null || carBlackWhiteDtos.size() != 1) {
                continue;
            }
            CarBlackWhitePo carBlackWhitePo = new CarBlackWhitePo();
            carBlackWhitePo.setBwId(carBlackWhiteDtos.get(0).getBwId());
            carBlackWhitePo.setStatusCd("1");
            //删除白名单车辆信息
            carBlackWhiteV1InnerServiceSMOImpl.deleteCarBlackWhite(carBlackWhitePo);
            //向第三方物联网推送删除白名单信息
            JSONObject postParameters = new JSONObject();
            postParameters.put("extBwId", carBlackWhiteDtos.get(0).getBwId());
            postParameters.put("carNum", carBlackWhiteDtos.get(0).getCarNum());
            postParameters.put("extPaId", carBlackWhiteDtos.get(0).getPaId());
            postParameters.put("extCommunityId", carBlackWhiteDtos.get(0).getCommunityId());
            postParameters.put("startTime", carBlackWhiteDtos.get(0).getStartTime());
            postParameters.put("endTime", carBlackWhiteDtos.get(0).getEndTime());
            postParameters.put("blackWhite", carBlackWhiteDtos.get(0).getBlackWhite());
            hcCarBlackWhiteAsynImpl.deleteCarBlackWhite(postParameters);
        }
    }