飞机

aijinhui

2023-12-13 98d0a71132915ab20f6d4ade6164a21aa16001ba

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java

@@ -69,8 +69,8 @@
        ArdSyCarRtu ardSyCarRtu = new ArdSyCarRtu();
        ardSyCarRtu.setId(String.valueOf(UUID.randomUUID()));
        ardSyCarRtu.setCarId(addRtuParam.getCarId());
        ardSyCarRtu.setTopicPublish("/p"+addRtuParam.getCarId()+"/");
        ardSyCarRtu.setTopicSubscribe("/p"+addRtuParam.getCarId()+"/set/");
        ardSyCarRtu.setTopicPublish("/p"+addRtuParam.getCarId()+"/set/");
        ardSyCarRtu.setTopicSubscribe("/p"+addRtuParam.getCarId()+"/");
        ardSyCarRtu.setInstallType(addRtuParam.getInstallType());
        ardSyCarRtu.setUnloadType(addRtuParam.getUnloadType());
        int num = rtuMapper.insert(ardSyCarRtu);
@@ -193,7 +193,11 @@
    @Override
    public List<CarVo> queryCar(List<String> list) {
        QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
        queryWrapper.ne("reserved_1","").notIn("car_id",list);
        if(list.size()>0){
            queryWrapper.ne("reserved_1","").notIn("car_id",list);
        }else {
            queryWrapper.ne("reserved_1","");
        }
        List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
        return carAnalysis(ardSyCars);
    }
@@ -320,8 +324,10 @@
        ArdSyCarRtu ardSyCarRtu = rtuMapper.selectOne(queryWrapper);
        ArdSyCarLock ardSyCarLock = lockMapper.selectById(lockTypeParam.getLockId());
        Integer relay = ardSyCarLock.getRelayInfo();
        if(relay.equals("1")){
            return AjaxResult.error(0,"该锁处于解封状态,远程无法操控,请先执行施封操作!");
        if(relay!=null){
            if(relay.equals("1")){
                return AjaxResult.error(0,"该锁处于解封状态,远程无法操控,请先执行施封操作!");
            }
        }
        String key = "";
        String currents = ardSyCarLock.getCurrents();