MQTT通讯功能联调

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/CsModelDto.java

@@ -0,0 +1,21 @@
+package com.njcn.access.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/8/7 18:44
+ */
+@Data
+public class CsModelDto {
+
+    private String devType;
+
+    private String modelId;
+
+    private Integer did;
+
+}

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/DevCfgDto.java

@@ -20,7 +20,7 @@ public class DevCfgDto implements Serializable {
     @SerializedName("Did")
     @ParamName("Did")
     @NotNull(message = "设备Id,不为空")
-    private String did;
+    private Integer did;
 
     @SerializedName("DevName")
     @ParamName("DevName")

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/ReqAndResDto.java

@@ -28,7 +28,7 @@ public class ReqAndResDto implements Serializable {
     @SerializedName("Did")
     @ApiModelProperty("设备唯一标识lDid,填入0代表nDid")
     @NotBlank(message = "设备唯一标识lDid不能为空")
-    private String did;
+    private Integer did;
 
     @SerializedName("Pri")
     @ApiModelProperty("报文处理的优先级")
@@ -38,7 +38,7 @@ public class ReqAndResDto implements Serializable {
     @SerializedName("Type")
     @ApiModelProperty("消息类型")
     @NotNull(message = "消息类型不能为空")
-    private String type;
+    private Integer type;
 
     @SerializedName("Msg")
     @ApiModelProperty("报文内容")

iot-access/access-api/src/main/java/com/njcn/access/pojo/param/ReqAndResParam.java

@@ -37,7 +37,7 @@ public class ReqAndResParam implements Serializable {
     @SerializedName("Type")
     @ApiModelProperty("消息类型")
     @NotNull(message = "消息类型不能为空")
-    private String type;
+    private Integer type;
 
     @SerializedName("Msg")
     @ApiModelProperty("报文内容")

iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsLineModel.java

@@ -42,21 +42,4 @@ public class CsLineModel {
      * 安装位置
      */
     private String position;
-
-    /**
-     * 电压等级
-     */
-    private String volGrade;
-
-    /**
-     * PT变比
-     */
-    private String ptRatio;
-
-    /**
-     * CT变比
-     */
-    private String ctRatio;
-
-
 }

iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsTopic.java

@@ -1,10 +1,9 @@
 package com.njcn.access.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 
 /**
  * <p>
@@ -14,32 +13,35 @@ import lombok.Setter;
  * @author xuyang
  * @since 2023-07-13
  */
-@Getter
-@Setter
+@Data
 @TableName("cs_topic")
-public class CsTopic extends BaseEntity {
+public class CsTopic {
 
     private static final long serialVersionUID = 1L;
 
     /**
      * id
      */
+    @TableId(value = "id")
     private String id;
 
     /**
      * 设备识别码
      */
-    private String ndid;
+    @TableField(value = "ndid")
+    private String nDid;
 
     /**
      * 主题名称
      */
+    @TableField(value = "topic")
     private String topic;
 
     /**
-     * 主题类型
+     * 协议版本
      */
-    private Integer type;
+    @TableField(value = "version")
+    private String version;
 
 
 }