模板导入功能

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

@@ -24,7 +24,7 @@ public class AlmDto implements Serializable {
     @NotNull(message = "告警事件名称,不为空")
     private String name;
 
-    @SerializedName("IDX")
+    @SerializedName("Idx")
     @NotNull(message = "告警事件编号,不为空")
     private Integer idx;
 

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

@@ -26,7 +26,7 @@ public class BmdDto implements Serializable {
     @NotNull(message = "数据名称,不为空")
     private String name;
 
-    @SerializedName("IDX")
+    @SerializedName("Idx")
     @NotNull(message = "数据编号,不为空")
     private Integer idx;
 

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

@@ -26,7 +26,7 @@ public class CtrlDto implements Serializable {
     @NotNull(message = "控制名称,不为空")
     private String name;
 
-    @SerializedName("IDX")
+    @SerializedName("Idx")
     @NotNull(message = "控制编号,不为空")
     private Integer idx;
 

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

@@ -24,7 +24,7 @@ public class DoDto implements Serializable {
     @NotNull(message = "开出信号名称,不为空")
     private String name;
 
-    @SerializedName("IDX")
+    @SerializedName("Idx")
     @NotNull(message = "DO编号,不为空")
     private Integer idx;
 

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

@@ -26,7 +26,7 @@ public class EpdPqdDto implements Serializable {
     @NotNull(message = "数据名称,不为空")
     private String name;
 
-    @SerializedName("IDX")
+    @SerializedName("Idx")
     @NotNull(message = "数据编号,不为空")
     private Integer idx;
 

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

@@ -25,7 +25,7 @@ public class EvtDto implements Serializable {
     @NotNull(message = "事件信息名称,不为空")
     private String name;
 
-    @SerializedName("IDX")
+    @SerializedName("Idx")
     @NotNull(message = "事件编号,不为空")
     private Integer idx;
 

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

@@ -26,7 +26,7 @@ public class ParmDto implements Serializable {
     @NotNull(message = "参数名称,不为空")
     private String name;
 
-    @SerializedName("IDX")
+    @SerializedName("Idx")
     @NotNull(message = "参数编号,不为空")
     private Integer idx;
 

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

@@ -25,7 +25,7 @@ public class SetDto implements Serializable {
     @NotNull(message = "参数名称,不为空")
     private String name;
 
-    @SerializedName("IDX")
+    @SerializedName("Idx")
     @NotNull(message = "参数编号,不为空")
     private Integer idx;
 

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

@@ -26,7 +26,7 @@ public class StsDto implements Serializable {
     @NotNull(message = "状态名称,不为空")
     private String name;
 
-    @SerializedName("IDX")
+    @SerializedName("Idx")
     @NotNull(message = "状态编号,不为空")
     private Integer idx;
 

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

@@ -26,7 +26,7 @@ public class ApfDto implements Serializable {
     @NotNull(message = "数据名称,不为空")
     private String name;
 
-    @SerializedName("IDX")
+    @SerializedName("Idx")
     @NotNull(message = "数据编号,不为空")
     private Integer idx;
 

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

@@ -43,14 +43,6 @@ public class TemplateDto implements Serializable {
     @ApiModelProperty(value = "逻辑子设备序列")
     private List<ClDevDto> clDevDtoList;
 
-    @SerializedName("SoftInfo")
-    @NotEmpty(message = "软件信息,不可为空")
-    private List<SoftInfoDto> softInfoDto;
-
-    @SerializedName("LdevInfo")
-    @NotEmpty(message = "设备信息,不可为空")
-    private List<LDevInfoDto> lDevInfoDto;
-
     @SerializedName("Apf")
     @NotEmpty(message = "谐波治理设备Apf,不可为空")
     private List<ApfDto> apfDto;