style: 优化部分变量命名

continew-org · Nov 5, 2023 · f15494d · f15494d
1 parent 91ea4ed
commit f15494d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/...dmin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java b/...dmin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java
@@ -139,10 +139,9 @@ public PageDataResp<SystemLogResp> page(SystemLogQuery query, PageQuery pageQuer
  public SystemLogDetailResp get(Long id) {
  LogDO logDO = logMapper.selectById(id);
  CheckUtils.throwIfNotExists(logDO, "LogDO", "ID", id);
-
- SystemLogDetailResp detailVO = BeanUtil.copyProperties(logDO, SystemLogDetailResp.class);
- this.fill(detailVO);
- return detailVO;
+ SystemLogDetailResp detail = BeanUtil.copyProperties(logDO, SystemLogDetailResp.class);
+ this.fill(detail);
+ return detail;
  }
 
  @Override

diff --git a/...admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java b/...admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java
@@ -135,16 +135,16 @@ public void delete(List<Long> ids) {
  public void fillDetail(Object detailObj) {
  super.fillDetail(detailObj);
  if (detailObj instanceof RoleDetailResp) {
- RoleDetailResp detailVO = (RoleDetailResp)detailObj;
- Long roleId = detailVO.getId();
- if (SysConsts.ADMIN_ROLE_CODE.equals(detailVO.getCode())) {
+ RoleDetailResp detail = (RoleDetailResp)detailObj;
+ Long roleId = detail.getId();
+ if (SysConsts.ADMIN_ROLE_CODE.equals(detail.getCode())) {
  List<MenuResp> list = menuService.list(null, null);
  List<Long> menuIds = list.stream().map(MenuResp::getId).collect(Collectors.toList());
- detailVO.setMenuIds(menuIds);
+ detail.setMenuIds(menuIds);
  } else {
- detailVO.setMenuIds(roleMenuService.listMenuIdByRoleIds(CollUtil.newArrayList(roleId)));
+ detail.setMenuIds(roleMenuService.listMenuIdByRoleIds(CollUtil.newArrayList(roleId)));
  }
- detailVO.setDeptIds(roleDeptService.listDeptIdByRoleId(roleId));
+ detail.setDeptIds(roleDeptService.listDeptIdByRoleId(roleId));
  }
  }
 

diff --git a/...admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java b/...admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java
@@ -153,11 +153,11 @@ public void delete(List<Long> ids) {
  public void fillDetail(Object detailObj) {
  super.fillDetail(detailObj);
  if (detailObj instanceof UserDetailResp) {
- UserDetailResp detailVO = (UserDetailResp)detailObj;
- detailVO.setDeptName(ExceptionUtils.exToNull(() -> deptService.get(detailVO.getDeptId()).getName()));
- List<Long> roleIdList = userRoleService.listRoleIdByUserId(detailVO.getId());
- detailVO.setRoleIds(roleIdList);
- detailVO.setRoleNames(String.join(StringConsts.CHINESE_COMMA, roleService.listNameByIds(roleIdList)));
+ UserDetailResp detail = (UserDetailResp)detailObj;
+ detail.setDeptName(ExceptionUtils.exToNull(() -> deptService.get(detail.getDeptId()).getName()));
+ List<Long> roleIdList = userRoleService.listRoleIdByUserId(detail.getId());
+ detail.setRoleIds(roleIdList);
+ detail.setRoleNames(String.join(StringConsts.CHINESE_COMMA, roleService.listNameByIds(roleIdList)));
  }
  }