aijinhui
2023-11-22 f065e0997f11eb3507ea7f97d8879103c47f6785
清淤越界处理
已修改4个文件
18 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/utils/qymqtt/AutoMqtt.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/utils/qymqtt/PushCallback.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
@@ -443,6 +443,7 @@
        }else if("施封".equals(type)){
            fengType = 0;
        }
        if(ardSyCarLocks.size()>0){
        //1解封
        if(fengType==1){
            //如果不是解封封状态,则发送施封命令
@@ -512,5 +513,5 @@
            }
        }
    }
    }
}
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
@@ -340,13 +340,13 @@
        }else if(currents.equals("C02")){
            key = "D04";
        }
        Number lockState = (Number) lockTypeParam.getNum();
        if(lockState.equals(100)){
        double lockState = lockTypeParam.getNum();
        if(lockState==100){
            lockState = 99.99;
        }else if(lockState.equals(0)){
        }else if(lockState==0){
            lockState = 0.01;
        }else{
            lockState = lockState.doubleValue() + 0.01;
            lockState = lockState + 0.01;
        }
        Map<String,Object> map = new HashMap();
        map.put(key, lockState);//范围是0.01到99.99
@@ -354,7 +354,7 @@
        String mapString = JSON.toJSONString(map);
        System.out.println(mapString);
        MqttCustomerClient mqttCustomerClient = new MqttCustomerClient();
        mqttCustomerClient.connect(lockTypeParam.getCarId()+"change");
        mqttCustomerClient.connect(lockTypeParam.getCarId()+"change"+UUID.randomUUID());
        mqttCustomerClient.pushlish(ardSyCarRtu.getTopicPublish(),mapString);
        return AjaxResult.success("开关锁命令发送成功,发送进度为"+lockTypeParam.getNum());
//        QueryWrapper<SysConfig> queryWrapper1 = new QueryWrapper<>();
ard-work/src/main/java/com/ruoyi/utils/qymqtt/AutoMqtt.java
@@ -8,6 +8,7 @@
import javax.annotation.PostConstruct;
import java.util.List;
import java.util.UUID;
@Slf4j
@Component
@@ -28,7 +29,7 @@
            String subscribe = rtu.getTopicSubscribe();
            try {
                MqttCustomerClient mqttCustomerClient = new MqttCustomerClient();
                mqttCustomerClient.connect(carId+"mqtt");
                mqttCustomerClient.connect(carId+"mqtt"+ UUID.randomUUID());
                mqttCustomerClient.subscribe(subscribe);
            }catch (Exception e) {
                e.printStackTrace();
ard-work/src/main/java/com/ruoyi/utils/qymqtt/PushCallback.java
@@ -46,7 +46,7 @@
    @Override
    public void messageArrived(String topic, MqttMessage message) throws Exception {
        try {
//            System.out.println("【车辆锁主题】:"+topic+"【车辆锁信息】:"+new String(message.getPayload(), StandardCharsets.UTF_8));
            System.out.println("【车辆锁主题】:"+topic+"【车辆锁信息】:"+new String(message.getPayload(), StandardCharsets.UTF_8));
            //出来回调数据
            List<ArdSyCarLock> ardSyCarLocks = carLockService.data(new String(message.getPayload(), StandardCharsets.UTF_8));
            //根据topic查询RTUID