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

xiaogang

2023-03-20 6e13e0fa577df5511157a7841617106bd2f5c0b2

 service-community/src/main/java/com/java110/community/smo/impl/VisitV1InnerServiceSMOImpl.java

@@ -15,7 +15,6 @@
 */
package com.java110.community.smo.impl;


import com.java110.community.dao.IVisitV1ServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.factory.GenerateCodeFactory;
@@ -26,18 +25,18 @@
import com.java110.dto.file.FileRelDto;
import com.java110.dto.machine.CarBlackWhiteDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.dto.visit.VisitDto;
import com.java110.dto.visitSetting.VisitSettingDto;
import com.java110.intf.common.IAccessControlWhiteV1InnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.common.IMachineInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.community.IVisitSettingV1InnerServiceSMO;
import com.java110.intf.community.IVisitV1InnerServiceSMO;
import com.java110.intf.community.*;
import com.java110.intf.user.ICarBlackWhiteV1InnerServiceSMO;
import com.java110.po.accessControlWhite.AccessControlWhitePo;
import com.java110.po.car.CarBlackWhitePo;
import com.java110.po.owner.VisitPo;
import com.java110.po.parking.ParkingSpacePo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
@@ -62,9 +61,11 @@
    @Autowired
    private IVisitV1ServiceDao visitV1ServiceDaoImpl;


    @Autowired
    private IVisitSettingV1InnerServiceSMO visitSettingV1InnerServiceSMOImpl;

    @Autowired
    private IVisitInnerServiceSMO visitInnerServiceSMOImpl;

    @Autowired
    private ICarBlackWhiteV1InnerServiceSMO carBlackWhiteV1InnerServiceSMOImpl;
