syy/SYYTe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化代码

This commit is contained in:
阿沐 2022-05-05 13:58:45 +08:00
parent eeaeb30679
commit 35bdd40a04
80 changed files with 739 additions and 1167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fast-boot-framework/src/main/java/net/maku/framework/common/exception/ErrorCode.java
View File

@ -11,8 +11,8 @@ import lombok.Getter;
@Getter
@AllArgsConstructor
public enum ErrorCode {
UNAUTHORIZED(401, "未授权，不能访问"),
FORBIDDEN(403, "没权限，禁止访问"),
UNAUTHORIZED(401, "还未授权，不能访问"),
FORBIDDEN(403, "没有权限，禁止访问"),
INTERNAL_SERVER_ERROR(500, "服务器异常，请稍后再试"),
ACCOUNT_PASSWORD_ERROR(1001, "账号或密码错误");

5
fast-boot-framework/src/main/java/net/maku/framework/common/utils/TreeNode.java
View File

@ -1,7 +1,9 @@
package net.maku.framework.common.utils;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@ -17,10 +19,13 @@ public class TreeNode<T> implements Serializable {
/**
* 主键
*/
@Schema(description = "id")
private Long id;
/**
* 上级ID
*/
@Schema(description = "上级ID")
@NotNull(message = "上级ID不能为空")
private Long pid;
/**
* 子节点列表

10
fast-boot-system/src/main/java/net/maku/system/controller/SysDictDataController.java
View File

@ -8,10 +8,8 @@ import net.maku.framework.common.utils.Result;
import net.maku.system.convert.SysDictDataConvert;
import net.maku.system.entity.SysDictDataEntity;
import net.maku.system.service.SysDictDataService;
import net.maku.system.vo.dict.data.SysDictDataPostVO;
import net.maku.system.vo.dict.data.SysDictDataPutVO;
import net.maku.system.vo.dict.data.SysDictDataQuery;
import net.maku.system.vo.dict.data.SysDictDataVO;
import net.maku.system.query.SysDictDataQuery;
import net.maku.system.vo.SysDictDataVO;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -51,7 +49,7 @@ public class SysDictDataController {
@PostMapping
@Operation(summary = "保存")
@PreAuthorize("hasAuthority('sys:dict:save')")
public Result<String> save(@RequestBody @Valid SysDictDataPostVO vo){
public Result<String> save(@RequestBody @Valid SysDictDataVO vo){
sysDictDataService.save(vo);
return Result.ok();
@ -60,7 +58,7 @@ public class SysDictDataController {
@PutMapping
@Operation(summary = "修改")
@PreAuthorize("hasAuthority('sys:dict:update')")
public Result<String> update(@RequestBody @Valid SysDictDataPutVO vo){
public Result<String> update(@RequestBody @Valid SysDictDataVO vo){
sysDictDataService.update(vo);
return Result.ok();

12
fast-boot-system/src/main/java/net/maku/system/controller/SysDictTypeController.java
View File

@ -8,11 +8,9 @@ import net.maku.framework.common.utils.Result;
import net.maku.system.convert.SysDictTypeConvert;
import net.maku.system.entity.SysDictTypeEntity;
import net.maku.system.service.SysDictTypeService;
import net.maku.system.vo.dict.SysDictVO;
import net.maku.system.vo.dict.type.SysDictTypePostVO;
import net.maku.system.vo.dict.type.SysDictTypePutVO;
import net.maku.system.vo.dict.type.SysDictTypeQuery;
import net.maku.system.vo.dict.type.SysDictTypeVO;
import net.maku.system.vo.SysDictVO;
import net.maku.system.query.SysDictTypeQuery;
import net.maku.system.vo.SysDictTypeVO;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -52,7 +50,7 @@ public class SysDictTypeController {
@PostMapping
@Operation(summary = "保存")
@PreAuthorize("hasAuthority('sys:dict:save')")
public Result<String> save(@RequestBody @Valid SysDictTypePostVO vo){
public Result<String> save(@RequestBody @Valid SysDictTypeVO vo){
sysDictTypeService.save(vo);
return Result.ok();
@ -61,7 +59,7 @@ public class SysDictTypeController {
@PutMapping
@Operation(summary = "修改")
@PreAuthorize("hasAuthority('sys:dict:update')")
public Result<String> update(@RequestBody @Valid SysDictTypePutVO vo){
public Result<String> update(@RequestBody @Valid SysDictTypeVO vo){
sysDictTypeService.update(vo);
return Result.ok();

8
fast-boot-system/src/main/java/net/maku/system/controller/SysMenuController.java
View File

@ -12,9 +12,7 @@ import net.maku.system.convert.SysMenuConvert;
import net.maku.system.entity.SysMenuEntity;
import net.maku.system.enums.MenuTypeEnum;
import net.maku.system.service.SysMenuService;
import net.maku.system.vo.menu.SysMenuPostVO;
import net.maku.system.vo.menu.SysMenuPutVO;
import net.maku.system.vo.menu.SysMenuVO;
import net.maku.system.vo.SysMenuVO;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -81,7 +79,7 @@ public class SysMenuController {
@PostMapping
@Operation(summary = "保存")
@PreAuthorize("hasAuthority('sys:menu:save')")
public Result<String> save(@RequestBody @Valid SysMenuPostVO vo){
public Result<String> save(@RequestBody @Valid SysMenuVO vo){
sysMenuService.save(vo);
return Result.ok();
@ -90,7 +88,7 @@ public class SysMenuController {
@PutMapping
@Operation(summary = "修改")
@PreAuthorize("hasAuthority('sys:menu:update')")
public Result<String> update(@RequestBody @Valid SysMenuPutVO vo){
public Result<String> update(@RequestBody @Valid SysMenuVO vo){
sysMenuService.update(vo);
return Result.ok();

8
fast-boot-system/src/main/java/net/maku/system/controller/SysOauthClientController.java
View File

@ -9,9 +9,7 @@ import net.maku.framework.common.utils.Result;
import net.maku.system.convert.SysOauthClientConvert;
import net.maku.system.entity.SysOauthClientEntity;
import net.maku.system.service.SysOauthClientService;
import net.maku.system.vo.oauth.SysOauthClientPostVO;
import net.maku.system.vo.oauth.SysOauthClientPutVO;
import net.maku.system.vo.oauth.SysOauthClientVO;
import net.maku.system.vo.SysOauthClientVO;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -51,7 +49,7 @@ public class SysOauthClientController {
@PostMapping
@Operation(summary = "保存")
@PreAuthorize("hasAuthority('sys:client:save')")
public Result<String> save(@RequestBody SysOauthClientPostVO vo){
public Result<String> save(@RequestBody SysOauthClientVO vo){
sysOauthClientService.save(vo);
return Result.ok();
@ -60,7 +58,7 @@ public class SysOauthClientController {
@PutMapping
@Operation(summary = "修改")
@PreAuthorize("hasAuthority('sys:client:update')")
public Result<String> update(@RequestBody @Valid SysOauthClientPutVO vo){
public Result<String> update(@RequestBody @Valid SysOauthClientVO vo){
sysOauthClientService.update(vo);
return Result.ok();

8
fast-boot-system/src/main/java/net/maku/system/controller/SysOrgController.java
View File

@ -8,9 +8,7 @@ import net.maku.framework.common.utils.Result;
import net.maku.system.convert.SysOrgConvert;
import net.maku.system.entity.SysOrgEntity;
import net.maku.system.service.SysOrgService;
import net.maku.system.vo.org.SysOrgPostVO;
import net.maku.system.vo.org.SysOrgPutVO;
import net.maku.system.vo.org.SysOrgVO;
import net.maku.system.vo.SysOrgVO;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -57,7 +55,7 @@ public class SysOrgController {
@PostMapping
@Operation(summary = "保存")
@PreAuthorize("hasAuthority('sys:org:save')")
public Result<String> save(@RequestBody @Valid SysOrgPostVO vo){
public Result<String> save(@RequestBody @Valid SysOrgVO vo){
sysOrgService.save(vo);
return Result.ok();
@ -66,7 +64,7 @@ public class SysOrgController {
@PutMapping
@Operation(summary = "修改")
@PreAuthorize("hasAuthority('sys:org:update')")
public Result<String> update(@RequestBody @Valid SysOrgPutVO vo){
public Result<String> update(@RequestBody @Valid SysOrgVO vo){
sysOrgService.update(vo);
return Result.ok();

10
fast-boot-system/src/main/java/net/maku/system/controller/SysPostController.java
View File

@ -8,10 +8,8 @@ import net.maku.framework.common.utils.Result;
import net.maku.system.convert.SysPostConvert;
import net.maku.system.entity.SysPostEntity;
import net.maku.system.service.SysPostService;
import net.maku.system.vo.post.SysPostPostVO;
import net.maku.system.vo.post.SysPostPutVO;
import net.maku.system.vo.post.SysPostQuery;
import net.maku.system.vo.post.SysPostVO;
import net.maku.system.query.SysPostQuery;
import net.maku.system.vo.SysPostVO;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -60,7 +58,7 @@ public class SysPostController {
@PostMapping
@Operation(summary = "保存")
@PreAuthorize("hasAuthority('sys:post:save')")
public Result<String> save(@RequestBody SysPostPostVO vo){
public Result<String> save(@RequestBody SysPostVO vo){
sysPostService.save(vo);
return Result.ok();
@ -69,7 +67,7 @@ public class SysPostController {
@PutMapping
@Operation(summary = "修改")
@PreAuthorize("hasAuthority('sys:post:update')")
public Result<String> update(@RequestBody @Valid SysPostPutVO vo){
public Result<String> update(@RequestBody @Valid SysPostVO vo){
sysPostService.update(vo);
return Result.ok();

16
fast-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java
View File

@ -13,11 +13,9 @@ import net.maku.system.service.SysMenuService;
import net.maku.system.service.SysRoleDataScopeService;
import net.maku.system.service.SysRoleMenuService;
import net.maku.system.service.SysRoleService;
import net.maku.system.vo.menu.SysMenuVO;
import net.maku.system.vo.role.SysRolePostVO;
import net.maku.system.vo.role.SysRolePutVO;
import net.maku.system.vo.role.SysRoleQuery;
import net.maku.system.vo.role.SysRoleVO;
import net.maku.system.vo.SysMenuVO;
import net.maku.system.query.SysRoleQuery;
import net.maku.system.vo.SysRoleVO;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -60,11 +58,11 @@ public class SysRoleController {
@GetMapping("{id}")
@Operation(summary = "信息")
@PreAuthorize("hasAuthority('sys:role:info')")
public Result<SysRolePostVO> get(@PathVariable("id") Long id){
public Result<SysRoleVO> get(@PathVariable("id") Long id){
SysRoleEntity entity = sysRoleService.getById(id);
// 转换对象
SysRolePostVO role = SysRoleConvert.INSTANCE.convert(entity);
SysRoleVO role = SysRoleConvert.INSTANCE.convert(entity);
// 查询角色对应的菜单
List<Long> menuIdList = sysRoleMenuService.getMenuIdList(id);
@ -80,7 +78,7 @@ public class SysRoleController {
@PostMapping
@Operation(summary = "保存", hidden = true)
@PreAuthorize("hasAuthority('sys:role:save')")
public Result<String> save(@RequestBody @Valid SysRolePostVO vo){
public Result<String> save(@RequestBody @Valid SysRoleVO vo){
sysRoleService.save(vo);
return Result.ok();
@ -89,7 +87,7 @@ public class SysRoleController {
@PutMapping
@Operation(summary = "修改")
@PreAuthorize("hasAuthority('sys:role:update')")
public Result<String> update(@RequestBody @Valid SysRolePutVO vo){
public Result<String> update(@RequestBody @Valid SysRoleVO vo){
sysRoleService.update(vo);
return Result.ok();

8
fast-boot-system/src/main/java/net/maku/system/controller/SysUserController.java
View File

@ -10,10 +10,12 @@ import net.maku.framework.security.user.SecurityUser;
import net.maku.framework.security.user.UserDetail;
import net.maku.system.convert.SysUserConvert;
import net.maku.system.entity.SysUserEntity;
import net.maku.system.query.SysUserQuery;
import net.maku.system.service.SysUserPostService;
import net.maku.system.service.SysUserRoleService;
import net.maku.system.service.SysUserService;
import net.maku.system.vo.user.*;
import net.maku.system.vo.SysUserPasswordVO;
import net.maku.system.vo.*;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.*;
@ -91,7 +93,7 @@ public class SysUserController {
@PostMapping
@Operation(summary = "保存")
@PreAuthorize("hasAuthority('sys:user:save')")
public Result<String> save(@RequestBody @Valid SysUserPostVO vo){
public Result<String> save(@RequestBody @Valid SysUserVO vo){
// 新增密码不能为空
if (StrUtil.isBlank(vo.getPassword())){
Result.error("密码不能为空");
@ -109,7 +111,7 @@ public class SysUserController {
@PutMapping
@Operation(summary = "修改")
@PreAuthorize("hasAuthority('sys:user:update')")
public Result<String> update(@RequestBody @Valid SysUserPutVO vo){
public Result<String> update(@RequestBody @Valid SysUserVO vo){
// 如果密码不为空，则进行加密处理
if(StrUtil.isBlank(vo.getPassword())){
vo.setPassword(null);

10
fast-boot-system/src/main/java/net/maku/system/convert/SysDictDataConvert.java
View File

@ -1,9 +1,7 @@
package net.maku.system.convert;
import net.maku.system.entity.SysDictDataEntity;
import net.maku.system.vo.dict.data.SysDictDataPostVO;
import net.maku.system.vo.dict.data.SysDictDataPutVO;
import net.maku.system.vo.dict.data.SysDictDataVO;
import net.maku.system.vo.SysDictDataVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
@ -13,11 +11,9 @@ import java.util.List;
public interface SysDictDataConvert {
SysDictDataConvert INSTANCE = Mappers.getMapper(SysDictDataConvert.class);
SysDictDataEntity convert(SysDictDataPostVO vo);
SysDictDataEntity convert(SysDictDataPutVO vo);
SysDictDataVO convert(SysDictDataEntity entity);
SysDictDataEntity convert(SysDictDataVO vo);
List<SysDictDataVO> convertList(List<SysDictDataEntity> list);

10
fast-boot-system/src/main/java/net/maku/system/convert/SysDictTypeConvert.java
View File

@ -1,9 +1,7 @@
package net.maku.system.convert;
import net.maku.system.entity.SysDictTypeEntity;
import net.maku.system.vo.dict.type.SysDictTypePostVO;
import net.maku.system.vo.dict.type.SysDictTypePutVO;
import net.maku.system.vo.dict.type.SysDictTypeVO;
import net.maku.system.vo.SysDictTypeVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
@ -13,11 +11,9 @@ import java.util.List;
public interface SysDictTypeConvert {
SysDictTypeConvert INSTANCE = Mappers.getMapper(SysDictTypeConvert.class);
SysDictTypeEntity convert(SysDictTypePostVO vo);
SysDictTypeEntity convert(SysDictTypePutVO vo);
SysDictTypeVO convert(SysDictTypeEntity entity);
SysDictTypeEntity convert(SysDictTypeVO vo);
List<SysDictTypeVO> convertList(List<SysDictTypeEntity> list);

8
fast-boot-system/src/main/java/net/maku/system/convert/SysMenuConvert.java
View File

@ -1,9 +1,7 @@
package net.maku.system.convert;
import net.maku.system.entity.SysMenuEntity;
import net.maku.system.vo.menu.SysMenuPostVO;
import net.maku.system.vo.menu.SysMenuPutVO;
import net.maku.system.vo.menu.SysMenuVO;
import net.maku.system.vo.SysMenuVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
@ -14,9 +12,7 @@ import java.util.List;
public interface SysMenuConvert {
SysMenuConvert INSTANCE = Mappers.getMapper(SysMenuConvert.class);
SysMenuEntity convert(SysMenuPostVO vo);
SysMenuEntity convert(SysMenuPutVO vo);
SysMenuEntity convert(SysMenuVO vo);
SysMenuVO convert(SysMenuEntity entity);

10
fast-boot-system/src/main/java/net/maku/system/convert/SysOauthClientConvert.java
View File

@ -1,9 +1,7 @@
package net.maku.system.convert;
import net.maku.system.entity.SysOauthClientEntity;
import net.maku.system.vo.oauth.SysOauthClientPostVO;
import net.maku.system.vo.oauth.SysOauthClientPutVO;
import net.maku.system.vo.oauth.SysOauthClientVO;
import net.maku.system.vo.SysOauthClientVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
@ -14,12 +12,10 @@ import java.util.List;
public interface SysOauthClientConvert {
SysOauthClientConvert INSTANCE = Mappers.getMapper(SysOauthClientConvert.class);
SysOauthClientEntity convert(SysOauthClientPostVO vo);
SysOauthClientEntity convert(SysOauthClientPutVO vo);
SysOauthClientVO convert(SysOauthClientEntity entity);
SysOauthClientEntity convert(SysOauthClientVO vo);
List<SysOauthClientVO> convertList(List<SysOauthClientEntity> list);
}

8
fast-boot-system/src/main/java/net/maku/system/convert/SysOrgConvert.java
View File

@ -1,9 +1,7 @@
package net.maku.system.convert;
import net.maku.system.entity.SysOrgEntity;
import net.maku.system.vo.org.SysOrgPostVO;
import net.maku.system.vo.org.SysOrgPutVO;
import net.maku.system.vo.org.SysOrgVO;
import net.maku.system.vo.SysOrgVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
@ -14,9 +12,7 @@ import java.util.List;
public interface SysOrgConvert {
SysOrgConvert INSTANCE = Mappers.getMapper(SysOrgConvert.class);
SysOrgEntity convert(SysOrgPostVO vo);
SysOrgEntity convert(SysOrgPutVO vo);
SysOrgEntity convert(SysOrgVO vo);
SysOrgVO convert(SysOrgEntity entity);

10
fast-boot-system/src/main/java/net/maku/system/convert/SysPostConvert.java
View File

@ -1,9 +1,7 @@
package net.maku.system.convert;
import net.maku.system.entity.SysPostEntity;
import net.maku.system.vo.post.SysPostPostVO;
import net.maku.system.vo.post.SysPostPutVO;
import net.maku.system.vo.post.SysPostVO;
import net.maku.system.vo.SysPostVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
@ -14,12 +12,10 @@ import java.util.List;
public interface SysPostConvert {
SysPostConvert INSTANCE = Mappers.getMapper(SysPostConvert.class);
SysPostEntity convert(SysPostPostVO vo);
SysPostEntity convert(SysPostPutVO vo);
SysPostVO convert(SysPostEntity entity);
SysPostEntity convert(SysPostVO vo);
List<SysPostVO> convertList(List<SysPostEntity> list);
}

10
fast-boot-system/src/main/java/net/maku/system/convert/SysRoleConvert.java
View File

@ -1,9 +1,7 @@
package net.maku.system.convert;
import net.maku.system.entity.SysRoleEntity;
import net.maku.system.vo.role.SysRolePostVO;
import net.maku.system.vo.role.SysRolePutVO;
import net.maku.system.vo.role.SysRoleVO;
import net.maku.system.vo.SysRoleVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
@ -13,11 +11,9 @@ import java.util.List;
public interface SysRoleConvert {
SysRoleConvert INSTANCE = Mappers.getMapper(SysRoleConvert.class);
SysRoleEntity convert(SysRolePostVO vo);
SysRoleEntity convert(SysRolePutVO vo);
SysRoleVO convert(SysRoleEntity entity);
SysRoleEntity convert(SysRoleVO vo);
List<SysRoleVO> convertList(List<SysRoleEntity> list);

10
fast-boot-system/src/main/java/net/maku/system/convert/SysUserConvert.java
View File

@ -2,9 +2,7 @@ package net.maku.system.convert;
import net.maku.framework.security.user.UserDetail;
import net.maku.system.entity.SysUserEntity;
import net.maku.system.vo.user.SysUserPostVO;
import net.maku.system.vo.user.SysUserPutVO;
import net.maku.system.vo.user.SysUserVO;
import net.maku.system.vo.SysUserVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
@ -15,12 +13,10 @@ import java.util.List;
public interface SysUserConvert {
SysUserConvert INSTANCE = Mappers.getMapper(SysUserConvert.class);
SysUserEntity convert(SysUserPostVO vo);
SysUserEntity convert(SysUserPutVO vo);
SysUserVO convert(SysUserEntity entity);
SysUserEntity convert(SysUserVO vo);
SysUserVO convert(UserDetail userDetail);
UserDetail convertDetail(SysUserEntity entity);

2
fast-boot-system/src/main/java/net/maku/system/vo/dict/data/SysDictDataQuery.java → fast-boot-system/src/main/java/net/maku/system/query/SysDictDataQuery.java
View File

@ -1,4 +1,4 @@
package net.maku.system.vo.dict.data;
package net.maku.system.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
fast-boot-system/src/main/java/net/maku/system/vo/dict/type/SysDictTypeQuery.java → fast-boot-system/src/main/java/net/maku/system/query/SysDictTypeQuery.java
View File

@ -1,4 +1,4 @@
package net.maku.system.vo.dict.type;
package net.maku.system.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
fast-boot-system/src/main/java/net/maku/system/vo/post/SysPostQuery.java → fast-boot-system/src/main/java/net/maku/system/query/SysPostQuery.java
View File

@ -1,4 +1,4 @@
package net.maku.system.vo.post;
package net.maku.system.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
fast-boot-system/src/main/java/net/maku/system/vo/role/SysRoleQuery.java → fast-boot-system/src/main/java/net/maku/system/query/SysRoleQuery.java
View File

@ -1,4 +1,4 @@
package net.maku.system.vo.role;
package net.maku.system.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
fast-boot-system/src/main/java/net/maku/system/vo/user/SysUserQuery.java → fast-boot-system/src/main/java/net/maku/system/query/SysUserQuery.java
View File

@ -1,4 +1,4 @@
package net.maku.system.vo.user;
package net.maku.system.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

10
fast-boot-system/src/main/java/net/maku/system/service/SysDictDataService.java
View File

@ -3,10 +3,8 @@ package net.maku.system.service;
import net.maku.framework.common.page.PageResult;
import net.maku.framework.common.service.BaseService;
import net.maku.system.entity.SysDictDataEntity;
import net.maku.system.vo.dict.data.SysDictDataPostVO;
import net.maku.system.vo.dict.data.SysDictDataPutVO;
import net.maku.system.vo.dict.data.SysDictDataQuery;
import net.maku.system.vo.dict.data.SysDictDataVO;
import net.maku.system.query.SysDictDataQuery;
import net.maku.system.vo.SysDictDataVO;
import java.util.List;
@ -19,9 +17,9 @@ public interface SysDictDataService extends BaseService<SysDictDataEntity> {
PageResult<SysDictDataVO> page(SysDictDataQuery query);
void save(SysDictDataPostVO vo);
void save(SysDictDataVO vo);
void update(SysDictDataPutVO vo);
void update(SysDictDataVO vo);
void delete(List<Long> idList);

12
fast-boot-system/src/main/java/net/maku/system/service/SysDictTypeService.java
View File

@ -3,11 +3,9 @@ package net.maku.system.service;
import net.maku.framework.common.page.PageResult;
import net.maku.framework.common.service.BaseService;
import net.maku.system.entity.SysDictTypeEntity;
import net.maku.system.vo.dict.SysDictVO;
import net.maku.system.vo.dict.type.SysDictTypePostVO;
import net.maku.system.vo.dict.type.SysDictTypePutVO;
import net.maku.system.vo.dict.type.SysDictTypeQuery;
import net.maku.system.vo.dict.type.SysDictTypeVO;
import net.maku.system.vo.SysDictVO;
import net.maku.system.query.SysDictTypeQuery;
import net.maku.system.vo.SysDictTypeVO;
import java.util.List;
@ -20,9 +18,9 @@ public interface SysDictTypeService extends BaseService<SysDictTypeEntity> {
PageResult<SysDictTypeVO> page(SysDictTypeQuery query);
void save(SysDictTypePostVO vo);
void save(SysDictTypeVO vo);
void update(SysDictTypePutVO vo);
void update(SysDictTypeVO vo);
void delete(List<Long> idList);

8
fast-boot-system/src/main/java/net/maku/system/service/SysMenuService.java
View File

@ -3,9 +3,7 @@ package net.maku.system.service;
import net.maku.framework.common.service.BaseService;
import net.maku.framework.security.user.UserDetail;
import net.maku.system.entity.SysMenuEntity;
import net.maku.system.vo.menu.SysMenuPostVO;
import net.maku.system.vo.menu.SysMenuPutVO;
import net.maku.system.vo.menu.SysMenuVO;
import net.maku.system.vo.SysMenuVO;
import java.util.List;
import java.util.Set;
@ -18,9 +16,9 @@ import java.util.Set;
*/
public interface SysMenuService extends BaseService<SysMenuEntity> {
void save(SysMenuPostVO vo);
void save(SysMenuVO vo);
void update(SysMenuPutVO vo);
void update(SysMenuVO vo);
void delete(Long id);

8
fast-boot-system/src/main/java/net/maku/system/service/SysOauthClientService.java
View File

@ -4,9 +4,7 @@ import net.maku.framework.common.page.PageResult;
import net.maku.framework.common.query.Query;
import net.maku.framework.common.service.BaseService;
import net.maku.system.entity.SysOauthClientEntity;
import net.maku.system.vo.oauth.SysOauthClientPostVO;
import net.maku.system.vo.oauth.SysOauthClientPutVO;
import net.maku.system.vo.oauth.SysOauthClientVO;
import net.maku.system.vo.SysOauthClientVO;
import java.util.List;
@ -19,9 +17,9 @@ public interface SysOauthClientService extends BaseService<SysOauthClientEntity>
PageResult<SysOauthClientVO> page(Query query);
void save(SysOauthClientPostVO vo);
void save(SysOauthClientVO vo);
void update(SysOauthClientPutVO vo);
void update(SysOauthClientVO vo);
void delete(List<Long> idList);
}

8
fast-boot-system/src/main/java/net/maku/system/service/SysOrgService.java
View File

@ -2,9 +2,7 @@ package net.maku.system.service;
import net.maku.framework.common.service.BaseService;
import net.maku.system.entity.SysOrgEntity;
import net.maku.system.vo.org.SysOrgPostVO;
import net.maku.system.vo.org.SysOrgPutVO;
import net.maku.system.vo.org.SysOrgVO;
import net.maku.system.vo.SysOrgVO;
import java.util.List;
@ -17,9 +15,9 @@ public interface SysOrgService extends BaseService<SysOrgEntity> {
List<SysOrgVO> getList();
void save(SysOrgPostVO vo);
void save(SysOrgVO vo);
void update(SysOrgPutVO vo);
void update(SysOrgVO vo);
void delete(Long id);

10
fast-boot-system/src/main/java/net/maku/system/service/SysPostService.java
View File

@ -3,10 +3,8 @@ package net.maku.system.service;
import net.maku.framework.common.page.PageResult;
import net.maku.framework.common.service.BaseService;
import net.maku.system.entity.SysPostEntity;
import net.maku.system.vo.post.SysPostPostVO;
import net.maku.system.vo.post.SysPostPutVO;
import net.maku.system.vo.post.SysPostQuery;
import net.maku.system.vo.post.SysPostVO;
import net.maku.system.query.SysPostQuery;
import net.maku.system.vo.SysPostVO;
import java.util.List;
@ -21,9 +19,9 @@ public interface SysPostService extends BaseService<SysPostEntity> {
List<SysPostVO> getList();
void save(SysPostPostVO vo);
void save(SysPostVO vo);
void update(SysPostPutVO vo);
void update(SysPostVO vo);
void delete(List<Long> idList);
}

10
fast-boot-system/src/main/java/net/maku/system/service/SysRoleService.java
View File

@ -3,10 +3,8 @@ package net.maku.system.service;
import net.maku.framework.common.page.PageResult;
import net.maku.framework.common.service.BaseService;
import net.maku.system.entity.SysRoleEntity;
import net.maku.system.vo.role.SysRolePostVO;
import net.maku.system.vo.role.SysRolePutVO;
import net.maku.system.vo.role.SysRoleQuery;
import net.maku.system.vo.role.SysRoleVO;
import net.maku.system.query.SysRoleQuery;
import net.maku.system.vo.SysRoleVO;
import java.util.List;
@ -21,9 +19,9 @@ public interface SysRoleService extends BaseService<SysRoleEntity> {
List<SysRoleVO> getList(SysRoleQuery query);
void save(SysRolePostVO vo);
void save(SysRoleVO vo);
void update(SysRolePutVO vo);
void update(SysRoleVO vo);
void delete(List<Long> idList);
}

10
fast-boot-system/src/main/java/net/maku/system/service/SysUserService.java
View File

@ -3,10 +3,8 @@ package net.maku.system.service;
import net.maku.framework.common.page.PageResult;
import net.maku.framework.common.service.BaseService;
import net.maku.system.entity.SysUserEntity;
import net.maku.system.vo.user.SysUserPostVO;
import net.maku.system.vo.user.SysUserPutVO;
import net.maku.system.vo.user.SysUserQuery;
import net.maku.system.vo.user.SysUserVO;
import net.maku.system.query.SysUserQuery;
import net.maku.system.vo.SysUserVO;
import java.util.List;
@ -19,9 +17,9 @@ public interface SysUserService extends BaseService<SysUserEntity> {
PageResult<SysUserVO> page(SysUserQuery query);
void save(SysUserPostVO vo);
void save(SysUserVO vo);
void update(SysUserPutVO vo);
void update(SysUserVO vo);
void delete(List<Long> idList);

10
fast-boot-system/src/main/java/net/maku/system/service/impl/SysDictDataServiceImpl.java
View File

@ -9,10 +9,8 @@ import net.maku.system.convert.SysDictDataConvert;
import net.maku.system.dao.SysDictDataDao;
import net.maku.system.entity.SysDictDataEntity;
import net.maku.system.service.SysDictDataService;
import net.maku.system.vo.dict.data.SysDictDataPostVO;
import net.maku.system.vo.dict.data.SysDictDataPutVO;
import net.maku.system.vo.dict.data.SysDictDataQuery;
import net.maku.system.vo.dict.data.SysDictDataVO;
import net.maku.system.query.SysDictDataQuery;
import net.maku.system.vo.SysDictDataVO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -44,7 +42,7 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
@Override
@Transactional(rollbackFor = Exception.class)
public void save(SysDictDataPostVO vo) {
public void save(SysDictDataVO vo) {
SysDictDataEntity entity = SysDictDataConvert.INSTANCE.convert(vo);
baseMapper.insert(entity);
@ -52,7 +50,7 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
@Override
@Transactional(rollbackFor = Exception.class)
public void update(SysDictDataPutVO vo) {
public void update(SysDictDataVO vo) {
SysDictDataEntity entity = SysDictDataConvert.INSTANCE.convert(vo);
updateById(entity);

12
fast-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java
View File

@ -13,11 +13,9 @@ import net.maku.system.dao.SysDictTypeDao;
import net.maku.system.entity.SysDictDataEntity;
import net.maku.system.entity.SysDictTypeEntity;
import net.maku.system.service.SysDictTypeService;
import net.maku.system.vo.dict.SysDictVO;
import net.maku.system.vo.dict.type.SysDictTypePostVO;
import net.maku.system.vo.dict.type.SysDictTypePutVO;
import net.maku.system.vo.dict.type.SysDictTypeQuery;
import net.maku.system.vo.dict.type.SysDictTypeVO;
import net.maku.system.vo.SysDictVO;
import net.maku.system.query.SysDictTypeQuery;
import net.maku.system.vo.SysDictTypeVO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -51,7 +49,7 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysD
@Override
@Transactional(rollbackFor = Exception.class)
public void save(SysDictTypePostVO vo) {
public void save(SysDictTypeVO vo) {
SysDictTypeEntity entity = SysDictTypeConvert.INSTANCE.convert(vo);
baseMapper.insert(entity);
@ -59,7 +57,7 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysD
@Override
@Transactional(rollbackFor = Exception.class)
public void update(SysDictTypePutVO vo) {
public void update(SysDictTypeVO vo) {
SysDictTypeEntity entity = SysDictTypeConvert.INSTANCE.convert(vo);
updateById(entity);

8
fast-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java
View File

@ -14,9 +14,7 @@ import net.maku.system.entity.SysMenuEntity;
import net.maku.system.enums.SuperAdminEnum;
import net.maku.system.service.SysMenuService;
import net.maku.system.service.SysRoleMenuService;
import net.maku.system.vo.menu.SysMenuPostVO;
import net.maku.system.vo.menu.SysMenuPutVO;
import net.maku.system.vo.menu.SysMenuVO;
import net.maku.system.vo.SysMenuVO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -37,7 +35,7 @@ public class SysMenuServiceImpl extends BaseServiceImpl<SysMenuDao, SysMenuEntit
@Override
@Transactional(rollbackFor = Exception.class)
public void save(SysMenuPostVO vo) {
public void save(SysMenuVO vo) {
SysMenuEntity entity = SysMenuConvert.INSTANCE.convert(vo);
// 保存菜单
@ -46,7 +44,7 @@ public class SysMenuServiceImpl extends BaseServiceImpl<SysMenuDao, SysMenuEntit
@Override
@Transactional(rollbackFor = Exception.class)
public void update(SysMenuPutVO vo) {
public void update(SysMenuVO vo) {
SysMenuEntity entity = SysMenuConvert.INSTANCE.convert(vo);
// 上级菜单不能为自己

8
fast-boot-system/src/main/java/net/maku/system/service/impl/SysOauthClientServiceImpl.java
View File

@ -9,9 +9,7 @@ import net.maku.system.convert.SysOauthClientConvert;
import net.maku.system.dao.SysOauthClientDao;
import net.maku.system.entity.SysOauthClientEntity;
import net.maku.system.service.SysOauthClientService;
import net.maku.system.vo.oauth.SysOauthClientPostVO;
import net.maku.system.vo.oauth.SysOauthClientPutVO;
import net.maku.system.vo.oauth.SysOauthClientVO;
import net.maku.system.vo.SysOauthClientVO;
import org.springframework.stereotype.Service;
import java.util.List;
@ -33,7 +31,7 @@ public class SysOauthClientServiceImpl extends BaseServiceImpl<SysOauthClientDao
}
@Override
public void save(SysOauthClientPostVO vo) {
public void save(SysOauthClientVO vo) {
SysOauthClientEntity entity = SysOauthClientConvert.INSTANCE.convert(vo);
//entity.setAuthorizedGrantTypes(JsonUtils.toJsonString(vo.getAuthorizedGrantTypes()));
@ -41,7 +39,7 @@ public class SysOauthClientServiceImpl extends BaseServiceImpl<SysOauthClientDao
}
@Override
public void update(SysOauthClientPutVO vo) {
public void update(SysOauthClientVO vo) {
SysOauthClientEntity entity = SysOauthClientConvert.INSTANCE.convert(vo);
updateById(entity);

8
fast-boot-system/src/main/java/net/maku/system/service/impl/SysOrgServiceImpl.java
View File

@ -12,9 +12,7 @@ import net.maku.system.dao.SysUserDao;
import net.maku.system.entity.SysOrgEntity;
import net.maku.system.entity.SysUserEntity;
import net.maku.system.service.SysOrgService;
import net.maku.system.vo.org.SysOrgPostVO;
import net.maku.system.vo.org.SysOrgPutVO;
import net.maku.system.vo.org.SysOrgVO;
import net.maku.system.vo.SysOrgVO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -48,7 +46,7 @@ public class SysOrgServiceImpl extends BaseServiceImpl<SysOrgDao, SysOrgEntity>
@Override
@Transactional(rollbackFor = Exception.class)
public void save(SysOrgPostVO vo) {
public void save(SysOrgVO vo) {
SysOrgEntity entity = SysOrgConvert.INSTANCE.convert(vo);
baseMapper.insert(entity);
@ -56,7 +54,7 @@ public class SysOrgServiceImpl extends BaseServiceImpl<SysOrgDao, SysOrgEntity>
@Override
@Transactional(rollbackFor = Exception.class)
public void update(SysOrgPutVO vo) {
public void update(SysOrgVO vo) {
SysOrgEntity entity = SysOrgConvert.INSTANCE.convert(vo);
// 上级机构不能为自身

10
fast-boot-system/src/main/java/net/maku/system/service/impl/SysPostServiceImpl.java
View File

@ -11,10 +11,8 @@ import net.maku.system.dao.SysPostDao;
import net.maku.system.entity.SysPostEntity;
import net.maku.system.service.SysPostService;
import net.maku.system.service.SysUserPostService;
import net.maku.system.vo.post.SysPostPostVO;
import net.maku.system.vo.post.SysPostPutVO;
import net.maku.system.vo.post.SysPostQuery;
import net.maku.system.vo.post.SysPostVO;
import net.maku.system.query.SysPostQuery;
import net.maku.system.vo.SysPostVO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -58,14 +56,14 @@ public class SysPostServiceImpl extends BaseServiceImpl<SysPostDao, SysPostEntit
}
@Override
public void save(SysPostPostVO vo) {
public void save(SysPostVO vo) {
SysPostEntity entity = SysPostConvert.INSTANCE.convert(vo);
baseMapper.insert(entity);
}
@Override
public void update(SysPostPutVO vo) {
public void update(SysPostVO vo) {
SysPostEntity entity = SysPostConvert.INSTANCE.convert(vo);
updateById(entity);

10
fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java
View File

@ -13,10 +13,8 @@ import net.maku.system.service.SysRoleDataScopeService;
import net.maku.system.service.SysRoleMenuService;
import net.maku.system.service.SysRoleService;
import net.maku.system.service.SysUserRoleService;
import net.maku.system.vo.role.SysRolePostVO;
import net.maku.system.vo.role.SysRolePutVO;
import net.maku.system.vo.role.SysRoleQuery;
import net.maku.system.vo.role.SysRoleVO;
import net.maku.system.query.SysRoleQuery;
import net.maku.system.vo.SysRoleVO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -60,7 +58,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
@Override
@Transactional(rollbackFor = Exception.class)
public void save(SysRolePostVO vo) {
public void save(SysRoleVO vo) {
SysRoleEntity entity = SysRoleConvert.INSTANCE.convert(vo);
// 保存角色
@ -75,7 +73,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
@Override
@Transactional(rollbackFor = Exception.class)
public void update(SysRolePutVO vo) {
public void update(SysRoleVO vo) {
SysRoleEntity entity = SysRoleConvert.INSTANCE.convert(vo);
// 更新角色

10
fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java
View File

@ -13,10 +13,8 @@ import net.maku.system.enums.SuperAdminEnum;
import net.maku.system.service.SysUserPostService;
import net.maku.system.service.SysUserRoleService;
import net.maku.system.service.SysUserService;
import net.maku.system.vo.user.SysUserPostVO;
import net.maku.system.vo.user.SysUserPutVO;
import net.maku.system.vo.user.SysUserQuery;
import net.maku.system.vo.user.SysUserVO;
import net.maku.system.query.SysUserQuery;
import net.maku.system.vo.SysUserVO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -64,7 +62,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
@Override
@Transactional(rollbackFor = Exception.class)
public void save(SysUserPostVO vo) {
public void save(SysUserVO vo) {
SysUserEntity entity = SysUserConvert.INSTANCE.convert(vo);
entity.setSuperAdmin(SuperAdminEnum.NO.getValue());
@ -91,7 +89,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
}
@Override
public void update(SysUserPutVO vo) {
public void update(SysUserVO vo) {
SysUserEntity entity = SysUserConvert.INSTANCE.convert(vo);
// 判断用户名是否存在

22
fast-boot-system/src/main/java/net/maku/system/vo/dict/data/SysDictDataPostVO.java → fast-boot-system/src/main/java/net/maku/system/vo/SysDictDataVO.java
View File

@ -1,12 +1,15 @@
package net.maku.system.vo.dict.data;
package net.maku.system.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import net.maku.framework.common.utils.DateUtils;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
/**
* 字典数据
@ -14,9 +17,12 @@ import java.io.Serializable;
* @author 阿沐 babamu@126.com
*/
@Data
@Schema(description = "字典数据新增")
public class SysDictDataPostVO implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "字典数据")
public class SysDictDataVO implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "id")
private Long id;
@Schema(description = "字典类型ID", required = true)
@NotNull(message = "字典类型ID不能为空")
@ -35,4 +41,12 @@ public class SysDictDataPostVO implements Serializable {
@Schema(description = "排序", required = true)
@Min(value = 0, message = "排序值不能小于0")
private Integer sort;
@Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime;
@Schema(description = "更新时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date updateTime;
}

22
fast-boot-system/src/main/java/net/maku/system/vo/dict/type/SysDictTypePostVO.java → fast-boot-system/src/main/java/net/maku/system/vo/SysDictTypeVO.java
View File

@ -1,11 +1,14 @@
package net.maku.system.vo.dict.type;
package net.maku.system.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import net.maku.framework.common.utils.DateUtils;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
/**
* 字典类型
@ -13,9 +16,12 @@ import java.io.Serializable;
* @author 阿沐 babamu@126.com
*/
@Data
@Schema(description = "字典类型新增")
public class SysDictTypePostVO implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "字典类型")
public class SysDictTypeVO implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "id")
private Long id;
@Schema(description = "字典类型", required = true)
@NotBlank(message = "字典类型不能为空")
@ -31,4 +37,12 @@ public class SysDictTypePostVO implements Serializable {
@Schema(description = "排序", required = true)
@Min(value = 0, message = "排序值不能小于0")
private Integer sort;
@Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime;
@Schema(description = "更新时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date updateTime;
}

2
fast-boot-system/src/main/java/net/maku/system/vo/dict/SysDictVO.java → fast-boot-system/src/main/java/net/maku/system/vo/SysDictVO.java
View File

@ -1,4 +1,4 @@
package net.maku.system.vo.dict;
package net.maku.system.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;

14
fast-boot-system/src/main/java/net/maku/system/vo/menu/SysMenuVO.java → fast-boot-system/src/main/java/net/maku/system/vo/SysMenuVO.java
View File

@ -1,4 +1,4 @@
package net.maku.system.vo.menu;
package net.maku.system.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
@ -6,7 +6,10 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import net.maku.framework.common.utils.DateUtils;
import net.maku.framework.common.utils.TreeNode;
import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
@ -18,22 +21,20 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Schema(description = "菜单")
public class SysMenuVO extends TreeNode<SysMenuVO> {
@Schema(description = "id")
private Long id;
@Schema(description = "上级ID")
private Long pid;
@Schema(description = "菜单名称")
@NotBlank(message = "菜单名称不能为空")
private String name;
@Schema(description = "菜单URL")
private String url;
@Schema(description = "类型 0：菜单 1：按钮 2：接口")
@Range(min = 0, max = 2, message = "类型不正确")
private Integer type;
@Schema(description = "打开方式 0：内部 1：外部")
@Range(min = 0, max = 1, message = "打开方式不正确")
private Integer openStyle;
@Schema(description = "菜单图标")
@ -43,6 +44,7 @@ public class SysMenuVO extends TreeNode<SysMenuVO> {
private String authority;
@Schema(description = "排序")
@Min(value = 0, message = "排序值不能小于0")
private Integer sort;
@Schema(description = "创建时间")

18
fast-boot-system/src/main/java/net/maku/system/vo/oauth/SysOauthClientPostVO.java → fast-boot-system/src/main/java/net/maku/system/vo/SysOauthClientVO.java
View File

@ -1,22 +1,28 @@
package net.maku.system.vo.oauth;
package net.maku.system.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import net.maku.framework.common.utils.DateUtils;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
/**
* 客户端管理 新增
* 客户端管理
*
* @author 阿沐 babamu@126.com
*/
@Data
@Schema(description = "客户端管理新增")
public class SysOauthClientPostVO implements Serializable {
@Schema(description = "客户端管理")
public class SysOauthClientVO implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "id", required = true)
private Long id;
@Schema(description = "客户端ID", required = true)
@NotBlank(message = "客户端ID不能为空")
private String clientId;
@ -55,4 +61,8 @@ public class SysOauthClientPostVO implements Serializable {
@Schema(description = "自动授权", required = true)
@NotBlank(message = "自动授权不能为空")
private String autoapprove;
@Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime;
}

15
fast-boot-system/src/main/java/net/maku/system/vo/org/SysOrgVO.java → fast-boot-system/src/main/java/net/maku/system/vo/SysOrgVO.java
View File

@ -1,4 +1,4 @@
package net.maku.system.vo.org;
package net.maku.system.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
@ -7,6 +7,8 @@ import lombok.EqualsAndHashCode;
import net.maku.framework.common.utils.DateUtils;
import net.maku.framework.common.utils.TreeNode;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
@ -18,16 +20,13 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Schema(description = "机构")
public class SysOrgVO extends TreeNode<SysOrgVO> {
@Schema(description = "id")
private Long id;
@Schema(description = "上级ID")
private Long pid;
@Schema(description = "机构名称")
@Schema(description = "机构名称", required = true)
@NotBlank(message = "机构名称不能为空")
private String name;
@Schema(description = "排序")
@Schema(description = "排序", required = true)
@Min(value = 0, message = "排序值不能小于0")
private Integer sort;
@Schema(description = "创建时间")

16
fast-boot-system/src/main/java/net/maku/system/vo/post/SysPostPostVO.java → fast-boot-system/src/main/java/net/maku/system/vo/SysPostVO.java
View File

@ -1,12 +1,15 @@
package net.maku.system.vo.post;
package net.maku.system.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import net.maku.framework.common.utils.DateUtils;
import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
/**
* 岗位管理
@ -14,10 +17,13 @@ import java.io.Serializable;
* @author 阿沐 babamu@126.com
*/
@Data
@Schema(description = "岗位管理新增")
public class SysPostPostVO implements Serializable {
@Schema(description = "岗位管理")
public class SysPostVO implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "id")
private Long id;
@Schema(description = "岗位编码", required = true)
@NotBlank(message = "岗位编码不能为空")
private String postCode;
@ -34,4 +40,8 @@ public class SysPostPostVO implements Serializable {
@Range(min = 0, max = 1, message = "状态不正确")
private Integer status;
@Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime;
}

18
fast-boot-system/src/main/java/net/maku/system/vo/role/SysRolePostVO.java → fast-boot-system/src/main/java/net/maku/system/vo/SysRoleVO.java
View File

@ -1,10 +1,13 @@
package net.maku.system.vo.role;
package net.maku.system.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import net.maku.framework.common.utils.DateUtils;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
@ -13,9 +16,12 @@ import java.util.List;
* @author 阿沐 babamu@126.com
*/
@Data
@Schema(description = "角色新增")
public class SysRolePostVO implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "角色")
public class SysRoleVO implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "id")
private Long id;
@Schema(description = "角色名称")
@NotBlank(message = "角色名称不能为空")
@ -33,4 +39,8 @@ public class SysRolePostVO implements Serializable {
@Schema(description = "机构ID列表")
private List<Long> orgIdList;
@Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime;
}

2
fast-boot-system/src/main/java/net/maku/system/vo/user/SysUserPasswordVO.java → fast-boot-system/src/main/java/net/maku/system/vo/SysUserPasswordVO.java
View File

@ -1,4 +1,4 @@
package net.maku.system.vo.user;
package net.maku.system.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

23
fast-boot-system/src/main/java/net/maku/system/vo/user/SysUserPostVO.java → fast-boot-system/src/main/java/net/maku/system/vo/SysUserVO.java
View File

@ -1,26 +1,32 @@
package net.maku.system.vo.user;
package net.maku.system.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import net.maku.framework.common.utils.DateUtils;
import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 用户新增
* 用户
*
* @author 阿沐 babamu@126.com
*/
@Data
@Schema(description = "用户新增")
public class SysUserPostVO implements Serializable {
@Schema(description = "用户")
public class SysUserVO implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "id")
private Long id;
@Schema(description = "用户名", required = true)
@NotBlank(message = "用户名不能为空")
private String username;
@ -62,4 +68,13 @@ public class SysUserPostVO implements Serializable {
@Schema(description = "岗位ID列表")
private List<Long> postIdList;
@Schema(description = "超级管理员 0：否 1：是")
private Integer superAdmin;
@Schema(description = "机构名称")
private String orgName;
@Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime;
}

22
fast-boot-system/src/main/java/net/maku/system/vo/dict/data/SysDictDataPutVO.java
View File

@ -1,22 +0,0 @@
package net.maku.system.vo.dict.data;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
/**
* 字典数据
*
* @author 阿沐 babamu@126.com
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description = "字典数据更新")
public class SysDictDataPutVO extends SysDictDataPostVO {
@Schema(description = "id", required = true)
@NotNull(message = "id不能为空")
private Long id;
}

30
fast-boot-system/src/main/java/net/maku/system/vo/dict/data/SysDictDataVO.java
View File

@ -1,30 +0,0 @@
package net.maku.system.vo.dict.data;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import net.maku.framework.common.utils.DateUtils;
import java.util.Date;
/**
* 字典数据
*
* @author 阿沐 babamu@126.com
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "字典数据")
public class SysDictDataVO extends SysDictDataPostVO {
@Schema(description = "id")
private Long id;
@Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime;
@Schema(description = "更新时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date updateTime;
}

22
fast-boot-system/src/main/java/net/maku/system/vo/dict/type/SysDictTypePutVO.java
View File

@ -1,22 +0,0 @@
package net.maku.system.vo.dict.type;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
/**
* 字典类型
*
* @author 阿沐 babamu@126.com
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "字典类型更新")
public class SysDictTypePutVO extends SysDictTypePostVO {
@Schema(description = "id", required = true)
@NotNull(message = "id不能为空")
private Long id;
}

30
fast-boot-system/src/main/java/net/maku/system/vo/dict/type/SysDictTypeVO.java
View File

@ -1,30 +0,0 @@
package net.maku.system.vo.dict.type;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import net.maku.framework.common.utils.DateUtils;
import java.util.Date;
/**
* 字典类型
*
* @author 阿沐 babamu@126.com
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "字典类型")
public class SysDictTypeVO extends SysDictTypePostVO {
@Schema(description = "id")
private Long id;
@Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime;
@Schema(description = "更新时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date updateTime;
}

50
fast-boot-system/src/main/java/net/maku/system/vo/menu/SysMenuPostVO.java
View File

@ -1,50 +0,0 @@
package net.maku.system.vo.menu;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 菜单管理
*
* @author 阿沐 babamu@126.com
*/
@Data
@Schema(description = "菜单新增")
public class SysMenuPostVO implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "上级ID")
@NotNull(message = "上级ID不能为空")
private Long pid;
@Schema(description = "菜单名称")
@NotBlank(message = "菜单名称不能为空")
private String name;
@Schema(description = "菜单URL")
private String url;
@Schema(description = "类型 0：菜单 1：按钮 2：接口")
@Range(min = 0, max = 2, message = "类型不正确")
private Integer type;
@Schema(description = "打开方式 0：内部 1：外部")
@Range(min = 0, max = 1, message = "打开方式不正确")
private Integer openStyle;
@Schema(description = "菜单图标")
private String icon;
@Schema(description = "授权标识(多个用逗号分隔，如：sys:menu:list,sys:menu:save)")
private String authority;
@Schema(description = "排序")
@Min(value = 0, message = "排序值不能小于0")
private Integer sort;
}

22
fast-boot-system/src/main/java/net/maku/system/vo/menu/SysMenuPutVO.java
View File

@ -1,22 +0,0 @@
package net.maku.system.vo.menu;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
/**
* 菜单管理
*
* @author 阿沐 babamu@126.com
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "菜单更新")
public class SysMenuPutVO extends SysMenuPostVO {
@Schema(description = "id", required = true)
@NotNull(message = "id不能为空")
private Long id;
}

22
fast-boot-system/src/main/java/net/maku/system/vo/oauth/SysOauthClientPutVO.java
View File

@ -1,22 +0,0 @@
package net.maku.system.vo.oauth;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
/**
* 客户端管理 更新
*
* @author 阿沐 babamu@126.com
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "客户端管理更新")
public class SysOauthClientPutVO extends SysOauthClientPostVO {
@Schema(description = "id", required = true)
@NotNull(message = "id不能为空")
private Long id;
}

26
fast-boot-system/src/main/java/net/maku/system/vo/oauth/SysOauthClientVO.java
View File

@ -1,26 +0,0 @@
package net.maku.system.vo.oauth;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import net.maku.framework.common.utils.DateUtils;
import java.util.Date;
/**
* 客户端管理
*
* @author 阿沐 babamu@126.com
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "客户端管理")
public class SysOauthClientVO extends SysOauthClientPostVO {
@Schema(description = "id", required = true)
private Long id;
@Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime;
}

33
fast-boot-system/src/main/java/net/maku/system/vo/org/SysOrgPostVO.java
View File

@ -1,33 +0,0 @@
package net.maku.system.vo.org;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 机构
*
* @author 阿沐 babamu@126.com
*/
@Data
@Schema(description = "机构新增")
public class SysOrgPostVO implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "上级ID", required = true)
@NotNull(message = "上级ID不能为空")
private Long pid;
@Schema(description = "机构名称", required = true)
@NotBlank(message = "机构名称不能为空")
private String name;
@Schema(description = "排序", required = true)
@Min(value = 0, message = "排序值不能小于0")
private Integer sort;
}

22
fast-boot-system/src/main/java/net/maku/system/vo/org/SysOrgPutVO.java
View File

@ -1,22 +0,0 @@
package net.maku.system.vo.org;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
/**
* 机构更新
*
* @author 阿沐 babamu@126.com
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "机构更新")
public class SysOrgPutVO extends SysOrgPostVO {
@Schema(description = "id", required = true)
@NotNull(message = "ID不能为空")
private Long id;
}

22
fast-boot-system/src/main/java/net/maku/system/vo/post/SysPostPutVO.java
View File

@ -1,22 +0,0 @@
package net.maku.system.vo.post;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
/**
* 岗位管理
*
* @author 阿沐 babamu@126.com
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "岗位管理更新")
public class SysPostPutVO extends SysPostPostVO {
@Schema(description = "id", required = true)
@NotNull(message = "ID不能为空")
private Long id;
}

27
fast-boot-system/src/main/java/net/maku/system/vo/post/SysPostVO.java
View File

@ -1,27 +0,0 @@
package net.maku.system.vo.post;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import net.maku.framework.common.utils.DateUtils;
import java.util.Date;
/**
* 岗位管理
*
* @author 阿沐 babamu@126.com
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "岗位管理")
public class SysPostVO extends SysPostPostVO {
@Schema(description = "id")
private Long id;
@Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime;
}

22
fast-boot-system/src/main/java/net/maku/system/vo/role/SysRolePutVO.java
View File

@ -1,22 +0,0 @@
package net.maku.system.vo.role;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
/**
* 角色管理
*
* @author 阿沐 babamu@126.com
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "角色更新")
public class SysRolePutVO extends SysRolePostVO {
@Schema(description = "id", required = true)
@NotNull(message = "id不能为空")
private Long id;
}

27
fast-boot-system/src/main/java/net/maku/system/vo/role/SysRoleVO.java
View File

@ -1,27 +0,0 @@
package net.maku.system.vo.role;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import net.maku.framework.common.utils.DateUtils;
import java.util.Date;
/**
* 角色管理
*
* @author 阿沐 babamu@126.com
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "角色")
public class SysRoleVO extends SysRolePostVO {
@Schema(description = "id")
private Long id;
@Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime;
}

22
fast-boot-system/src/main/java/net/maku/system/vo/user/SysUserPutVO.java
View File

@ -1,22 +0,0 @@
package net.maku.system.vo.user;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
/**
* 用户更新
*
* @author 阿沐 babamu@126.com
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "用户更新")
public class SysUserPutVO extends SysUserPostVO {
@Schema(description = "id", required = true)
@NotNull(message = "id不能为空")
private Long id;
}

32
fast-boot-system/src/main/java/net/maku/system/vo/user/SysUserVO.java
View File

@ -1,32 +0,0 @@
package net.maku.system.vo.user;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import net.maku.framework.common.utils.DateUtils;
import java.util.Date;
/**
* 用户
*
* @author 阿沐 babamu@126.com
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "用户")
public class SysUserVO extends SysUserPostVO {
@Schema(description = "id")
private Long id;
@Schema(description = "超级管理员 0：否 1：是")
private Integer superAdmin;
@Schema(description = "机构名称")
private String orgName;
@Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime;
}