修复灯杆服务

pole-service/src/main/java/com/zksy/pole/MQTTServer/callBack/BootNettyMqttMsgBack.java

@@ -9,7 +9,6 @@ import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
 import io.netty.handler.codec.mqtt.*;
 import lombok.RequiredArgsConstructor;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

pole-service/src/main/java/com/zksy/pole/MQTTServer/channel/MqttChannelInit.java

@@ -6,7 +6,8 @@ package com.zksy.pole.MQTTServer.channel;
  * @date 2024/03/13 15:51
  */
 
-import com.zksy.supernetty.MQTTServer.handler.MQTTMessageHandler;
+
+import com.zksy.pole.MQTTServer.handler.MQTTMessageHandler;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.mqtt.MqttDecoder;
@@ -22,7 +23,7 @@ import java.util.concurrent.TimeUnit;
 @RequiredArgsConstructor
 public class MqttChannelInit extends ChannelInitializer<SocketChannel> {
     @Autowired
-    private  MQTTMessageHandler MQTTmessageHandler;
+    private MQTTMessageHandler mqttMessageHandler;
 
     @Override
     protected void initChannel(SocketChannel channel) {
@@ -31,7 +32,7 @@ public class MqttChannelInit extends ChannelInitializer<SocketChannel> {
                 .addLast("idle", new IdleStateHandler(600, 600, 1200, TimeUnit.SECONDS))
                 .addLast("encoder", MqttEncoder.INSTANCE)
                 .addLast("decoder", new MqttDecoder())
-                .addLast(MQTTmessageHandler);
+                .addLast(mqttMessageHandler);
     }
 
 }

pole-service/src/main/java/com/zksy/pole/MQTTServer/handler/MQTTMessageHandler.java

@@ -7,8 +7,8 @@ package com.zksy.pole.MQTTServer.handler;
 
 import com.zksy.pole.MQTTServer.server.MQTTServer;
 import io.netty.channel.*;
+import io.netty.handler.codec.mqtt.*;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -16,6 +16,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.zksy.pole.MQTTServer.channel.MQTTDeviceManerger.MQTTdeviceRemove;
+
 
 /**
  * 消息处理,单例启动

pole-service/src/main/java/com/zksy/pole/MQTTServer/request/MqttRequest.java

@@ -1,6 +1,8 @@
 package com.zksy.pole.MQTTServer.request;
 
 
+import io.netty.handler.codec.mqtt.MqttQoS;
+
 /**
  * @author: shaoyang
  * @date: 2024-03-13 15:58

pole-service/src/main/java/com/zksy/pole/MQTTServer/server/MQTTServer.java

@@ -11,9 +11,9 @@ import io.netty.channel.group.ChannelGroup;
 import io.netty.channel.group.DefaultChannelGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.codec.mqtt.MqttMessage;
 import io.netty.util.concurrent.GlobalEventExecutor;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

pole-service/src/main/java/com/zksy/pole/startServer/startSrver.java

@@ -1,6 +1,7 @@
 package com.zksy.pole.startServer;
 
-import com.zksy.supernetty.MQTTServer.server.MQTTServer;
+
+import com.zksy.pole.MQTTServer.server.MQTTServer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -17,7 +18,7 @@ import java.util.concurrent.TimeUnit;
 public class startSrver {
 
     @Autowired
-    private MQTTServer MQTTServer;
+    private MQTTServer mqttServer;
 
     @PostConstruct
     public void startNetty(){
@@ -31,7 +32,7 @@ public class startSrver {
             @Override
             public void run() {
                 try {
-                    MQTTServer.start();
+                    mqttServer.start();
                 } catch (Exception e) {
                     e.printStackTrace();
                 }