From eb204e59b0d362a44b04783f76d397380fe77ed9 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 23 十一月 2023 14:23:35 +0800
Subject: [PATCH] re

---
 ard-work/src/main/java/com/ruoyi/utils/qymqtt/MqttCustomerClient.java         |    4 ++--
 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java |    2 +-
 ard-work/src/main/java/com/ruoyi/utils/qymqtt/AutoMqtt.java                   |    2 +-
 3 files changed, 4 insertions(+), 4 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 7bfbea3..26b9f4d 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
@@ -331,7 +331,7 @@
         ArdSyCarLock ardSyCarLock = lockMapper.selectById(lockTypeParam.getLockId());
         Integer relay = ardSyCarLock.getRelayInfo();
         if(relay.equals("1")){
-            AjaxResult.error(0,"璇ラ攣澶勪簬瑙e皝鐘舵��,杩滅▼鏃犳硶鎿嶆帶,璇峰厛鎵ц鏂藉皝鎿嶄綔!");
+            return AjaxResult.error(0,"璇ラ攣澶勪簬瑙e皝鐘舵��,杩滅▼鏃犳硶鎿嶆帶,璇峰厛鎵ц鏂藉皝鎿嶄綔!");
         }
         String key = "";
         String currents = ardSyCarLock.getCurrents();
diff --git a/ard-work/src/main/java/com/ruoyi/utils/qymqtt/AutoMqtt.java b/ard-work/src/main/java/com/ruoyi/utils/qymqtt/AutoMqtt.java
index 864148a..72cde30 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/qymqtt/AutoMqtt.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/qymqtt/AutoMqtt.java
@@ -17,7 +17,7 @@
     @Autowired
     private ArdSyCarRtuService ardSyCarRtuService;
 
-    @PostConstruct
+//    @PostConstruct
     public void init() {
 //        ArdSyCarRtuService carRtuService = SpringUtils.getBean(ArdSyCarRtuService.class);
 //        //鑾峰彇鐢电閿佸湴鍧�
diff --git a/ard-work/src/main/java/com/ruoyi/utils/qymqtt/MqttCustomerClient.java b/ard-work/src/main/java/com/ruoyi/utils/qymqtt/MqttCustomerClient.java
index 6a6940d..4028ca6 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/qymqtt/MqttCustomerClient.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/qymqtt/MqttCustomerClient.java
@@ -55,8 +55,8 @@
             options.setCleanSession(true);
             options.setUserName("admin");
             options.setPassword("xzx12345".toCharArray());
-            options.setConnectionTimeout(100);
-            options.setKeepAliveInterval(60);
+            //options.setConnectionTimeout(100);
+            //options.setKeepAliveInterval(60);
             options.setAutomaticReconnect(true);
             MqttCustomerClient.setClient(client);
             MqttCustomerClient.setOptions(options);

--
Gitblit v1.9.3