Skip to content

Commit 5e10229

Browse files
cadecodecadecode
committed
refactor: 包结构调整
1 parent 3096f9f commit 5e10229

6 files changed

Lines changed: 60 additions & 30 deletions

File tree

application/src/main/java/top/cadecode/uniboot/demo/controller/DynamicDsController.java renamed to application/src/main/java/top/cadecode/uniboot/controller/demo/DynamicDsController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package top.cadecode.uniboot.demo.controller;
1+
package top.cadecode.uniboot.controller.demo;
22

33
import com.baomidou.dynamic.datasource.annotation.DS;
44
import io.swagger.annotations.Api;

application/src/main/java/top/cadecode/uniboot/demo/controller/DynamicTpController.java renamed to application/src/main/java/top/cadecode/uniboot/controller/demo/DynamicTpController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package top.cadecode.uniboot.demo.controller;
1+
package top.cadecode.uniboot.controller.demo;
22

33
import com.dtp.core.thread.DtpExecutor;
44
import io.swagger.annotations.Api;

application/src/main/java/top/cadecode/uniboot/demo/controller/SpringRetryController.java renamed to application/src/main/java/top/cadecode/uniboot/controller/demo/SpringRetryController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package top.cadecode.uniboot.demo.controller;
1+
package top.cadecode.uniboot.controller.demo;
22

33
import io.swagger.annotations.Api;
44
import io.swagger.annotations.ApiOperation;

application/src/main/java/top/cadecode/uniboot/demo/controller/TtlExecutorController.java renamed to application/src/main/java/top/cadecode/uniboot/controller/demo/TtlExecutorController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package top.cadecode.uniboot.demo.controller;
1+
package top.cadecode.uniboot.controller.demo;
22

33
import com.alibaba.ttl.TransmittableThreadLocal;
44
import com.alibaba.ttl.threadpool.TtlExecutors;

‎application/src/main/java/top/cadecode/uniboot/controller/system/SysRoleController.java‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package top.cadecode.uniboot.controller.system;
2+
3+
import io.swagger.annotations.Api;
4+
import io.swagger.annotations.ApiOperation;
5+
import lombok.RequiredArgsConstructor;
6+
import lombok.extern.slf4j.Slf4j;
7+
import org.springframework.validation.annotation.Validated;
8+
import org.springframework.web.bind.annotation.PostMapping;
9+
import org.springframework.web.bind.annotation.RequestMapping;
10+
import org.springframework.web.bind.annotation.RestController;
11+
import top.cadecode.uniboot.common.annotation.ApiFormat;
12+
import top.cadecode.uniboot.system.bean.po.SysRole;
13+
import top.cadecode.uniboot.system.bean.vo.SysRoleVo.SysRoleListVo;
14+
import top.cadecode.uniboot.system.convert.SysRoleConvert;
15+
import top.cadecode.uniboot.system.service.SysRoleService;
16+
17+
import java.util.List;
18+
19+
/**
20+
* 角色管理API
21+
*
22+
* @author Cade Li
23+
* @since 2023/5/4
24+
*/
25+
@ApiFormat
26+
@Slf4j
27+
@RequiredArgsConstructor
28+
@Api(tags = "角色管理")
29+
@RequestMapping("system/role")
30+
@RestController
31+
@Validated
32+
public class SysRoleController {
33+
34+
private final SysRoleService sysRoleService;
35+
36+
@ApiOperation("查询角色列表")
37+
@PostMapping("list")
38+
public List<SysRoleListVo> roleList() {
39+
List<SysRole> roleList = sysRoleService.list();
40+
return SysRoleConvert.INSTANCE.poToListVo(roleList);
41+
}
42+
}

application/src/main/java/top/cadecode/uniboot/controller/SystemController.java renamed to application/src/main/java/top/cadecode/uniboot/controller/system/SysUserController.java

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package top.cadecode.uniboot.controller;
1+
package top.cadecode.uniboot.controller.system;
22

33
import cn.hutool.core.util.ObjectUtil;
44
import com.github.pagehelper.PageInfo;
@@ -19,14 +19,10 @@
1919
import top.cadecode.uniboot.framework.security.TokenAuthHolder;
2020
import top.cadecode.uniboot.system.bean.dto.SysUserDto.SysUserDetailsDto;
2121
import top.cadecode.uniboot.system.bean.dto.SysUserDto.SysUserInfoDto;
22-
import top.cadecode.uniboot.system.bean.po.SysRole;
2322
import top.cadecode.uniboot.system.bean.po.SysUser;
2423
import top.cadecode.uniboot.system.bean.vo.SysMenuVo.SysMenuTreeVo;
25-
import top.cadecode.uniboot.system.bean.vo.SysRoleVo.SysRoleListVo;
2624
import top.cadecode.uniboot.system.bean.vo.SysUserVo.SysUserRolesVo;
27-
import top.cadecode.uniboot.system.convert.SysRoleConvert;
2825
import top.cadecode.uniboot.system.convert.SysUserConvert;
29-
import top.cadecode.uniboot.system.service.SysApiService;
3026
import top.cadecode.uniboot.system.service.SysMenuService;
3127
import top.cadecode.uniboot.system.service.SysRoleService;
3228
import top.cadecode.uniboot.system.service.SysUserService;
@@ -38,40 +34,39 @@
3834
import static top.cadecode.uniboot.system.request.SysUserRequest.*;
3935

