mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改角色列表接口

This commit is contained in:
TinyAnts 2022-06-07 16:36:23 +08:00
parent c22797cf87
commit b4b451c37c
10 changed files with 58 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java
View File

@ -35,7 +35,7 @@ public class SystemAdminController {
@GetMapping("/list")
public Object list(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
PageResult<SystemAdminVo> list = iSystemAdminService.lists(pageParam, params);
PageResult<SystemAdminVo> list = iSystemAdminService.list(pageParam, params);
return AjaxResult.success(list);
}

2
server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java
View File

@ -33,7 +33,7 @@ public class SystemRoleController {
@Log(title = "角色列表")
@GetMapping("/list")
public Object list(@Validated PageParam pageParam) {
PageResult<SystemRoleVo> lists = iSystemRoleService.lists(pageParam);
PageResult<SystemRoleVo> lists = iSystemRoleService.list(pageParam);
return AjaxResult.success(lists);
}

2
server/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java
View File

@ -30,7 +30,7 @@ public interface ISystemAdminService {
* @param pageParam 分页参数
* @return PageResult<SysAdminListVo>
*/
PageResult<SystemAdminVo> lists(PageParam pageParam, Map<String, String> params);
PageResult<SystemAdminVo> list(PageParam pageParam, Map<String, String> params);
/**
* 当前管理员

9
server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java
View File

@ -11,13 +11,6 @@ import org.springframework.validation.annotation.Validated;
*/
public interface ISystemRoleService {
/**
* 根据id获取角色名称
* @param id 角色ID
* @return String
*/
String getRoleNameById(Integer id);
/**
* 角色列表
*
@ -25,7 +18,7 @@ public interface ISystemRoleService {
* @param pageParam 参数
* @return PageResult<SysRoleListVo>
*/
PageResult<SystemRoleVo> lists(@Validated PageParam pageParam);
PageResult<SystemRoleVo> list(@Validated PageParam pageParam);
/**
* 角色详情

59
server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java
View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.query.MPJQueryWrapper;
import com.hxkj.admin.LikeAdminThreadLocal;
import com.hxkj.admin.config.AdminConfig;
import com.hxkj.admin.service.ISystemAdminService;
@ -67,46 +68,46 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
* @return PageResult<SysAdminListVo>
*/
@Override
public PageResult<SystemAdminVo> lists(PageParam pageParam, Map<String, String> params) {
public PageResult<SystemAdminVo> list(PageParam pageParam, Map<String, String> params) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
QueryWrapper<SystemAdmin> queryWrapper = new QueryWrapper<>();
queryWrapper.select(SystemAdmin.class, info->
!info.getColumn().equals("salt") &&
!info.getColumn().equals("password") &&
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
.eq("is_delete", 0)
.orderByDesc(Arrays.asList("id", "sort"));
MPJQueryWrapper<SystemAdmin> mpjQueryWrapper = new MPJQueryWrapper<>();
mpjQueryWrapper.select("t.id,t.dept_id,t.post_id,t.username,t.nickname,t.avatar," +
"sd.name as dept,sr.name as role,t.is_multipoint,t.is_disable," +
"t.last_login_ip,t.last_login_time,t.create_time,t.update_time")
.eq("t.is_delete", 0)
.leftJoin("ls_system_role sr ON sr.id=t.role")
.leftJoin("ls_system_dept sd ON sd.id=t.dept_id")
.orderByDesc(Arrays.asList("t.id", "t.sort"));
systemAdminMapper.setSearch(queryWrapper, params, new String[]{
systemAdminMapper.setSearch(mpjQueryWrapper, params, new String[]{
"like:username:str",
"like:nickname:str",
"=:role:int"
});
IPage<SystemAdmin> iPage = systemAdminMapper.selectPage(new Page<>(page, limit), queryWrapper);
IPage<SystemAdminVo> iPage = systemAdminMapper.selectJoinPage(
new Page<>(page, limit),
SystemAdminVo.class,
mpjQueryWrapper);
List<SystemAdminVo> adminVoArrayList = new ArrayList<>();
for (SystemAdmin sysAdmin : iPage.getRecords()) {
SystemAdminVo vo = new SystemAdminVo();
BeanUtils.copyProperties(sysAdmin, vo);
if (sysAdmin.getId() == 1) {
vo.setRole("超级管理员");
} else {
vo.setRole(iSystemRoleService.getRoleNameById(sysAdmin.getRole()));
for (SystemAdminVo vo : iPage.getRecords()) {
if (vo.getId() == 1) {
vo.setRole("系统管理员");
}
vo.setAvatar(UrlUtil.toAbsoluteUrl(sysAdmin.getAvatar()));
vo.setCreateTime(TimeUtil.timestampToDate(sysAdmin.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(sysAdmin.getUpdateTime()));
vo.setLastLoginTime(TimeUtil.timestampToDate(sysAdmin.getLastLoginTime()));
adminVoArrayList.add(vo);
if (vo.getDept() == null) {
vo.setDept("");
}
vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar()));
vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime()));
vo.setLastLoginTime(TimeUtil.timestampToDate(vo.getLastLoginTime()));
}
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), adminVoArrayList);
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), iPage.getRecords());
}
/**
@ -130,6 +131,7 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
SystemAdminVo systemAdminVo = new SystemAdminVo();
BeanUtils.copyProperties(sysAdmin, systemAdminVo);
systemAdminVo.setDept(String.valueOf(sysAdmin.getDeptId()));
systemAdminVo.setRole(String.valueOf(sysAdmin.getRole()));
systemAdminVo.setAvatar(UrlUtil.toAbsoluteUrl(sysAdmin.getAvatar()));
systemAdminVo.setUpdateTime(TimeUtil.timestampToDate(sysAdmin.getUpdateTime()));
@ -194,6 +196,7 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
SystemAdminVo vo = new SystemAdminVo();
BeanUtils.copyProperties(sysAdmin, vo);
vo.setDept(String.valueOf(vo.getDeptId()));
vo.setRole(String.valueOf(sysAdmin.getRole()));
vo.setAvatar(UrlUtil.toAbsoluteUrl(sysAdmin.getAvatar()));
vo.setCreateTime(TimeUtil.timestampToDate(sysAdmin.getCreateTime()));
@ -233,6 +236,8 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
String avatar = UrlUtil.toRelativeUrl(systemAdminParam.getAvatar());
SystemAdmin model = new SystemAdmin();
model.setDeptId(systemAdminParam.getDeptId());
model.setPostId(systemAdminParam.getPostId());
model.setUsername(systemAdminParam.getUsername());
model.setNickname(systemAdminParam.getNickname());
model.setRole(systemAdminParam.getRole());
@ -280,6 +285,8 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
SystemAdmin model = new SystemAdmin();
model.setId(systemAdminParam.getId());
model.setDeptId(systemAdminParam.getDeptId());
model.setPostId(systemAdminParam.getPostId());
model.setNickname(systemAdminParam.getNickname());
model.setUsername(systemAdminParam.getUsername());
model.setAvatar( UrlUtil.toRelativeUrl(systemAdminParam.getAvatar()));

34
server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java
View File

@ -42,27 +42,6 @@ public class SystemRoleServiceImpl implements ISystemRoleService {
@Resource
ISystemRoleMenuService iSystemRoleMenuService;
/**
* 根据ID获取角色名称
*
* @author fzr
* @param id 角色ID
* @return String
*/
@Override
public String getRoleNameById(Integer id) {
QueryWrapper<SystemRole> queryWrapper = new QueryWrapper<>();
queryWrapper.select("id", "name")
.eq("id", id)
.last("limit 1");
SystemRole systemRole = systemRoleMapper.selectOne(queryWrapper);
if (systemRole == null) {
return "";
}
return systemRole.getName();
}
/**
* 角色列表
*
@ -71,7 +50,7 @@ public class SystemRoleServiceImpl implements ISystemRoleService {
* @return PageResult<SysRoleListVo>
*/
@Override
public PageResult<SystemRoleVo> lists(@Validated PageParam pageParam) {
public PageResult<SystemRoleVo> list(@Validated PageParam pageParam) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
@ -85,7 +64,12 @@ public class SystemRoleServiceImpl implements ISystemRoleService {
SystemRoleVo vo = new SystemRoleVo();
BeanUtils.copyProperties(systemRole, vo);
Integer member = systemAdminMapper.selectCount(new QueryWrapper<SystemAdmin>()
.eq("is_delete", 0)
.eq("role", systemRole.getId()));
vo.setMenus(new ArrayList<>());
vo.setMember(member);
vo.setCreateTime(TimeUtil.timestampToDate(systemRole.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemRole.getUpdateTime()));
roleVoArrayList.add(vo);
@ -109,9 +93,13 @@ public class SystemRoleServiceImpl implements ISystemRoleService {
Assert.notNull(systemRole, "角色已不存在!");
Integer member = systemAdminMapper.selectCount(new QueryWrapper<SystemAdmin>()
.eq("is_delete", 0)
.eq("role", systemRole.getId()));
SystemRoleVo vo = new SystemRoleVo();
BeanUtils.copyProperties(systemRole, vo);
vo.setMember(member);
vo.setMenus(iSystemRoleMenuService.selectMenuIdsByRoleId(systemRole.getId()));
vo.setCreateTime(TimeUtil.timestampToDate(systemRole.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemRole.getUpdateTime()));

4
server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java
View File

@ -55,6 +55,10 @@ public class SystemAdminParam implements Serializable {
@DecimalMin(value = "0", message = "排序号值不能少于0", groups = {create.class, update.class})
private Integer sort = 0;
private Integer deptId = 0;
private Integer postId = 0;
private String avatar = "";
}

3
server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java
View File

@ -13,9 +13,12 @@ public class SystemAdminVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private Integer deptId;
private Integer postId;
private String username;
private String nickname;
private String avatar;
private String dept;
private String role;
private Integer isMultipoint;
private Integer isDisable;

1
server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java
View File

@ -16,6 +16,7 @@ public class SystemRoleVo implements Serializable {
private String name;
private String remark;
private Object menus;
private Integer member;
private Integer sort;
private Integer isDisable;
private String createTime;

2
server/like-common/src/main/java/com/hxkj/common/entity/system/SystemAdmin.java
View File

@ -16,6 +16,8 @@ public class SystemAdmin implements Serializable {
@TableId(value="id", type=IdType.AUTO)
private Integer id;
private Integer deptId;
private Integer postId;
private String nickname;
private String username;
private String password;