@@ -82,8 +83,10 @@
    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;

    @Autowired
    private IPhotoSMO photoSMOImpl;
    private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;

    @Autowired
    private IPhotoSMO photoSMOImpl;

    @Override
    public int saveVisit(@RequestBody VisitPo visitPo) {
@@ -94,50 +97,44 @@
    @Override
    public int updateVisit(@RequestBody VisitPo visitPo) {
        int saveFlag = visitV1ServiceDaoImpl.updateVisitInfo(BeanConvertUtil.beanCovertMap(visitPo));
        if(saveFlag < 1 || !VisitDto.STATE_C.equals(visitPo.getState())){
        if (saveFlag < 1 || !VisitDto.STATE_C.equals(visitPo.getState())) {
            //物业需要审核返回
            return saveFlag;
        }

        //物业无需审核走下方
        VisitDto visitDto = new VisitDto();
        visitDto.setvId(visitPo.getvId());
        visitDto.setPage(1);
        visitDto.setRow(1);
        List<VisitDto> visitDtos = queryVisits(visitDto);

        if(visitDtos == null || visitDtos.size() < 1){
        if (visitDtos == null || visitDtos.size() < 1) {
            return saveFlag;
        }
        visitDto = visitDtos.get(0);

        String faceWay = "Y";
        String carNumWay = "N";

        // 查询访客设置
        VisitSettingDto visitSettingDto = new VisitSettingDto();
        visitSettingDto.setCommunityId(visitDto.getCommunityId());
        List<VisitSettingDto> visitSettingDtos = visitSettingV1InnerServiceSMOImpl.queryVisitSettings(visitSettingDto);

        if (visitSettingDtos != null && visitSettingDtos.size() > 0) {
            faceWay = visitSettingDtos.get(0).getFaceWay();
            carNumWay = visitSettingDtos.get(0).getCarNumWay();
            // 同步车牌 这里需要停车场，所以没有配置访客设置，不同步
            synchronizedVisitCarNum(visitDto, carNumWay, visitSettingDtos.get(0));
            faceWay = visitSettingDtos.get(0).getFaceWay(); //人脸同步
            carNumWay = visitSettingDtos.get(0).getCarNumWay(); //车辆同步
            if (!StringUtil.isEmpty(visitDto.getCarNum()) && visitDto.getCarState().equals(VisitDto.CAR_STATE_C)) { //carState表示车辆审核状态 0表示未审核；1表示审核通过；2表示审核拒绝；3表示审核中
                // 同步车牌 这里需要停车场，所以没有配置访客设置，不同步
                synchronizedVisitCarNum(visitDto, carNumWay, visitSettingDtos.get(0));
            }
        }

        FileRelDto fileRelDto = new FileRelDto();
        fileRelDto.setObjId(visitDtos.get(0).getvId());
        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);

        if(fileRelDtos == null || fileRelDtos.size() < 1){
        if (fileRelDtos == null || fileRelDtos.size() < 1) {
            return saveFlag;
        }

        // 同步访客人脸
        synchronousVisitFace(visitDto, faceWay, fileRelDtos.get(0).getFileSaveName());

        return saveFlag;
    }


    private void synchronousVisitFace(VisitDto visitDto, String faceWay, String photo) {
        if (VisitSettingDto.FACE_WAY_NO.equals(faceWay) || StringUtil.isEmpty(photo)) {
@@ -148,7 +145,6 @@
        roomDto.setOwnerId(visitDto.getOwnerId());
        //这种情况说明 业主已经删掉了 需要查询状态为 1 的数据
        List<RoomDto> rooms = roomInnerServiceSMOImpl.queryRoomsByOwner(roomDto);

        //拿到小区ID
        String communityId = visitDto.getCommunityId();
        //根据小区ID查询现有设备
@@ -162,13 +158,11 @@
            locationObjIds.add(tRoomDto.getRoomId());
            locationObjIds.add(tRoomDto.getFloorId());
        }

        machineDto.setLocationObjIds(locationObjIds.toArray(new String[locationObjIds.size()]));
        List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
        if (machineDtos == null || machineDtos.size() < 1) {
            return;
        }

        // 同步到 门禁白名单中
        for (MachineDto tmpMachineDto : machineDtos) {
            if (!"9999".equals(tmpMachineDto.getMachineTypeCd())) {
@@ -204,9 +198,7 @@
                    throw new CmdException("保存数据失败");
                }
            }

            photoSMOImpl.savePhoto(photo, accessControlWhitePo.getAcwId(), accessControlWhitePo.getCommunityId());

        }
    }

@@ -222,21 +214,57 @@
        if (VisitSettingDto.CAR_NUM_WAY_NO.equals(carNumWay)) {
            return;
        }

        CarBlackWhitePo carBlackWhitePo = new CarBlackWhitePo();
        carBlackWhitePo.setCarNum(visitDto.getCarNum());
        carBlackWhitePo.setBlackWhite(CarBlackWhiteDto.BLACK_WHITE_WHITE);
        carBlackWhitePo.setCommunityId(visitDto.getCommunityId());
        carBlackWhitePo.setPaId(visitSettingDto.getPaId());
        carBlackWhitePo.setBwId(GenerateCodeFactory.getGeneratorId("11"));
        carBlackWhitePo.setStartTime(visitDto.getVisitTime());
        carBlackWhitePo.setEndTime(visitDto.getDepartureTime());
        int flag = carBlackWhiteV1InnerServiceSMOImpl.saveCarBlackWhite(carBlackWhitePo);
        if (flag < 1) {
            throw new CmdException("预约车辆添加白名单失败");
        CarBlackWhiteDto carBlackWhiteDto = new CarBlackWhiteDto();
        carBlackWhiteDto.setCarNum(visitDto.getCarNum());
        //根据车牌号查询白名单车辆信息
        List<CarBlackWhiteDto> carBlackWhiteDtos = carBlackWhiteV1InnerServiceSMOImpl.queryCarBlackWhites(carBlackWhiteDto);
        if (carBlackWhiteDtos != null && carBlackWhiteDtos.size() > 0) { //如果车牌号已在白名单中，就更新白名单车辆信息(并释放车位信息)
            VisitDto visitDto1 = new VisitDto();
            visitDto1.setCarNum(visitDto.getCarNum());
            List<VisitDto> visitDtos = visitInnerServiceSMOImpl.queryVisits(visitDto1);
            if(visitDtos != null && visitDtos.size() > 0) {
                for (VisitDto visit : visitDtos) {
                    if (!StringUtil.isEmpty(visit.getPsId())) {
                        ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
                        parkingSpaceDto.setPsId(visit.getPsId());
                        parkingSpaceDto.setState("H"); //车位状态 出售 S，出租 H ，空闲 F
                        List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
                        if (parkingSpaceDtos == null || parkingSpaceDtos.size() != 1) {
                            continue;
                        }
                        ParkingSpacePo parkingSpacePo = new ParkingSpacePo();
                        parkingSpacePo.setPsId(visit.getPsId());
                        parkingSpacePo.setState("F"); //车位状态 出售 S，出租 H ，空闲 F
                        parkingSpaceInnerServiceSMOImpl.updateParkingSpace(parkingSpacePo);
                    } else {
                        continue;
                    }
                }
            }
            CarBlackWhitePo carBlackWhitePo = new CarBlackWhitePo();
            carBlackWhitePo.setStartTime(visitDto.getVisitTime());
            carBlackWhitePo.setEndTime(visitDto.getFreeTime());
            carBlackWhitePo.setPaId(visitSettingDto.getPaId());
            carBlackWhitePo.setCommunityId(visitDto.getCommunityId());
            carBlackWhitePo.setBwId(carBlackWhiteDtos.get(0).getBwId());
            int flag = carBlackWhiteV1InnerServiceSMOImpl.updateCarBlackWhite(carBlackWhitePo);
            if (flag < 1) {
                throw new CmdException("更新预约车辆白名单失败");
            }
        } else { //白名单中不存在该车牌号，就新增白名单信息
            CarBlackWhitePo carBlackWhitePo = new CarBlackWhitePo();
            carBlackWhitePo.setCarNum(visitDto.getCarNum());
            carBlackWhitePo.setBlackWhite(CarBlackWhiteDto.BLACK_WHITE_WHITE);
            carBlackWhitePo.setCommunityId(visitDto.getCommunityId());
            carBlackWhitePo.setPaId(visitSettingDto.getPaId());
            carBlackWhitePo.setBwId(GenerateCodeFactory.getGeneratorId("11"));
            carBlackWhitePo.setStartTime(visitDto.getVisitTime());
            carBlackWhitePo.setEndTime(visitDto.getFreeTime());
            int flag = carBlackWhiteV1InnerServiceSMOImpl.saveCarBlackWhite(carBlackWhitePo);
            if (flag < 1) {
                throw new CmdException("预约车辆添加白名单失败");
            }
        }


    }

    @Override
@@ -248,24 +276,17 @@

    @Override
    public List<VisitDto> queryVisits(@RequestBody VisitDto visitDto) {

        //校验是否传了 分页信息

        int page = visitDto.getPage();

        if (page != PageDto.DEFAULT_PAGE) {
            visitDto.setPage((page - 1) * visitDto.getRow());
        }

        List<VisitDto> visits = BeanConvertUtil.covertBeanList(visitV1ServiceDaoImpl.getVisitInfo(BeanConvertUtil.beanCovertMap(visitDto)), VisitDto.class);

        return visits;
    }


    @Override
    public int queryVisitsCount(@RequestBody VisitDto visitDto) {
        return visitV1ServiceDaoImpl.queryVisitsCount(BeanConvertUtil.beanCovertMap(visitDto));
    }

}