diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-entity-request-create.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-entity-request-create.java.vm index 710b9133..01e6f243 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-entity-request-create.java.vm +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-entity-request-create.java.vm @@ -29,8 +29,8 @@ public class ${type}CreateRequest implements Serializable { #foreach($field in ${table.fields}) #if("$!field.propertyName" != "id") #if("$field.propertyType" == "String") - @Size(max = $field.metaInfo.length) @NotBlank + @Size(max = $field.metaInfo.length) #else @NotNull #end diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-entity-request-update.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-entity-request-update.java.vm index c1d1586e..01b62923 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-entity-request-update.java.vm +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-entity-request-update.java.vm @@ -28,8 +28,8 @@ public class ${type}UpdateRequest implements Serializable { #foreach($field in ${table.fields}) #if("$field.propertyType" == "String") - @Size(max = $field.metaInfo.length) @NotBlank + @Size(max = $field.metaInfo.length) #else @NotNull #end diff --git a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuDTO.java b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuDTO.java index 3d70dba0..c0b8cfe1 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuDTO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuDTO.java @@ -52,10 +52,10 @@ public class SystemMenuDTO implements Serializable { @Schema(description = "菜单图标") private String icon; - @Schema(description = "路由地址") + @Schema(description = "链接地址") private String path; - @Schema(description = "组件地址") + @Schema(description = "组件名称") private String component; @Schema(description = "创建时间") diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/domain/SystemMenuDO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/domain/SystemMenuDO.java index 49d535a4..662d4b0b 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/domain/SystemMenuDO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/domain/SystemMenuDO.java @@ -66,11 +66,11 @@ public class SystemMenuDO extends BaseDO { @TableField("icon") private String icon; - @Schema(description = "路由地址") + @Schema(description = "链接地址") @TableField("path") private String path; - @Schema(description = "组件地址") + @Schema(description = "组件名称") @TableField("component") private String component; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuCacheDTO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuCacheDTO.java index e274ea05..f60f9de0 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuCacheDTO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuCacheDTO.java @@ -44,10 +44,10 @@ public class SystemMenuCacheDTO { @Schema(description = "菜单图标") private String icon; - @Schema(description = "路由地址") + @Schema(description = "链接地址") private String path; - @Schema(description = "组件地址") + @Schema(description = "组件名称") private String component; } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuCreateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuCreateRequest.java deleted file mode 100644 index e37c8a4f..00000000 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuCreateRequest.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.orion.ops.module.infra.entity.request; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.io.Serializable; - -/** - * 菜单 创建请求对象 - * - * @author Jiahang Li - * @version 1.0.0 - * @since 2023-7-18 10:18 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Schema(name = "SystemMenuCreateRequest", description = "菜单 创建请求对象") -public class SystemMenuCreateRequest implements Serializable { - - @NotNull - @Schema(description = "父id") - private Long parentId; - - @Size(max = 32) - @NotBlank - @Schema(description = "菜单名称") - private String name; - - @Size(max = 64) - @NotBlank - @Schema(description = "菜单权限") - private String permission; - - @NotNull - @Schema(description = "菜单类型 1父菜单 2子菜单 3功能") - private Integer type; - - @NotNull - @Schema(description = "排序") - private Integer sort; - - @NotNull - @Schema(description = "是否可见 0不可见 1可见") - private Integer visible; - - @NotNull - @Schema(description = "菜单状态 0停用 1启用") - private Integer status; - - @NotNull - @Schema(description = "菜单缓存 0不缓存 1缓存") - private Integer cache; - - @Size(max = 64) - @NotBlank - @Schema(description = "菜单图标") - private String icon; - - @Size(max = 256) - @NotBlank - @Schema(description = "路由地址") - private String path; - - @Size(max = 128) - @NotBlank - @Schema(description = "组件地址") - private String component; - -} diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuQueryRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuQueryRequest.java deleted file mode 100644 index 394b9f8e..00000000 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuQueryRequest.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.orion.ops.module.infra.entity.request; - -import com.orion.ops.framework.common.entity.PageRequest; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import javax.validation.constraints.Size; - -/** - * 菜单 查询请求对象 - * - * @author Jiahang Li - * @version 1.0.0 - * @since 2023-7-18 10:18 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@Schema(name = "SystemMenuQueryRequest", description = "菜单 查询请求对象") -public class SystemMenuQueryRequest extends PageRequest { - - @Schema(description = "id") - private Long id; - - @Schema(description = "父id") - private Long parentId; - - @Size(max = 32) - @Schema(description = "菜单名称") - private String name; - - @Size(max = 64) - @Schema(description = "菜单权限") - private String permission; - - @Schema(description = "菜单类型 1父菜单 2子菜单 3功能") - private Integer type; - - @Schema(description = "排序") - private Integer sort; - - @Schema(description = "是否可见 0不可见 1可见") - private Integer visible; - - @Schema(description = "菜单状态 0停用 1启用") - private Integer status; - - @Schema(description = "菜单缓存 0不缓存 1缓存") - private Integer cache; - - @Size(max = 64) - @Schema(description = "菜单图标") - private String icon; - - @Size(max = 256) - @Schema(description = "路由地址") - private String path; - - @Size(max = 128) - @Schema(description = "组件地址") - private String component; - -} diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuUpdateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuUpdateRequest.java deleted file mode 100644 index c715b449..00000000 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuUpdateRequest.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.orion.ops.module.infra.entity.request; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.io.Serializable; - -/** - * 菜单 更新请求对象 - * - * @author Jiahang Li - * @version 1.0.0 - * @since 2023-7-18 10:18 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Schema(name = "SystemMenuUpdateRequest", description = "菜单 更新请求对象") -public class SystemMenuUpdateRequest implements Serializable { - - @NotNull - @Schema(description = "id") - private Long id; - - @NotNull - @Schema(description = "父id") - private Long parentId; - - @Size(max = 32) - @NotBlank - @Schema(description = "菜单名称") - private String name; - - @Size(max = 64) - @NotBlank - @Schema(description = "菜单权限") - private String permission; - - @NotNull - @Schema(description = "菜单类型 1父菜单 2子菜单 3功能") - private Integer type; - - @NotNull - @Schema(description = "排序") - private Integer sort; - - @NotNull - @Schema(description = "是否可见 0不可见 1可见") - private Integer visible; - - @NotNull - @Schema(description = "菜单状态 0停用 1启用") - private Integer status; - - @NotNull - @Schema(description = "菜单缓存 0不缓存 1缓存") - private Integer cache; - - @Size(max = 64) - @NotBlank - @Schema(description = "菜单图标") - private String icon; - - @Size(max = 256) - @NotBlank - @Schema(description = "路由地址") - private String path; - - @Size(max = 128) - @NotBlank - @Schema(description = "组件地址") - private String component; - -} diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuCreateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuCreateRequest.java index d0ec971c..b420eb6b 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuCreateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuCreateRequest.java @@ -49,10 +49,10 @@ public class SystemMenuCreateRequest implements Serializable { @Schema(description = "菜单图标") private String icon; - @Schema(description = "路由地址") + @Schema(description = "链接地址") private String path; - @Schema(description = "组件地址") + @Schema(description = "组件名称") private String component; } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuUpdateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuUpdateRequest.java index edc32e93..b5d5635e 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuUpdateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuUpdateRequest.java @@ -46,10 +46,10 @@ public class SystemMenuUpdateRequest implements Serializable { @Schema(description = "菜单图标") private String icon; - @Schema(description = "路由地址") + @Schema(description = "链接地址") private String path; - @Schema(description = "组件地址") + @Schema(description = "组件名称") private String component; } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuValidFunctionRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuValidFunctionRequest.java index 98f93505..0b8b2d83 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuValidFunctionRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuValidFunctionRequest.java @@ -29,8 +29,8 @@ public class SystemMenuValidFunctionRequest implements Serializable { @Schema(description = "父id") private Long parentId; - @Size(max = 32) @NotBlank + @Size(max = 32) @Schema(description = "菜单名称") private String name; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java index 156e82cd..a97738df 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java @@ -29,8 +29,8 @@ public class SystemMenuValidMenuRequest implements Serializable { @Schema(description = "父id") private Long parentId; - @Size(max = 32) @NotBlank + @Size(max = 32) @Schema(description = "菜单名称") private String name; @@ -46,23 +46,20 @@ public class SystemMenuValidMenuRequest implements Serializable { @Schema(description = "是否可见 0不可见 1可见") private Integer visible; - @NotNull @Schema(description = "菜单缓存 0不缓存 1缓存") private Integer cache; - @Size(max = 64) @NotBlank + @Size(max = 64) @Schema(description = "菜单图标") private String icon; @Size(max = 256) - @NotBlank - @Schema(description = "路由地址") + @Schema(description = "链接地址") private String path; @Size(max = 128) - @NotBlank - @Schema(description = "组件地址") + @Schema(description = "组件名称") private String component; } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleCreateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleCreateRequest.java index 98021f14..67c050f1 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleCreateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleCreateRequest.java @@ -24,13 +24,13 @@ import java.io.Serializable; @Schema(name = "SystemRoleCreateRequest", description = "角色 创建请求对象") public class SystemRoleCreateRequest implements Serializable { - @Size(max = 32) @NotBlank + @Size(max = 32) @Schema(description = "角色名称") private String name; - @Size(max = 32) @NotBlank + @Size(max = 32) @Schema(description = "角色编码") private String code; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleUpdateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleUpdateRequest.java index c2851550..b67b2ba5 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleUpdateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleUpdateRequest.java @@ -29,8 +29,8 @@ public class SystemRoleUpdateRequest implements Serializable { @Schema(description = "id") private Long id; - @Size(max = 32) @NotBlank + @Size(max = 32) @Schema(description = "角色名称") private String name; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserCreateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserCreateRequest.java index e03a499f..b1a240d4 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserCreateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserCreateRequest.java @@ -24,18 +24,18 @@ import java.io.Serializable; @Schema(name = "SystemUserCreateRequest", description = "用户 创建请求对象") public class SystemUserCreateRequest implements Serializable { - @Size(max = 32) @NotBlank + @Size(max = 32) @Schema(description = "用户名") private String username; - @Size(max = 64) @NotBlank + @Size(max = 64) @Schema(description = "密码") private String password; - @Size(max = 16) @NotBlank + @Size(max = 16) @Schema(description = "花名") private String nickname; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserUpdateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserUpdateRequest.java index 7203c21e..be72d83f 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserUpdateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserUpdateRequest.java @@ -29,8 +29,8 @@ public class SystemUserUpdateRequest implements Serializable { @Schema(description = "id") private Long id; - @Size(max = 16) @NotBlank + @Size(max = 16) @Schema(description = "花名") private String nickname; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemMenuVO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemMenuVO.java index 69c7e18c..982b8b0f 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemMenuVO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemMenuVO.java @@ -55,10 +55,10 @@ public class SystemMenuVO implements Serializable { @Schema(description = "菜单图标") private String icon; - @Schema(description = "路由地址") + @Schema(description = "链接地址") private String path; - @Schema(description = "组件地址") + @Schema(description = "组件名称") private String component; @Schema(description = "子节点")