Commit d116e5eec1361c74bef04dd001884adb43fb1e26
1 parent
88ec5269
【代码评审】IoT:物模型的维护
Showing
5 changed files
with
5 additions
and
5 deletions
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/ThingModelEvent.java
| @@ -21,7 +21,7 @@ public class ThingModelEvent { | @@ -21,7 +21,7 @@ public class ThingModelEvent { | ||
| 21 | * 事件标识符 | 21 | * 事件标识符 |
| 22 | */ | 22 | */ |
| 23 | @NotEmpty(message = "事件标识符不能为空") | 23 | @NotEmpty(message = "事件标识符不能为空") |
| 24 | - @Pattern(regexp = "^[a-zA-Z][a-zA-Z0-9_]{0,31}$", message = "事件标识符只能由字母、数字和下划线组成,必须以字母开头,长度不超过32个字符") | 24 | + @Pattern(regexp = "^[a-zA-Z][a-zA-Z0-9_]{0,31}$", message = "事件标识符只能由字母、数字和下划线组成,必须以字母开头,长度不超过 32 个字符") |
| 25 | private String identifier; | 25 | private String identifier; |
| 26 | /** | 26 | /** |
| 27 | * 事件名称 | 27 | * 事件名称 |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/ThingModelParam.java
| @@ -22,7 +22,7 @@ public class ThingModelParam { | @@ -22,7 +22,7 @@ public class ThingModelParam { | ||
| 22 | * 参数标识符 | 22 | * 参数标识符 |
| 23 | */ | 23 | */ |
| 24 | @NotEmpty(message = "参数标识符不能为空") | 24 | @NotEmpty(message = "参数标识符不能为空") |
| 25 | - @Pattern(regexp = "^[a-zA-Z][a-zA-Z0-9_]{0,31}$", message = "参数标识符只能由字母、数字和下划线组成,必须以字母开头,长度不超过32个字符") | 25 | + @Pattern(regexp = "^[a-zA-Z][a-zA-Z0-9_]{0,31}$", message = "参数标识符只能由字母、数字和下划线组成,必须以字母开头,长度不超过 32 个字符") |
| 26 | private String identifier; | 26 | private String identifier; |
| 27 | /** | 27 | /** |
| 28 | * 参数名称 | 28 | * 参数名称 |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/ThingModelProperty.java
| @@ -24,7 +24,7 @@ public class ThingModelProperty { | @@ -24,7 +24,7 @@ public class ThingModelProperty { | ||
| 24 | * 属性标识符 | 24 | * 属性标识符 |
| 25 | */ | 25 | */ |
| 26 | @NotEmpty(message = "属性标识符不能为空") | 26 | @NotEmpty(message = "属性标识符不能为空") |
| 27 | - @Pattern(regexp = "^[a-zA-Z][a-zA-Z0-9_]{0,31}$", message = "属性标识符只能由字母、数字和下划线组成,必须以字母开头,长度不超过32个字符") | 27 | + @Pattern(regexp = "^[a-zA-Z][a-zA-Z0-9_]{0,31}$", message = "属性标识符只能由字母、数字和下划线组成,必须以字母开头,长度不超过 32 个字符") |
| 28 | private String identifier; | 28 | private String identifier; |
| 29 | /** | 29 | /** |
| 30 | * 属性名称 | 30 | * 属性名称 |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/ThingModelService.java
| @@ -21,7 +21,7 @@ public class ThingModelService { | @@ -21,7 +21,7 @@ public class ThingModelService { | ||
| 21 | * 服务标识符 | 21 | * 服务标识符 |
| 22 | */ | 22 | */ |
| 23 | @NotEmpty(message = "服务标识符不能为空") | 23 | @NotEmpty(message = "服务标识符不能为空") |
| 24 | - @Pattern(regexp = "^[a-zA-Z][a-zA-Z0-9_]{0,31}$", message = "服务标识符只能由字母、数字和下划线组成,必须以字母开头,长度不超过32个字符") | 24 | + @Pattern(regexp = "^[a-zA-Z][a-zA-Z0-9_]{0,31}$", message = "服务标识符只能由字母、数字和下划线组成,必须以字母开头,长度不超过 32 个字符") |
| 25 | private String identifier; | 25 | private String identifier; |
| 26 | /** | 26 | /** |
| 27 | * 服务名称 | 27 | * 服务名称 |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/vo/IotThingModelRespVO.java
| @@ -15,7 +15,7 @@ import java.time.LocalDateTime; | @@ -15,7 +15,7 @@ import java.time.LocalDateTime; | ||
| 15 | @ExcelIgnoreUnannotated | 15 | @ExcelIgnoreUnannotated |
| 16 | public class IotThingModelRespVO { | 16 | public class IotThingModelRespVO { |
| 17 | 17 | ||
| 18 | - @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21816") | 18 | + @Schema(description = "产品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "21816") |
| 19 | @ExcelProperty("产品ID") | 19 | @ExcelProperty("产品ID") |
| 20 | private Long id; | 20 | private Long id; |
| 21 | 21 |