Просмотр исходного кода

fix:物模型数据标识符修改

xiwa 1 год назад
Родитель
Сommit
67c3cbb57e

+ 2 - 2
data/init/thingModel.json

@@ -1120,7 +1120,7 @@
     "model": {
       "properties": [
         {
-          "identifier": "9010",
+          "identifier": "p9010",
           "dataType": {
             "type": "text",
             "specs": {
@@ -1131,7 +1131,7 @@
           "accessMode": "r"
         },
         {
-          "identifier": "9410",
+          "identifier": "p9410",
           "dataType": {
             "type": "text",
             "specs": {

+ 30 - 33
iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/product/ProductVo.java

@@ -15,59 +15,56 @@ import java.io.Serializable;
 @Data
 @ExcelIgnoreUnannotated
 @AutoMapper(target = Product.class)
+public class ProductVo implements Serializable {
 
-public class ProductVo implements Serializable  {
+    private static final long serialVersionUID = -1L;
 
-	private static final long serialVersionUID = -1L;
-
-	@ApiModelProperty(value="产品id")
+    @ApiModelProperty(value = "产品id")
     @ExcelProperty(value = "产品id")
-		private Long id;
+    private Long id;
 
-	@ApiModelProperty(value="产品id")
-	@ExcelProperty(value = "产品id")
-	private String productKey;
+    @ApiModelProperty(value = "产品id")
+    @ExcelProperty(value = "产品id")
+    private String productKey;
 
-	@ApiModelProperty(value="产品密钥")
-	@ExcelProperty(value = "产品密钥")
-	private String productSecret;
+    @ApiModelProperty(value = "产品密钥")
+    @ExcelProperty(value = "产品密钥")
+    private String productSecret;
 
-	@ApiModelProperty(value="品类")
+    @ApiModelProperty(value = "品类")
     @ExcelProperty(value = "品类")
-		private String category;
+    private String category;
 
-	@ApiModelProperty(value="创建时间")
+    @ApiModelProperty(value = "创建时间")
     @ExcelProperty(value = "创建时间")
-		private Long createAt;
+    private Long createAt;
 
-	@ApiModelProperty(value="图片")
+    @ApiModelProperty(value = "图片")
     @ExcelProperty(value = "图片")
-		private String img;
+    private String img;
 
-	@ApiModelProperty(value="产品名称")
+    @ApiModelProperty(value = "产品名称")
     @ExcelProperty(value = "产品名称")
-		private String name;
+    private String name;
 
-	@ApiModelProperty(value="节点类型")
+    @ApiModelProperty(value = "节点类型")
     @ExcelProperty(value = "节点类型")
-		private Integer nodeType;
+    private Integer nodeType;
 
-	@ApiModelProperty(value="是否透传,true/false")
+    @ApiModelProperty(value = "是否透传,true/false")
     @ExcelProperty(value = "是否透传,true/false")
-		private Boolean transparent;
+    private Boolean transparent;
 
-	@ApiModelProperty(value="是否开启设备定位,true/false")
-	@ExcelProperty(value = "是否开启设备定位,true/false")
-	private Boolean isOpenLocate;
+    @ApiModelProperty(value = "是否开启设备定位,true/false")
+    @ExcelProperty(value = "是否开启设备定位,true/false")
+    private Boolean isOpenLocate;
 
-	@ApiModelProperty(value="定位更新方式")
-	@ExcelProperty(value = "定位更新方式")
-	private String locateUpdateType;
+    @ApiModelProperty(value = "定位更新方式")
+    @ExcelProperty(value = "定位更新方式")
+    private String locateUpdateType;
 
-	@ApiModelProperty(value="用户ID")
+    @ApiModelProperty(value = "用户ID")
     @ExcelProperty(value = "用户ID")
-		private String uid;
-
-
+    private String uid;
 
 }