存储灯杆的回执信息

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.zksy.pole.MQTTServer.config.MQTTServerProperties;
 import com.zksy.pole.MQTTServer.server.MQTTServer;
 import com.zksy.pole.factory.HandleCmdFactory;
+import com.zksy.pole.mapper.DgGatewayRegistrationMapper;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
@@ -12,6 +13,7 @@ import io.netty.handler.codec.mqtt.*;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.crypto.Mac;
@@ -77,6 +79,8 @@ public class BootNettyMqttMsgBack {
 	 * @param channel
 	 * @param mqttMessage
 	 */
+	@Autowired
+	private HandleCmdFactory handleCmdFactory;
 	public  void puback (Channel channel, MqttMessage mqttMessage) throws InterruptedException {
 		MqttPublishMessage mqttPublishMessage = (MqttPublishMessage) mqttMessage;
 		MqttFixedHeader mqttFixedHeaderInfo = mqttPublishMessage.fixedHeader();
@@ -86,7 +90,7 @@ public class BootNettyMqttMsgBack {
         mqttPublishMessage.payload().readBytes(headBytes);
         String data = new String(headBytes);
         System.out.println("收到数据-->"+data);
-		HandleCmdFactory.HandleCmd(data);
+		handleCmdFactory.HandleCmd(data);
 		//重置读取的指针
 		mqttPublishMessage.payload().resetReaderIndex();
 		//（qos= 0最多一次的传输，1至少一次的传输，2: 只有一次的传输）

pole-service/src/main/java/com/zksy/pole/PoleApplication.java

@@ -3,6 +3,7 @@ package com.zksy.pole;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 
 /**
  * @author Administrator
@@ -12,7 +13,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @date 2024/8/28 09:54:31
  */
 @MapperScan("com.zksy.pole.mapper")
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"com.zksy.pole"})
 public class PoleApplication {
     public static void main(String[] args) {
         SpringApplication.run(PoleApplication.class,args);

pole-service/src/main/java/com/zksy/pole/config/MyBatisConfig.java

@@ -0,0 +1,9 @@
+package com.zksy.pole.config;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@MapperScan("com.zksy.pole.mapper")
+public class MyBatisConfig {
+}

pole-service/src/main/java/com/zksy/pole/factory/HandleCmdFactory.java

@@ -7,11 +7,15 @@ import cn.hutool.json.JSONUtil;
 import com.zksy.common.exception.CommonException;
 import com.zksy.pole.domain.po.*;
 import com.zksy.pole.factory.impl.*;
+import com.zksy.pole.mapper.DgGatewayRegistrationMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
-import java.util.Map;
-
+@Component
 public class HandleCmdFactory {
-    public static String HandleCmd(String data) {
+    @Autowired
+    private HandleDgGatewayRegistrationCmd handleDgGatewayRegistrationCmd;
+    public String HandleCmd(String data) {
         JSONObject jsonObject = JSONUtil.parseObj(data);
         if(jsonObject.getInt("cmd") == 6031){
             var c = new HandleDgEquipmentAlarmCmd();
@@ -22,8 +26,7 @@ public class HandleCmdFactory {
             String s = c.HandleCmdMethod(jsonObject.toBean(DgEquipmentStatus.class));
             return s;
         }else if(jsonObject.getInt("cmd") == 1111){
-            var c = new HandleDgGatewayRegistrationCmd();
-            String s = c.HandleCmdMethod(jsonObject.toBean(DgGatewayRegistration.class));
+            var s = handleDgGatewayRegistrationCmd.HandleCmdMethod(jsonObject.toBean(DgGatewayRegistration.class));
             return s;
         }else if(jsonObject.getInt("cmd") == 6022){
             var c = new HandleDgGatewayStrategyCmd();

pole-service/src/main/java/com/zksy/pole/factory/impl/HandleDgGatewayRegistrationCmd.java

@@ -16,11 +16,8 @@ public class HandleDgGatewayRegistrationCmd implements IHandleCmd {
     public <T> String HandleCmdMethod(T data) {
         DgGatewayRegistration d = (DgGatewayRegistration) data;
         d.setId(UUID.fastUUID().toString(true));
-        System.out.println("11111111111111111111111111111111111111111111111111"+d);
-        DgGatewayRegistration registration = new DgGatewayRegistration();
-        BeanUtil.copyProperties(d,registration);
 
-        dgGatewayRegistrationMapper.insert(registration);
+        dgGatewayRegistrationMapper.insert(d);
         return "";
     }
 }

pole-service/src/main/java/com/zksy/pole/mapper/DgGatewayRegistrationMapper.java

@@ -3,6 +3,7 @@ package com.zksy.pole.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zksy.pole.domain.po.DgGatewayRegistration;
+import org.mapstruct.Mapper;
 
 /**
 * @author hxb
@@ -10,6 +11,7 @@ import com.zksy.pole.domain.po.DgGatewayRegistration;
 * @createDate 2024-08-28 17:24:07
 * @Entity pole.domain.po.DgGatewayRegistration
 */
+@Mapper
 public interface DgGatewayRegistrationMapper extends BaseMapper<DgGatewayRegistration> {
 
 }