电磁锁分页bug修改提交

zhangnaisong

2024-07-06 06842b9c367083c3bf77b8b54a1e1a32b68a2e5e

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

@@ -28,6 +28,7 @@
import org.springframework.stereotype.Service;

import java.util.*;
import java.util.concurrent.TimeUnit;

/**
 * @author Administrator
@@ -194,13 +195,21 @@

    @Override
    public List<CarVo> queryCar(List<String> list) {
        QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
//        QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
//        if(list.size()>0){
//            queryWrapper.ne("reserved_1","").notIn("car_id",list);
//        }else {
//            queryWrapper.ne("reserved_1","");
//        }
//        List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
        List<ArdSyCar> ardSyCars = new ArrayList<>();
        if(list.size()>0){
            queryWrapper.ne("reserved_1","").notIn("car_id",list);
            QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
            queryWrapper.notIn("car_id",list);
            ardSyCars = ardSyCarMapper.selectList(queryWrapper);
        }else {
            queryWrapper.ne("reserved_1","");
            ardSyCars = ardSyCarMapper.selectList(null);
        }
        List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
        return carAnalysis(ardSyCars);
    }

@@ -366,22 +375,62 @@
//        MqttCustomerClient mqttCustomerClient = new MqttCustomerClient();
//        mqttCustomerClient.connect(lockTypeParam.getCarId()+"change"+UUID.randomUUID());
//        mqttCustomerClient.pushlish(ardSyCarRtu.getTopicPublish(),mapString);
        return AjaxResult.success("开关锁命令发送成功,发送进度为"+lockTypeParam.getNum());
        int min = lockTypeParam.getNum() -5;  int max = lockTypeParam.getNum() +5;
        while(true){
            ArdSyCarLock ardSyCarLockLoop = lockMapper.selectById(lockTypeParam.getLockId());
            Double currentInfo =  ardSyCarLockLoop.getCurrentInfo();
            int d = (int) ((int)(currentInfo*150/138.3 - 4)/0.16);
            if(d >= min && d <= max){
                break;
            }
//                TimeUnit.SECONDS.sleep(5);
        }
        return AjaxResult.success("开关锁成功,进度为"+lockTypeParam.getNum());
    }

    @Override
    public List<ArdSyCarLock> lockIng(String carId) {
    public AjaxResult lockIng(String carId) {
        QueryWrapper<ArdSyCarRtu> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("car_id",carId);
        ArdSyCarRtu ardSyCarRtu = rtuMapper.selectOne(queryWrapper);
        List<ArdSyCarLock> locks = lockMapper.lockList(ardSyCarRtu.getId());
        for (int i = 0; i < locks.size(); i++) {
            ArdSyCarLock ardSyCarLock = locks.get(i);
            double info = ardSyCarLock.getCurrentInfo();
            int d = (int) ((int)(info*150/138.3 - 4)/0.16);
            ardSyCarLock.setCurrentInfo((double) d);
        if(ardSyCarRtu!=null){
            List<ArdSyCarLock> locks = lockMapper.lockList(ardSyCarRtu.getId());
            if(locks.size()>0){
                for (int i = 0; i < locks.size(); i++) {
                    ArdSyCarLock ardSyCarLock = locks.get(i);
                    if(ardSyCarLock.getCurrentInfo()!=null){
                        double info = ardSyCarLock.getCurrentInfo();
                        int d = (int) ((int)(info*150/138.3 - 4)/0.16);
                        ardSyCarLock.setCurrentInfo((double) d);
                    }else {
                        ardSyCarLock.setCurrentInfo(0.0);
                    }
                }
                return AjaxResult.success(locks);
            }else {
                return AjaxResult.error("无该车的锁数据！");
            }
        }else{
            return AjaxResult.error("该车无RTU！");
        }
        return locks;

    }

    @Override
    public Boolean isLock(String carId) {
        QueryWrapper<ArdSyCarRtu> queryWrapperRtu = new QueryWrapper<>();
        queryWrapperRtu.eq("car_id",carId);
        ArdSyCarRtu ardSyCarRtu = rtuMapper.selectOne(queryWrapperRtu);
        if(ardSyCarRtu!=null){
            List<ArdSyCarLock> ardSyCarLocks = lockMapper.lockList(ardSyCarRtu.getId());
            if(ardSyCarLocks.size()>0){
                return true;
            }else {
                return false;
            }
        }else {
            return false;
        }
    }