From 11c73d887736cd0e6b5208580a81b53c0663f05e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Mon, 26 Jul 2021 13:57:11 +0800 Subject: [PATCH] =?UTF-8?q?udpate=20=E8=A1=A5=E5=85=A8=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/core/validate/AddGroup.java | 9 ++ .../ruoyi/common/core/validate/EditGroup.java | 9 ++ .../com/ruoyi/demo/domain/bo/TestDemoBo.java | 94 +++++++++++++++++++ .../com/ruoyi/demo/domain/bo/TestTreeBo.java | 79 ++++++++++++++++ .../com/ruoyi/demo/domain/vo/TestDemoVo.java | 93 ++++++++++++++++++ .../com/ruoyi/demo/domain/vo/TestTreeVo.java | 65 +++++++++++++ .../src/main/resources/vm/java/bo.java.vm | 88 +++++++++++++++++ 7 files changed, 437 insertions(+) create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/validate/AddGroup.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/validate/EditGroup.java create mode 100644 ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java create mode 100644 ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java create mode 100644 ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java create mode 100644 ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java create mode 100644 ruoyi-generator/src/main/resources/vm/java/bo.java.vm diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/AddGroup.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/AddGroup.java new file mode 100644 index 00000000..e1934e1e --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/AddGroup.java @@ -0,0 +1,9 @@ +package com.ruoyi.common.core.validate; + +/** + * 校验分组 add + * + * @author Lion Li + */ +public interface AddGroup { +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/EditGroup.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/EditGroup.java new file mode 100644 index 00000000..3c6ca7f8 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/EditGroup.java @@ -0,0 +1,9 @@ +package com.ruoyi.common.core.validate; + +/** + * 校验分组 edit + * + * @author Lion Li + */ +public interface EditGroup { +} diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java new file mode 100644 index 00000000..46018b10 --- /dev/null +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java @@ -0,0 +1,94 @@ +package com.ruoyi.demo.domain.bo; + +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; + +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 测试单表业务对象 test_demo + * + * @author Lion Li + * @date 2021-07-26 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel("测试单表业务对象") +public class TestDemoBo extends BaseEntity { + + /** + * 主键 + */ + @ApiModelProperty("主键") + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @NotNull(message = "部门id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long deptId; + + /** + * 用户id + */ + @ApiModelProperty("用户id") + @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + /** + * 排序号 + */ + @ApiModelProperty("排序号") + @NotNull(message = "排序号不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long orderNum; + + /** + * key键 + */ + @ApiModelProperty("key键") + @NotBlank(message = "key键不能为空", groups = { AddGroup.class, EditGroup.class }) + private String testKey; + + /** + * 值 + */ + @ApiModelProperty("值") + @NotBlank(message = "值不能为空", groups = { AddGroup.class, EditGroup.class }) + private String value; + + + /** + * 分页大小 + */ + @ApiModelProperty("分页大小") + private Integer pageSize; + + /** + * 当前页数 + */ + @ApiModelProperty("当前页数") + private Integer pageNum; + + /** + * 排序列 + */ + @ApiModelProperty("排序列") + private String orderByColumn; + + /** + * 排序的方向desc或者asc + */ + @ApiModelProperty(value = "排序的方向", example = "asc,desc") + private String isAsc; + +} diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java new file mode 100644 index 00000000..2dfe1ff0 --- /dev/null +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java @@ -0,0 +1,79 @@ +package com.ruoyi.demo.domain.bo; + +import com.ruoyi.common.core.domain.TreeEntity; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 测试树表业务对象 test_tree + * + * @author Lion Li + * @date 2021-07-26 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel("测试树表业务对象") +public class TestTreeBo extends TreeEntity { + + /** + * 主键 + */ + @ApiModelProperty("主键") + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @NotNull(message = "部门id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long deptId; + + /** + * 用户id + */ + @ApiModelProperty("用户id") + @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + /** + * 树节点名 + */ + @ApiModelProperty("树节点名") + @NotBlank(message = "树节点名不能为空", groups = { AddGroup.class, EditGroup.class }) + private String treeName; + + + /** + * 分页大小 + */ + @ApiModelProperty("分页大小") + private Integer pageSize; + + /** + * 当前页数 + */ + @ApiModelProperty("当前页数") + private Integer pageNum; + + /** + * 排序列 + */ + @ApiModelProperty("排序列") + private String orderByColumn; + + /** + * 排序的方向desc或者asc + */ + @ApiModelProperty(value = "排序的方向", example = "asc,desc") + private String isAsc; + +} diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java new file mode 100644 index 00000000..9ab4ba95 --- /dev/null +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java @@ -0,0 +1,93 @@ +package com.ruoyi.demo.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.util.Date; + + + +/** + * 测试单表视图对象 test_demo + * + * @author Lion Li + * @date 2021-07-26 + */ +@Data +@ApiModel("测试单表视图对象") +public class TestDemoVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + /** + * 部门id + */ + @Excel(name = "部门id") + @ApiModelProperty("部门id") + private Long deptId; + + /** + * 用户id + */ + @Excel(name = "用户id") + @ApiModelProperty("用户id") + private Long userId; + + /** + * 排序号 + */ + @Excel(name = "排序号") + @ApiModelProperty("排序号") + private Long orderNum; + + /** + * key键 + */ + @Excel(name = "key键") + @ApiModelProperty("key键") + private String testKey; + + /** + * 值 + */ + @Excel(name = "值") + @ApiModelProperty("值") + private String value; + + /** + * 创建时间 + */ + @Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; + + /** + * 创建人 + */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createBy; + + /** + * 更新时间 + */ + @Excel(name = "更新时间" , width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("更新时间") + private Date updateTime; + + /** + * 更新人 + */ + @Excel(name = "更新人") + @ApiModelProperty("更新人") + private String updateBy; + + +} diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java new file mode 100644 index 00000000..a299c4a4 --- /dev/null +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java @@ -0,0 +1,65 @@ +package com.ruoyi.demo.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.util.Date; + + + +/** + * 测试树表视图对象 test_tree + * + * @author Lion Li + * @date 2021-07-26 + */ +@Data +@ApiModel("测试树表视图对象") +public class TestTreeVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + /** + * 父id + */ + @Excel(name = "父id") + @ApiModelProperty("父id") + private Long parentId; + + /** + * 部门id + */ + @Excel(name = "部门id") + @ApiModelProperty("部门id") + private Long deptId; + + /** + * 用户id + */ + @Excel(name = "用户id") + @ApiModelProperty("用户id") + private Long userId; + + /** + * 树节点名 + */ + @Excel(name = "树节点名") + @ApiModelProperty("树节点名") + private String treeName; + + /** + * 创建时间 + */ + @Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("创建时间") + private Date createTime; + + +} diff --git a/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-generator/src/main/resources/vm/java/bo.java.vm new file mode 100644 index 00000000..40174d5c --- /dev/null +++ b/ruoyi-generator/src/main/resources/vm/java/bo.java.vm @@ -0,0 +1,88 @@ +package ${packageName}.domain.bo; + +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; + +#foreach ($import in $importList) +import ${import}; +#end +#if($table.crud || $table.sub) +import com.ruoyi.common.core.domain.BaseEntity; +#elseif($table.tree) +import com.ruoyi.common.core.domain.TreeEntity; +#end + +/** + * ${functionName}业务对象 ${tableName} + * + * @author ${author} + * @date ${datetime} + */ +#if($table.crud || $table.sub) +#set($Entity="BaseEntity") +#elseif($table.tree) +#set($Entity="TreeEntity") +#end + +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel("${functionName}业务对象") +public class ${ClassName}Bo extends ${Entity} { + +#foreach ($column in $columns) +#if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.isInsert || $column.isEdit)) + /** + * $column.columnComment + */ + @ApiModelProperty("$column.columnComment") +#if($column.isInsert && $column.isEdit) +#set($Group="AddGroup.class, EditGroup.class") +#elseif($column.isInsert) +#set($Group="AddGroup.class") +#elseif($column.isEdit) +#set($Group="EditGroup.class") +#end +#if($column.isRequired == 1) +#if($column.javaType == 'String') + @NotBlank(message = "$column.columnComment不能为空", groups = { $Group }) +#else + @NotNull(message = "$column.columnComment不能为空", groups = { $Group }) +#end +#end + private $column.javaType $column.javaField; + +#end +#end + + /** + * 分页大小 + */ + @ApiModelProperty("分页大小") + private Integer pageSize; + + /** + * 当前页数 + */ + @ApiModelProperty("当前页数") + private Integer pageNum; + + /** + * 排序列 + */ + @ApiModelProperty("排序列") + private String orderByColumn; + + /** + * 排序的方向desc或者asc + */ + @ApiModelProperty(value = "排序的方向", example = "asc,desc") + private String isAsc; + +}