Skip to content

Commit 25ce08b

Browse files
author
pedro
authored
Merge pull request #20 from TaleLin/fix/file-extension
feat:规范化部分文件命名
2 parents ab8a733 + b830d26 commit 25ce08b

10 files changed

Lines changed: 32 additions & 41 deletions

File tree

src/main/java/io/github/talelin/merak/bo/GroupPermissionsBO.java renamed to src/main/java/io/github/talelin/merak/bo/GroupPermissionBO.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@Data
1111
@NoArgsConstructor
1212
@AllArgsConstructor
13-
public class GroupPermissionsBO {
13+
public class GroupPermissionBO {
1414
private Long id;
1515

1616
private String name;
@@ -19,7 +19,7 @@ public class GroupPermissionsBO {
1919

2020
private List permissions;
2121

22-
public GroupPermissionsBO(GroupDO group, List<PermissionDO> permissions) {
22+
public GroupPermissionBO(GroupDO group, List<PermissionDO> permissions) {
2323
BeanUtil.copyProperties(group, this);
2424
this.permissions = permissions;
2525
}

‎src/main/java/io/github/talelin/merak/controller/cms/AdminController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.baomidou.mybatisplus.core.metadata.IPage;
44
import io.github.talelin.core.annotation.AdminMeta;
5-
import io.github.talelin.merak.bo.GroupPermissionsBO;
5+
import io.github.talelin.merak.bo.GroupPermissionBO;
66
import io.github.talelin.merak.common.util.ResponseUtil;
77
import io.github.talelin.merak.model.PermissionDO;
88
import io.github.talelin.merak.model.UserDO;
@@ -104,8 +104,8 @@ public List<GroupDO> getAllGroup() {
104104

105105
@GetMapping("/group/{id}")
106106
@AdminMeta(permission = "查询一个权限组及其权限", module = "管理员")
107-
public GroupPermissionsBO getGroup(@PathVariable @Positive(message = "{id}") Long id) {
108-
GroupPermissionsBO groupPermissions = adminService.getGroup(id);
107+
public GroupPermissionBO getGroup(@PathVariable @Positive(message = "{id}") Long id) {
108+
GroupPermissionBO groupPermissions = adminService.getGroup(id);
109109
return groupPermissions;
110110
}
111111

‎src/main/java/io/github/talelin/merak/controller/cms/UserController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import io.github.talelin.merak.vo.UnifyResponseVO;
1010
import io.github.talelin.merak.model.UserDO;
1111
import io.github.talelin.merak.vo.UserInfoVO;
12-
import io.github.talelin.merak.vo.UserPermissionsVO;
12+
import io.github.talelin.merak.vo.UserPermissionVO;
1313
import io.github.talelin.merak.service.UserService;
1414
import io.github.talelin.core.token.DoubleJWT;
1515
import io.github.talelin.core.token.Tokens;
@@ -111,11 +111,11 @@ public Tokens getRefreshToken() {
111111
*/
112112
@GetMapping("/permissions")
113113
@LoginMeta(permission = "查询自己拥有的权限", module = "用户", mount = true)
114-
public UserPermissionsVO getPermissions() {
114+
public UserPermissionVO getPermissions() {
115115
UserDO user = LocalUser.getLocalUser();
116116
boolean admin = groupService.checkIsRootByUserId(user.getId());
117117
List<Map<String, List<Map<String, String>>>> permissions = userService.getStructualUserPermissions(user.getId());
118-
UserPermissionsVO userPermissions = new UserPermissionsVO(user, permissions);
118+
UserPermissionVO userPermissions = new UserPermissionVO(user, permissions);
119119
userPermissions.setAdmin(admin);
120120
return userPermissions;
121121
}

‎src/main/java/io/github/talelin/merak/service/AdminService.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
import com.baomidou.mybatisplus.core.metadata.IPage;
44
import io.github.talelin.merak.model.PermissionDO;
55
import io.github.talelin.merak.model.UserDO;
6-
import io.github.talelin.merak.bo.GroupPermissionsBO;
6+
import io.github.talelin.merak.bo.GroupPermissionBO;
77
import io.github.talelin.merak.dto.admin.*;
88
import io.github.talelin.merak.model.GroupDO;
9-
import io.github.talelin.merak.dto.admin.*;
109

1110
import java.util.List;
1211
import java.util.Map;
@@ -68,7 +67,7 @@ public interface AdminService {
6867
* @param id 分组id
6968
* @return 分组数据
7069
*/
71-
GroupPermissionsBO getGroup(Long id);
70+
GroupPermissionBO getGroup(Long id);
7271

7372
/**
7473
* 新建分组

‎src/main/java/io/github/talelin/merak/service/GroupService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.talelin.merak.service;
22

33
import com.baomidou.mybatisplus.core.metadata.IPage;
4-
import io.github.talelin.merak.bo.GroupPermissionsBO;
4+
import io.github.talelin.merak.bo.GroupPermissionBO;
55
import io.github.talelin.merak.model.GroupDO;
66
import com.baomidou.mybatisplus.extension.service.IService;
77

@@ -52,7 +52,7 @@ public interface GroupService extends IService<GroupDO> {
5252
* @param id 分组id
5353
* @return 分组及权限
5454
*/
55-
GroupPermissionsBO getGroupAndPermissions(Long id);
55+
GroupPermissionBO getGroupAndPermissions(Long id);
5656

5757
/**
5858
* 通过名称检查分组是否存在

‎src/main/java/io/github/talelin/merak/service/impl/AdminServiceImpl.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@
44
import com.baomidou.mybatisplus.core.metadata.IPage;
55
import io.github.talelin.merak.model.*;
66
import io.github.talelin.merak.service.*;
7-
import io.github.talelin.merak.bo.GroupPermissionsBO;
7+
import io.github.talelin.merak.bo.GroupPermissionBO;
88
import io.github.talelin.merak.common.mybatis.Page;
99
import io.github.talelin.merak.dto.admin.*;
1010
import io.github.talelin.merak.mapper.GroupPermissionMapper;
1111
import io.github.talelin.autoconfigure.exception.ForbiddenException;
1212
import io.github.talelin.autoconfigure.exception.NotFoundException;
13-
import io.github.talelin.merak.dto.admin.*;
14-
import io.github.talelin.merak.model.*;
15-
import io.github.talelin.merak.service.*;
1613
import org.springframework.beans.factory.annotation.Autowired;
1714
import org.springframework.beans.factory.annotation.Value;
1815
import org.springframework.stereotype.Service;
@@ -104,7 +101,7 @@ public IPage<GroupDO> getGroupPage(Long page, Long count) {
104101
}
105102

106103
@Override
107-
public GroupPermissionsBO getGroup(Long id) {
104+
public GroupPermissionBO getGroup(Long id) {
108105
throwGroupNotExistById(id);
109106
return groupService.getGroupAndPermissions(id);
110107
}

‎src/main/java/io/github/talelin/merak/service/impl/GroupServiceImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
44
import com.baomidou.mybatisplus.core.metadata.IPage;
5-
import io.github.talelin.merak.bo.GroupPermissionsBO;
5+
import io.github.talelin.merak.bo.GroupPermissionBO;
66
import io.github.talelin.merak.common.mybatis.Page;
77
import io.github.talelin.merak.mapper.UserGroupMapper;
88
import io.github.talelin.merak.model.GroupDO;
@@ -61,10 +61,10 @@ public boolean checkGroupExistById(Long id) {
6161
}
6262

6363
@Override
64-
public GroupPermissionsBO getGroupAndPermissions(Long id) {
64+
public GroupPermissionBO getGroupAndPermissions(Long id) {
6565
GroupDO group = this.baseMapper.selectById(id);
6666
List<PermissionDO> permissions = permissionService.getPermissionByGroupId(id);
67-
return new GroupPermissionsBO(group, permissions);
67+
return new GroupPermissionBO(group, permissions);
6868
}
6969

7070
@Override

src/main/java/io/github/talelin/merak/vo/UserPermissionsVO.java renamed to src/main/java/io/github/talelin/merak/vo/UserPermissionVO.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* 用户 + 权限 view object
1111
*/
1212
@Data
13-
public class UserPermissionsVO {
13+
public class UserPermissionVO {
1414

1515
private Long id;
1616

@@ -24,15 +24,15 @@ public class UserPermissionsVO {
2424

2525
private List permissions;
2626

27-
public UserPermissionsVO() {
27+
public UserPermissionVO() {
2828
}
2929

30-
public UserPermissionsVO(UserDO userDO, List permissions) {
30+
public UserPermissionVO(UserDO userDO, List permissions) {
3131
BeanUtils.copyProperties(userDO, this);
3232
this.permissions = permissions;
3333
}
3434

35-
public UserPermissionsVO(UserDO userDO) {
35+
public UserPermissionVO(UserDO userDO) {
3636
BeanUtils.copyProperties(userDO, this);
3737
}
3838
}

‎src/test/java/io/github/talelin/merak/service/impl/AdminServiceImplTest.java‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
import com.baomidou.mybatisplus.core.metadata.IPage;
55
import io.github.talelin.merak.mapper.*;
66
import io.github.talelin.merak.model.*;
7-
import io.github.talelin.merak.bo.GroupPermissionsBO;
7+
import io.github.talelin.merak.bo.GroupPermissionBO;
88
import io.github.talelin.merak.dto.admin.*;
99
import io.github.talelin.merak.dto.user.RegisterDTO;
1010
import io.github.talelin.autoconfigure.exception.ForbiddenException;
1111
import io.github.talelin.autoconfigure.exception.NotFoundException;
12-
import io.github.talelin.merak.dto.admin.*;
13-
import io.github.talelin.merak.mapper.*;
14-
import io.github.talelin.merak.model.*;
1512
import lombok.extern.slf4j.Slf4j;
1613
import org.junit.Before;
1714
import org.junit.Test;
@@ -261,7 +258,7 @@ public void getGroup() {
261258
relations.add(relation2);
262259
groupPermissionMapper.insertBatch(relations);
263260

264-
GroupPermissionsBO group1 = adminService.getGroup(group.getId());
261+
GroupPermissionBO group1 = adminService.getGroup(group.getId());
265262
assertEquals("测试分组1", group1.getName());
266263
assertNotNull(group1.getId());
267264
boolean anyMatch = group1.getPermissions().stream().anyMatch(it -> {
@@ -274,7 +271,7 @@ public void getGroup() {
274271
@Test(expected = NotFoundException.class)
275272
public void getGroup1() {
276273
Random random = new Random();
277-
GroupPermissionsBO group1 = adminService.getGroup((long) random.nextInt(100));
274+
GroupPermissionBO group1 = adminService.getGroup((long) random.nextInt(100));
278275
assertNull(group1);
279276
}
280277

@@ -298,7 +295,7 @@ public void createGroup() {
298295
assertEquals("测试分组1", group.getName());
299296
assertEquals("just for test", group.getInfo());
300297

301-
GroupPermissionsBO groupPermissions = adminService.getGroup(group.getId());
298+
GroupPermissionBO groupPermissions = adminService.getGroup(group.getId());
302299
boolean anyMatch = groupPermissions.getPermissions().stream().anyMatch(it -> {
303300
PermissionDO p = (PermissionDO) it;
304301
return p.getName().equals("权限1");
@@ -320,7 +317,7 @@ public void createGroup1() {
320317
assertEquals("测试分组1", group.getName());
321318
assertEquals("just for test", group.getInfo());
322319

323-
GroupPermissionsBO groupPermissions = adminService.getGroup(group.getId());
320+
GroupPermissionBO groupPermissions = adminService.getGroup(group.getId());
324321
assertEquals("测试分组1", groupPermissions.getName());
325322
assertEquals(groupPermissions.getPermissions().size(), 0);
326323
}
@@ -407,7 +404,7 @@ public void dispatchPermission() {
407404
dto.setPermissionId(permission3.getId());
408405
boolean ok = adminService.dispatchPermission(dto);
409406
assertTrue(ok);
410-
GroupPermissionsBO groupPermissions = adminService.getGroup(group.getId());
407+
GroupPermissionBO groupPermissions = adminService.getGroup(group.getId());
411408
boolean anyMatch = groupPermissions.getPermissions().stream().anyMatch(it -> {
412409
PermissionDO p = (PermissionDO) it;
413410
return p.getName().equals("权限3") && p.getModule().equals("炉石传说");
@@ -440,7 +437,7 @@ public void dispatchPermissions() {
440437
dto.setPermissionIds(Arrays.asList(permission3.getId(), permission4.getId()));
441438
boolean ok = adminService.dispatchPermissions(dto);
442439
assertTrue(ok);
443-
GroupPermissionsBO groupPermissions = adminService.getGroup(group.getId());
440+
GroupPermissionBO groupPermissions = adminService.getGroup(group.getId());
444441
boolean anyMatch = groupPermissions.getPermissions().stream().anyMatch(it -> {
445442
PermissionDO p = (PermissionDO) it;
446443
return p.getName().equals("权限3") && p.getModule().equals("炉石传说");
@@ -479,7 +476,7 @@ public void removePermissions() {
479476
dto.setPermissionIds(Arrays.asList(permission3.getId(), permission2.getId()));
480477
boolean ok = adminService.removePermissions(dto);
481478
assertTrue(ok);
482-
GroupPermissionsBO groupPermissions = adminService.getGroup(group.getId());
479+
GroupPermissionBO groupPermissions = adminService.getGroup(group.getId());
483480
boolean anyMatch = groupPermissions.getPermissions().stream().anyMatch(it -> {
484481
PermissionDO p = (PermissionDO) it;
485482
return p.getName().equals("权限3") && p.getModule().equals("炉石传说");
@@ -518,7 +515,7 @@ public void removePermissions1() {
518515
dto.setPermissionIds(Arrays.asList(permission3.getId()));
519516
boolean ok = adminService.removePermissions(dto);
520517
assertTrue(ok);
521-
GroupPermissionsBO groupPermissions = adminService.getGroup(group.getId());
518+
GroupPermissionBO groupPermissions = adminService.getGroup(group.getId());
522519
boolean anyMatch = groupPermissions.getPermissions().stream().anyMatch(it -> {
523520
PermissionDO p = (PermissionDO) it;
524521
return p.getName().equals("权限3") && p.getModule().equals("炉石传说");

‎src/test/java/io/github/talelin/merak/service/impl/GroupServiceImplTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package io.github.talelin.merak.service.impl;
22

33
import com.baomidou.mybatisplus.core.metadata.IPage;
4-
import io.github.talelin.merak.bo.GroupPermissionsBO;
5-
import io.github.talelin.merak.mapper.*;
6-
import io.github.talelin.merak.model.*;
4+
import io.github.talelin.merak.bo.GroupPermissionBO;
75
import io.github.talelin.merak.mapper.*;
86
import io.github.talelin.merak.model.*;
97
import lombok.extern.slf4j.Slf4j;
@@ -136,7 +134,7 @@ public void checkGroupExistById() {
136134
@Test
137135
public void getGroupAndPermissions() {
138136
Long id = mockData2();
139-
GroupPermissionsBO groupAndPermissions = groupService.getGroupAndPermissions(id);
137+
GroupPermissionBO groupAndPermissions = groupService.getGroupAndPermissions(id);
140138
assertTrue(groupAndPermissions.getName().equals("测试分组1"));
141139
boolean anyMatch = groupAndPermissions.getPermissions().stream().anyMatch(permission -> {
142140
PermissionDO permission1 = (PermissionDO) permission;

0 commit comments

Comments
 (0)