MQTT通讯联调

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java

@@ -51,9 +51,6 @@ public class CsDevModelAddParm  {
     @ApiModelProperty(value = "装置模板文件路径")
     private String filePath;
 
-    @ApiModelProperty(value = "系统软件表Id")
-    private String softInfoId;
-
     @ApiModelProperty(value = "模板类型(0:治理类型 1:电能质量类型)")
     private Integer type;
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java

@@ -113,4 +113,10 @@ public class CsEquipmentDeliveryAddParm{
     @ApiModelProperty(value="装置接入方式")
     private String devAccessMethod;
 
+    /**
+     * 软件信息表id
+     */
+    @ApiModelProperty(value="软件信息")
+    private String softinfoId;
+
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java

@@ -117,4 +117,10 @@ public class CsEquipmentDeliveryAuditParm {
     @TableField(value = "run_status")
     private Integer runStatus;
 
+    /**
+     * 软件信息表id
+     */
+    @ApiModelProperty(value="软件信息")
+    private String softinfoId;
+
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java

@@ -68,16 +68,12 @@ public class CsDevModelPO extends BaseEntity {
     @TableField(value = "file_path")
     private String filePath;
 
-
     /**
      * 状态(0：删除 1：正常)
      */
     @TableField(value = "status")
     private String status;
 
-    @TableField(value = "soft_info_id")
-    private String softInfoId;
-
     @TableField(value = "type")
     @ApiModelProperty("模板类型(0:治理类型 1:电能质量类型)")
     private Integer type;

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java

@@ -126,5 +126,11 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
     @TableField(value = "run_status")
     private Integer runStatus;
 
+    /**
+     * 设备软件信息id
+     */
+    @TableField(value = "softinfo_id")
+    private String softinfoId;
+
 
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * 
  * Description:
@@ -48,19 +46,19 @@ public class CsLinePO  extends BaseEntity {
      * 电压等级
      */
     @TableField(value = "vol_grade")
-    private String volGrade;
+    private Double volGrade;
 
     /**
      * PT变比
      */
     @TableField(value = "pt_ratio")
-    private BigDecimal ptRatio;
+    private Double ptRatio;
 
     /**
      * CT变比
      */
     @TableField(value = "ct_ratio")
-    private BigDecimal ctRatio;
+    private Double ctRatio;
 
     /**
      * 状态(0：删除 1：正常)
@@ -68,5 +66,11 @@ public class CsLinePO  extends BaseEntity {
     @TableField(value = "`status`")
     private Integer status;
 
+    /**
+     * 接线方式(0-星型 1-角型 2-V型)
+     */
+    @TableField(value = "conType")
+    private Integer conType;
+
 
 }