1.模板上传功能

2.解析模板字典

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

@@ -1,6 +1,7 @@
 package com.njcn.access.pojo.dto.data;
 
 import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
@@ -32,4 +33,8 @@ public class AlmDto implements Serializable {
     @NotNull(message = "告警事件类别,不为空")
     private String eventType;
 
+    @SerializedName("Phase")
+    @ApiModelProperty("相别")
+    private String phase;
+
 }

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

@@ -44,11 +44,11 @@ public class CtrlDto implements Serializable {
 
     @SerializedName("MaxNum")
     @ApiModelProperty("设置最大值")
-    private Integer maxNum;
+    private Double maxNum;
 
     @SerializedName("MinNum")
     @ApiModelProperty("设置最小值")
-    private Integer minNum;
+    private Double minNum;
 
     @SerializedName("Ctlvalue")
     @ApiModelProperty("参数为enum时可设置的所有值序列")
@@ -61,4 +61,8 @@ public class CtrlDto implements Serializable {
     @SerializedName("Encode")
     @NotNull(message = "是否加密,不为空")
     private Integer storeFlag;
+
+    @SerializedName("Phase")
+    @ApiModelProperty("相别")
+    private String phase;
 }

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

@@ -22,4 +22,6 @@ public class DiDto extends StsDto implements Serializable {
     @NotNull(message = "数据是否上送,不为空")
     private Integer tranFlag;
 
+
+
 }

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

@@ -1,6 +1,7 @@
 package com.njcn.access.pojo.dto.data;
 
 import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
@@ -35,4 +36,8 @@ public class DoDto implements Serializable {
     @SerializedName("CtlSts")
     @NotNull(message = "是否可远程控制,不为空")
     private Integer ctlSts;
+
+    @SerializedName("Phase")
+    @ApiModelProperty("相别")
+    private String phase;
 }

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

@@ -1,6 +1,7 @@
 package com.njcn.access.pojo.dto.data;
 
 import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
@@ -34,7 +35,7 @@ public class EvtDto implements Serializable {
     private String eventType;
 
     @SerializedName("Phase")
-    @NotNull(message = "相别,不为空")
+    @ApiModelProperty("相别")
     private String phase;
 
     @SerializedName("Parm")

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

@@ -45,11 +45,11 @@ public class ParmDto implements Serializable {
 
     @SerializedName("MaxNum")
     @ApiModelProperty("设置最大值")
-    private Integer maxNum;
+    private Double maxNum;
 
     @SerializedName("MinNum")
     @ApiModelProperty("设置最小值")
-    private Integer minNum;
+    private Double minNum;
 
     @SerializedName("SetValue")
     @ApiModelProperty("参数为enum可设置的所有值序列")
@@ -63,4 +63,8 @@ public class ParmDto implements Serializable {
     @NotNull(message = "参数缺省值")
     private String defaultValue;
 
+    @SerializedName("Phase")
+    @ApiModelProperty("相别")
+    private String phase;
+
 }

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

@@ -45,4 +45,12 @@ public class SetDto implements Serializable {
     @NotNull(message = "参数缺省值")
     private String defaultValue;
 
+    @SerializedName("Phase")
+    @ApiModelProperty("相别")
+    private String phase;
+
+    @SerializedName("Unit")
+    @ApiModelProperty("单位")
+    private String unit;
+
 }

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

@@ -42,4 +42,8 @@ public class StsDto implements Serializable {
     @NotNull(message = "上送规则,不为空")
     @ApiModelProperty("变化:change 周期:period")
     private String tranRule;
+
+    @SerializedName("Phase")
+    @ApiModelProperty("相别")
+    private String phase;
 }

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

@@ -87,7 +87,7 @@ public class TemplateDto implements Serializable {
     @ApiModelProperty("定值")
     private List<SetDto> setDto;
 
-    @SerializedName("InSet")
+    @SerializedName("Inset")
     @ApiModelProperty("内部定值")
     private List<InSetDto> inSetDto;