modify(master):

1.修改mqtt调用相关代码

ruoyi-admin/src/main/java/com/ruoyi/web/controller/mqtt/MqttController.java

@@ -1,7 +1,7 @@
 package com.ruoyi.web.controller.mqtt;
 
 import com.ruoyi.common.model.MqttMessage;
-import com.ruoyi.common.utils.mqtt.MqttService;
+import com.ruoyi.mqtt.service.MqttService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttException;
@@ -54,7 +54,7 @@ public class MqttController {
      *
      * @return 重连结果
      */
-    @PostMapping("/reconnect")
+    @RequestMapping("/reconnect")
     public ResponseEntity<Map<String, Object>> reconnect() {
         Map<String, Object> result = new HashMap<>();
 

ruoyi-common/src/main/java/com/ruoyi/common/utils/mqtt/MqttCallbackHandler.java → ruoyi-common/src/main/java/com/ruoyi/common/config/MqttCallbackHandler.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.mqtt;
+package com.ruoyi.common.config;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

ruoyi-common/src/main/java/com/ruoyi/common/config/MqttConfig.java

@@ -1,6 +1,5 @@
 package com.ruoyi.common.config;
 
-import com.ruoyi.common.utils.mqtt.MqttCallbackHandler;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttAsyncClient;

ruoyi-system/src/main/java/com/ruoyi/manage/service/impl/ChannelNumberServiceImpl.java

@@ -3,12 +3,12 @@ package com.ruoyi.manage.service.impl;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.mqtt.MqttService;
 import com.ruoyi.manage.domain.ChannelNumber;
 import com.ruoyi.manage.domain.ParameterSet;
 import com.ruoyi.manage.mapper.ChannelNumberMapper;
 import com.ruoyi.manage.mapper.ParameterSetMapper;
 import com.ruoyi.manage.service.IChannelNumberService;
+import com.ruoyi.mqtt.service.MqttService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ruoyi-system/src/main/java/com/ruoyi/manage/service/impl/ParameterSetServiceImpl.java

@@ -3,10 +3,10 @@ package com.ruoyi.manage.service.impl;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.mqtt.MqttService;
 import com.ruoyi.manage.domain.ParameterSet;
 import com.ruoyi.manage.mapper.ParameterSetMapper;
 import com.ruoyi.manage.service.IParameterSetService;
+import com.ruoyi.mqtt.service.MqttService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ruoyi-common/src/main/java/com/ruoyi/common/utils/mqtt/MqttMessageListener.java → ruoyi-system/src/main/java/com/ruoyi/mqtt/service/MqttMessageListener.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.mqtt;
+package com.ruoyi.mqtt.service;
 
 import com.ruoyi.common.model.MqttMessage;
 import lombok.extern.slf4j.Slf4j;

ruoyi-common/src/main/java/com/ruoyi/common/utils/mqtt/MqttService.java → ruoyi-system/src/main/java/com/ruoyi/mqtt/service/MqttService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.mqtt;
+package com.ruoyi.mqtt.service;
 
 
 import com.ruoyi.common.config.MqttProperties;