Merge remote-tracking branch 'origin/master'

aijinhui

2024-01-14 8a4810082529e48259ec332e034c05f1eea2399b

 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
@@ -374,22 +375,43 @@
//        MqttCustomerClient mqttCustomerClient = new MqttCustomerClient();
//        mqttCustomerClient.connect(lockTypeParam.getCarId()+"change"+UUID.randomUUID());
//        mqttCustomerClient.pushlish(ardSyCarRtu.getTopicPublish(),mapString);
        try {
            while(true){
                TimeUnit.SECONDS.sleep(5);
                break;
            }
        } catch (InterruptedException e) {
            e.printStackTrace();
        }
        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;

    }