From 9764b5879c808da31101eb4e05608233ea59ec53 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 16 十二月 2023 14:30:24 +0800
Subject: [PATCH] RTU

---
 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
index 451b9c0..c27a0a6 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
@@ -32,7 +32,7 @@
 /**
  * @author Administrator
  */
-@Slf4j
+@Slf4j(topic = "mqttCar")
 @Service
 public class ArdSyCarLockServiceImpl implements ArdSyCarLockService {
 
@@ -177,6 +177,8 @@
         rtuVo.setRtu(ardSyCar.getReserved1());
         rtuVo.setTopicPublish(ardSyCarRtu.getTopicPublish());
         rtuVo.setTopicSubscribe(ardSyCarRtu.getTopicSubscribe());
+        rtuVo.setInstallType(ardSyCarRtu.getInstallType());
+        rtuVo.setUnloadType(ardSyCarRtu.getUnloadType());
         return rtuVo;
     }
 
@@ -271,6 +273,11 @@
             int lockCloseNum = 0;
             //鏌ヨ閿佷俊鎭�
             List<ArdSyCarLock> ardSyCarLocks = carLock(ardSyCarRtu.getId());
+            String mapString1 = "{\"A01\":100000,\"A02\":100000,\"res\":\""+String.valueOf(System.currentTimeMillis())+"\"}";
+            System.out.println("鏂藉皝锛�"+mapString1);
+            EmqClient emqClient1 = new EmqClient(rtuTypeParam.getCarId()+"mqttPublish"+UUID.randomUUID());
+            emqClient1.connect();
+            emqClient1.publish(ardSyCarRtu.getTopicPublish(),mapString1, QosEnum.QoS2,false);
             for (int j = 0; j < ardSyCarLocks.size(); j++) {
                 ArdSyCarLock ardSyCarLock = ardSyCarLocks.get(j);
                 String currents = ardSyCarLock.getCurrents();
@@ -295,6 +302,8 @@
                     emqClient.connect();
                     emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
 //                        mqttOnce.publishCar("carId",ardSyCarRtu.getTopicPublish(),String.valueOf(new com.alibaba.fastjson2.JSONObject(map)),"寮�閿侊細"+currents);
+//                    long startTime = System.currentTimeMillis();  // 鑾峰彇寰幆寮�濮嬫椂闂�
+//                    long endTime = startTime + 30000;  // 璁剧疆寰幆缁撴潫鏃堕棿涓哄紑濮嬫椂闂村姞涓�5绉掗挓
                     while(true){
                         ArdSyCarLock ardSyCarLock1 = getCurrentInfo(ardSyCarRtu.getId(),currents);
                         Double currentInfo1 = ardSyCarLock1.getCurrentInfo();
@@ -311,11 +320,6 @@
 //                map.put("A02", 100000);//鏂紑绗簩璺户鐢靛櫒
 //                map.put("res", String.valueOf(System.currentTimeMillis()));
 //                String mapString = JSON.toJSONString(map);
-                String mapString = "{\"A01\":100000,\"A02\":100000,\"res\":\""+String.valueOf(System.currentTimeMillis())+"\"}";
-                System.out.println("鏂藉皝锛�"+mapString);
-                EmqClient emqClient = new EmqClient(rtuTypeParam.getCarId()+"mqttPublish"+UUID.randomUUID());
-                emqClient.connect();
-                emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
                 return AjaxResult.success("鏂藉皝鍛戒护鍙戠敓鎴愬姛锛�");
 //                    return AjaxResult.success(mqttOnce.publishCar(rtuTypeParam.getCarId(),ardSyCarRtu.getTopicPublish(),String.valueOf(new com.alibaba.fastjson2.JSONObject(map)),"鏂藉皝"));
             }

--
Gitblit v1.9.3