4036
/**
41-
* 系统管理API
37+
* 用户管理API
4238
*
4339
* @author Cade Li
4440
* @since 2023/4/12
4541
*/
4642
@ApiFormat
4743
@Slf4j
4844
@RequiredArgsConstructor
49-
@Api(tags = "系统管理")
50-
@RequestMapping("system")
45+
@Api(tags = "用户管理")
46+
@RequestMapping("system/user")
5147
@RestController
5248
@Validated
53-
public class SystemController {
49+
public class SysUserController {
5450

5551
private final SysUserService sysUserService;
5652
private final SysMenuService sysMenuService;
5753
private final SysRoleService sysRoleService;
58-
private final SysApiService sysApiService;
5954

6055
private final PasswordEncoder passwordEncoder;
6156

6257
/**
6358
* 获取用户信息
6459
*/
6560
@ApiOperation("获取用户信息")
66-
@PostMapping("user/get_info")
61+
@PostMapping("get_info")
6762
public SysUserInfoDto userGetInfo() {
6863
SysUserDetailsDto userDetails = TokenAuthHolder.getUserDetails(null);
6964
List<SysMenuTreeVo> sysMenuTreeVos = sysMenuService.listTreeVoByRoles(userDetails.getRoles());
7065
return SysUserInfoDto.builder().menuList(sysMenuTreeVos).build();
7166
}
7267

7368
@ApiOperation("修改用户信息（用户中心）")
74-
@PostMapping("user/modify_info")
69+
@PostMapping("modify_info")
7570
public boolean userModifyInfo(@RequestBody @Valid SysUserModifyInfoRequest request) {
7671
SysUserDetailsDto userDetails = TokenAuthHolder.getUserDetails(null);
7772
return sysUserService.lambdaUpdate()
@@ -84,7 +79,7 @@ public boolean userModifyInfo(@RequestBody @Valid SysUserModifyInfoRequest reque
8479
}
8580

8681
@ApiOperation("修改用户密码（用户中心）")
87-
@PostMapping("user/modify_pass")
82+
@PostMapping("modify_pass")
8883
public boolean userModifyPass(@RequestBody @Valid SysUserModifyPassRequest request) {
8984
SysUserDetailsDto userDetails = TokenAuthHolder.getUserDetails(null);
9085
SysUser sysUser = sysUserService.lambdaQuery().select(SysUser::getPassword)
@@ -103,14 +98,14 @@ public boolean userModifyPass(@RequestBody @Valid SysUserModifyPassRequest reque
10398
}
10499

105100
@ApiOperation("查询用户列表（带角色）")
106-
@PostMapping("user/page_roles_vo")
101+
@PostMapping("page_roles_vo")
107102
public PageResult<SysUserRolesVo> userPageRolesVo(@RequestBody @Valid SysUserRolesRequest request) {
108103
PageInfo<SysUserRolesVo> rolesVoPage = sysUserService.pageRolesVo(request);
109104
return new PageResult<>((int) rolesVoPage.getTotal(), rolesVoPage.getList());
110105
}
111106

112107
@ApiOperation("更新用户启用状态")
113-
@PostMapping("user/update_enable")
108+
@PostMapping("update_enable")
114109
public boolean userUpdateEnable(@RequestBody @Valid SysUserUpdateEnableRequest request) {
115110
return sysUserService.lambdaUpdate()
116111
.eq(SysUser::getId, request.getId())
@@ -119,7 +114,7 @@ public boolean userUpdateEnable(@RequestBody @Valid SysUserUpdateEnableRequest r
119114
}
120115

121116
@ApiOperation("更新用户")
122-
@PostMapping("user/update")
117+
@PostMapping("update")
123118
public boolean userUpdate(@RequestBody @Valid SysUserUpdateRequest request) {
124119
String encodePass = null;
125120
if (ObjectUtil.isNotEmpty(request.getPassword())) {
@@ -137,7 +132,7 @@ public boolean userUpdate(@RequestBody @Valid SysUserUpdateRequest request) {
137132
}
138133

139134
@ApiOperation("添加用户")
140-
@PostMapping("user/add")
135+
@PostMapping("add")
141136
public boolean userAdd(@RequestBody @Valid SysUserAddRequest request) {
142137
if (ObjectUtil.isNotEmpty(request.getPassword())) {
143138
request.setPassword(passwordEncoder.encode(request.getPassword()));
@@ -147,7 +142,7 @@ public boolean userAdd(@RequestBody @Valid SysUserAddRequest request) {
147142
}
148143

149144
@ApiOperation("删除用户（多选）")
150-
@PostMapping("user/delete")
145+
@PostMapping("delete")
151146
@Transactional(rollbackFor = Exception.class)
152147
public boolean userDelete(@RequestBody @NotEmpty List<Long> userIdList) {
153148
// 清理用户角色绑定关系
@@ -156,16 +151,9 @@ public boolean userDelete(@RequestBody @NotEmpty List<Long> userIdList) {
156151
}
157152

158153
@ApiOperation("获取用户（带角色）byUserIds")
159-
@PostMapping("user/list_roles_vo_by_user_ids")
154+
@PostMapping("list_roles_vo_by_user_ids")
160155
public List<SysUserRolesVo> userListRolesVoByUserIds(@RequestBody @NotEmpty List<Long> userIdList) {
161156
return sysUserService.listRolesVoByUserIds(userIdList);
162157
}
163158

164-
@ApiOperation("查询角色列表")
165-
@PostMapping("role/list")
166-
public List<SysRoleListVo> roleList() {
167-
List<SysRole> roleList = sysRoleService.list();
168-
return SysRoleConvert.INSTANCE.poToListVo(roleList);
169-
}
170-
171159
}

0 commit comments

Comments
 (0)