更新

src/main/java/com/zswl/dataservice/domain/iot/IotMain.java

@@ -28,15 +28,16 @@ import java.util.List;
 public class IotMain extends SuperEntity {
 
     // ------------------------iotMain 基础字段 start-----------------------
+
+    @Schema(description = "功能类型，属性 事件 服务")
+    FunctionType functionType;
+
     @Schema(description = "功能名称")
     private String name;
 
     @Schema(description = "标识符")
     private String identifier;
 
-    @Schema(description = "功能类型，属性 事件 服务")
-    FunctionType functionType;
-
     @Schema(description = "物模型Topic")
     private String iotTopic;
 
@@ -64,10 +65,10 @@ public class IotMain extends SuperEntity {
     private String maxLength;
 
     @Schema(description = "属性，参数列表，输入参数")
-    private List<IotAttribute> attributes;
+    private List<IotAttribute> childs;
 
     @Schema(description = "值的对应，如：0-开")
-    private List<IotDict> values;
+    private List<IotDict> dicts;
 
     //--------------------------------关联设备时特有的属性 start------------------
     @Schema(description = "区分是模版还是设备关联的物模型")

src/main/java/com/zswl/dataservice/model/iot/IotAttribute.java

@@ -21,12 +21,12 @@ public class IotAttribute {
     @Schema(description = "属性类型，如：数字，字符串 ...")
     private DataType dataType;
 
-    @Schema(description = "参数名称，如：name")
-    private String key;
-
     @Schema(description = "参数描述，如：姓名")
     private String name;
 
+    @Schema(description = "参数名称，如：name")
+    private String identifier;
+
     @Schema(description = "单位名称，如：千克、流明、立方米等...")
     private String unitName;
 
@@ -37,7 +37,7 @@ public class IotAttribute {
     private String maxLength;
 
     @Schema(description = "相关值的描述")
-    private List<IotDict> value;
+    private List<IotDict> dicts;
 
     @Schema(description = "子属性")
     private List<IotAttribute> childs;

src/main/java/com/zswl/dataservice/model/iot/IotMainModel.java

@@ -91,10 +91,10 @@ public class IotMainModel extends SuperModel {
     private String maxLength;
 
     @Schema(description = "属性，参数列表，输入参数")
-    private List<IotAttribute> attributes;
+    private List<IotAttribute> childs;
 
     @Schema(description = "值的对应，如：0-开")
-    private List<IotDict> values;
+    private List<IotDict> dicts;
 
     //--------------------------------关联设备时特有的属性 start------------------
 

src/main/java/com/zswl/dataservice/model/iot/IotMainParam.java

@@ -49,10 +49,10 @@ public class IotMainParam extends SuperParam {
     private String maxLength;
 
     @Schema(description = "属性，参数列表，输入参数")
-    private List<IotAttribute> attributes;
+    private List<IotAttribute> childs;
 
     @Schema(description = "值的对应，如：0-开")
-    private List<IotDict> values;
+    private List<IotDict> dicts;
 
     @Schema(description = "业务处理地址")
     private String remoteUrl;