tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 升级SpringBoot3

Browse Source
This commit is contained in:
haoxr
2023-02-06 09:40:50 +08:00
parent 115de0bfcb
commit 9d73197bd8
43 changed files with 365 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/youlai/system/pojo/form/DeptForm.java
View File

@@ -1,30 +1,29 @@
package com.youlai.system.pojo.form;
import com.youlai.system.common.base.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
@ApiModel("部门表单对象")
@Schema(description = "部门表单对象")
@Data
public class DeptForm extends BaseEntity {
@ApiModelProperty("部门ID(新增不填)")
@Schema(description="部门ID(新增不填)")
private Long id;
@ApiModelProperty("部门名称")
@Schema(description="部门名称")
private String name;
@ApiModelProperty("父部门ID")
@Schema(description="父部门ID")
@NotNull(message = "父部门ID不能为空")
private Long parentId;
@ApiModelProperty("状态")
@Schema(description="状态")
private Integer status;
@ApiModelProperty("排序")
@Schema(description="排序")
private Integer sort;
}

19
src/main/java/com/youlai/system/pojo/form/DictItemForm.java
View File

@@ -1,30 +1,31 @@
package com.youlai.system.pojo.form;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ApiModel("字典数据项")
@Schema(description = "字典数据项")
@Data
public class DictItemForm {
@ApiModelProperty("数据项ID")
@Schema(description="数据项ID")
private Long id;
@ApiModelProperty("类型编码")
@Schema(description="类型编码")
private String typeCode;
@ApiModelProperty("数据项名称")
@Schema(description="数据项名称")
private String name;
@ApiModelProperty("值")
@Schema(description="值")
private String value;
@ApiModelProperty("状态：1->启用;0->禁用")
@Schema(description="状态：1->启用;0->禁用")
private Integer status;
@ApiModelProperty("排序")
@Schema(description="排序")
private Integer sort;
}

15
src/main/java/com/youlai/system/pojo/form/DictTypeForm.java
View File

@@ -1,24 +1,25 @@
package com.youlai.system.pojo.form;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ApiModel("字典类型")
@Schema(description = "字典类型")
@Data
public class DictTypeForm {
@ApiModelProperty("字典类型ID")
@Schema(description="字典类型ID")
private Long id;
@ApiModelProperty("类型名称")
@Schema(description="类型名称")
private String name;
@ApiModelProperty("类型编码")
@Schema(description="类型编码")
private String code;
@ApiModelProperty("类型状态：1->启用;0->禁用")
@Schema(description="类型状态：1->启用;0->禁用")
private Integer status;
}

20
src/main/java/com/youlai/system/pojo/form/RoleForm.java
View File

@@ -1,33 +1,33 @@
package com.youlai.system.pojo.form;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotBlank;
// import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotBlank;
@ApiModel("角色表单对象")
@Schema(description = "角色表单对象")
@Data
public class RoleForm {
@ApiModelProperty("角色ID")
@Schema(description="角色ID")
private Long id;
@ApiModelProperty("角色名称")
@Schema(description="角色名称")
@NotBlank(message = "角色名称不能为空")
private String name;
@ApiModelProperty("角色编码")
@Schema(description="角色编码")
@NotBlank(message = "角色编码不能为空")
private String code;
@ApiModelProperty("排序")
@Schema(description="排序")
private Integer sort;
@ApiModelProperty("角色状态(1-正常；0-停用)")
@Schema(description="角色状态(1-正常；0-停用)")
private Integer status;
@ApiModelProperty("数据权限")
@Schema(description="数据权限")
private Integer dataScope;
}

10
src/main/java/com/youlai/system/pojo/form/RoleResourceForm.java
View File

@@ -1,20 +1,20 @@
package com.youlai.system.pojo.form;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@ApiModel("菜单资源表单")
@Schema(description ="菜单资源表单")
@Data
public class RoleResourceForm {
@ApiModelProperty("菜单ID集合")
@Schema(description="菜单ID集合")
private List<Long> menuIds;
@ApiModelProperty("权限ID集合")
@Schema(description="权限ID集合")
private List<Long> permIds;
}

30
src/main/java/com/youlai/system/pojo/form/UserForm.java
View File

@@ -1,12 +1,12 @@
package com.youlai.system.pojo.form;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.Pattern;
import java.util.List;
/**
@@ -15,40 +15,40 @@ import java.util.List;
* @author haoxr
* @date 2022/4/12 11:04
*/
@ApiModel
@Schema
@Data
public class UserForm {
@ApiModelProperty("用户ID")
@Schema(description="用户ID")
private Long id;
@ApiModelProperty("用户名")
@Schema(description="用户名")
@NotBlank(message = "用户名不能为空")
private String username;
@ApiModelProperty("昵称")
@Schema(description="昵称")
@NotBlank(message = "昵称不能为空")
private String nickname;
@Pattern(regexp = "^1(3\\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$", message = "{phone.valid}")
private String mobile;
@ApiModelProperty("性别")
@Schema(description="性别")
private Integer gender;
@ApiModelProperty("用户头像")
@Schema(description="用户头像")
private String avatar;
@ApiModelProperty("邮箱")
@Schema(description="邮箱")
private String email;
@ApiModelProperty("用户状态(1:正常;0:禁用)")
@Schema(description="用户状态(1:正常;0:禁用)")
private Integer status;
@ApiModelProperty("部门ID")
@Schema(description="部门ID")
private Long deptId;
@ApiModelProperty("角色ID集合")
@Schema(description="角色ID集合")
@NotEmpty(message = "用户角色不能为空")
private List<Long> roleIds;