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

优化代码增加注释

This commit is contained in:
TinyAnts 2022-08-09 16:25:19 +08:00
parent ad08408de3
commit 8ec79912d2
37 changed files with 317 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/like-admin/src/main/java/com/hxkj/admin/controller/system/AuthAdminController.java
View File

@ -5,8 +5,8 @@ import com.hxkj.admin.config.aop.Log;
import com.hxkj.admin.service.system.ISystemAuthAdminService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemAuthAdminParam;
import com.hxkj.admin.vo.system.SystemAdminVo;
import com.hxkj.admin.vo.system.SystemSelfVo;
import com.hxkj.admin.vo.system.SystemAuthAdminVo;
import com.hxkj.admin.vo.system.SystemAuthSelfVo;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.validator.annotation.IDMust;
@ -35,7 +35,7 @@ public class AuthAdminController {
@GetMapping("/list")
public Object list(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
PageResult<SystemAdminVo> list = iSystemAuthAdminService.list(pageParam, params);
PageResult<SystemAuthAdminVo> list = iSystemAuthAdminService.list(pageParam, params);
return AjaxResult.success(list);
}
@ -48,7 +48,7 @@ public class AuthAdminController {
@GetMapping("/self")
public Object self() {
Integer adminId = LikeAdminThreadLocal.getAdminId();
SystemSelfVo vo = iSystemAuthAdminService.self(adminId);
SystemAuthSelfVo vo = iSystemAuthAdminService.self(adminId);
return AjaxResult.success(vo);
}
@ -61,7 +61,7 @@ public class AuthAdminController {
*/
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
SystemAdminVo vo = iSystemAuthAdminService.detail(id);
SystemAuthAdminVo vo = iSystemAuthAdminService.detail(id);
return AjaxResult.success(vo);
}

6
server/like-admin/src/main/java/com/hxkj/admin/controller/system/AuthDeptController.java
View File

@ -3,7 +3,7 @@ package com.hxkj.admin.controller.system;
import com.alibaba.fastjson.JSONArray;
import com.hxkj.admin.service.system.ISystemAuthDeptService;
import com.hxkj.admin.validate.system.SystemAuthDeptParam;
import com.hxkj.admin.vo.system.SystemDeptVo;
import com.hxkj.admin.vo.system.SystemAuthDeptVo;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.validator.annotation.IDMust;
import org.springframework.validation.annotation.Validated;
@ -31,7 +31,7 @@ public class AuthDeptController {
*/
@GetMapping("/all")
public Object all() {
List<SystemDeptVo> vos = iSystemAuthDeptService.all();
List<SystemAuthDeptVo> vos = iSystemAuthDeptService.all();
return AjaxResult.success(vos);
}
@ -56,7 +56,7 @@ public class AuthDeptController {
*/
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
SystemDeptVo vo = iSystemAuthDeptService.detail(id);
SystemAuthDeptVo vo = iSystemAuthDeptService.detail(id);
return AjaxResult.success(vo);
}

4
server/like-admin/src/main/java/com/hxkj/admin/controller/system/AuthMenuController.java
View File

@ -5,7 +5,7 @@ import com.hxkj.admin.LikeAdminThreadLocal;
import com.hxkj.admin.config.aop.Log;
import com.hxkj.admin.service.system.ISystemAuthMenuService;
import com.hxkj.admin.validate.system.SystemAuthMenuParam;
import com.hxkj.admin.vo.system.SystemMenuVo;
import com.hxkj.admin.vo.system.SystemAuthMenuVo;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.validator.annotation.IDMust;
import org.springframework.validation.annotation.Validated;
@ -56,7 +56,7 @@ public class AuthMenuController {
*/
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
SystemMenuVo vo = iSystemAuthMenuService.detail(id);
SystemAuthMenuVo vo = iSystemAuthMenuService.detail(id);
return AjaxResult.success(vo);
}

8
server/like-admin/src/main/java/com/hxkj/admin/controller/system/AuthPostController.java
View File

@ -3,7 +3,7 @@ package com.hxkj.admin.controller.system;
import com.hxkj.admin.service.system.ISystemAuthPostService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemAuthPostParam;
import com.hxkj.admin.vo.system.SystemPostVo;
import com.hxkj.admin.vo.system.SystemAuthPostVo;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.validator.annotation.IDMust;
@ -32,7 +32,7 @@ public class AuthPostController {
*/
@GetMapping("/all")
public Object all() {
List<SystemPostVo> vos = iSystemAuthPostService.all();
List<SystemAuthPostVo> vos = iSystemAuthPostService.all();
return AjaxResult.success(vos);
}
@ -45,13 +45,13 @@ public class AuthPostController {
@GetMapping("/list")
public Object list(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
PageResult<SystemPostVo> list = iSystemAuthPostService.list(pageParam, params);
PageResult<SystemAuthPostVo> list = iSystemAuthPostService.list(pageParam, params);
return AjaxResult.success(list);
}
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
SystemPostVo vo = iSystemAuthPostService.detail(id);
SystemAuthPostVo vo = iSystemAuthPostService.detail(id);
return AjaxResult.success(vo);
}

6
server/like-admin/src/main/java/com/hxkj/admin/controller/system/AuthRoleController.java
View File

@ -4,7 +4,7 @@ import com.hxkj.admin.config.aop.Log;
import com.hxkj.admin.service.system.ISystemAuthRoleService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemAuthRoleParam;
import com.hxkj.admin.vo.system.SystemRoleVo;
import com.hxkj.admin.vo.system.SystemAuthRoleVo;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.validator.annotation.IDMust;
@ -33,7 +33,7 @@ public class AuthRoleController {
@Log(title = "角色列表")
@GetMapping("/list")
public Object list(@Validated PageParam pageParam) {
PageResult<SystemRoleVo> lists = iSystemAuthRoleService.list(pageParam);
PageResult<SystemAuthRoleVo> lists = iSystemAuthRoleService.list(pageParam);
return AjaxResult.success(lists);
}
@ -46,7 +46,7 @@ public class AuthRoleController {
@Log(title = "角色详情")
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
SystemRoleVo vo = iSystemAuthRoleService.detail(id);
SystemAuthRoleVo vo = iSystemAuthRoleService.detail(id);
return AjaxResult.success(vo);
}

10
server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAuthAdminService.java
View File

@ -2,8 +2,8 @@ package com.hxkj.admin.service.system;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemAuthAdminParam;
import com.hxkj.admin.vo.system.SystemAdminVo;
import com.hxkj.admin.vo.system.SystemSelfVo;
import com.hxkj.admin.vo.system.SystemAuthAdminVo;
import com.hxkj.admin.vo.system.SystemAuthSelfVo;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.system.SystemAuthAdmin;
@ -30,7 +30,7 @@ public interface ISystemAuthAdminService {
* @param pageParam 分页参数
* @return PageResult<SysAdminListVo>
*/
PageResult<SystemAdminVo> list(PageParam pageParam, Map<String, String> params);
PageResult<SystemAuthAdminVo> list(PageParam pageParam, Map<String, String> params);
/**
* 当前管理员
@ -38,7 +38,7 @@ public interface ISystemAuthAdminService {
* @author fzr
* @return SystemSelfVo
*/
SystemSelfVo self(Integer adminId);
SystemAuthSelfVo self(Integer adminId);
/**
* 管理员详情
@ -47,7 +47,7 @@ public interface ISystemAuthAdminService {
* @param id 主键参数
* @return SysAdmin
*/
SystemAdminVo detail(Integer id);
SystemAuthAdminVo detail(Integer id);
/**
* 管理员新增

6
server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAuthDeptService.java
View File

@ -2,7 +2,7 @@ package com.hxkj.admin.service.system;
import com.alibaba.fastjson.JSONArray;
import com.hxkj.admin.validate.system.SystemAuthDeptParam;
import com.hxkj.admin.vo.system.SystemDeptVo;
import com.hxkj.admin.vo.system.SystemAuthDeptVo;
import java.util.List;
import java.util.Map;
@ -18,7 +18,7 @@ public interface ISystemAuthDeptService {
* @author fzr
* @return List<SystemDeptVo>
*/
List<SystemDeptVo> all();
List<SystemAuthDeptVo> all();
/**
* 部门列表
@ -36,7 +36,7 @@ public interface ISystemAuthDeptService {
* @param id 主键
* @return SysMenu
*/
SystemDeptVo detail(Integer id);
SystemAuthDeptVo detail(Integer id);
/**
* 部门新增

4
server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAuthMenuService.java
View File

@ -2,7 +2,7 @@ package com.hxkj.admin.service.system;
import com.alibaba.fastjson.JSONArray;
import com.hxkj.admin.validate.system.SystemAuthMenuParam;
import com.hxkj.admin.vo.system.SystemMenuVo;
import com.hxkj.admin.vo.system.SystemAuthMenuVo;
/**
* 系统菜单服务接口类
@ -32,7 +32,7 @@ public interface ISystemAuthMenuService {
* @param id 主键
* @return SysMenu
*/
SystemMenuVo detail(Integer id);
SystemAuthMenuVo detail(Integer id);
/**
* 菜单新增

8
server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAuthPostService.java
View File

@ -2,7 +2,7 @@ package com.hxkj.admin.service.system;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemAuthPostParam;
import com.hxkj.admin.vo.system.SystemPostVo;
import com.hxkj.admin.vo.system.SystemAuthPostVo;
import com.hxkj.common.core.PageResult;
import java.util.List;
@ -19,7 +19,7 @@ public interface ISystemAuthPostService {
* @author fzr
* @return List<SystemPostVo>
*/
List<SystemPostVo> all();
List<SystemAuthPostVo> all();
/**
* 岗位列表
@ -29,7 +29,7 @@ public interface ISystemAuthPostService {
* @param params 搜索参数
* @return PageResult<SystemPostVo>
*/
PageResult<SystemPostVo> list(PageParam pageParam, Map<String, String> params);
PageResult<SystemAuthPostVo> list(PageParam pageParam, Map<String, String> params);
/**
* 岗位详情
@ -38,7 +38,7 @@ public interface ISystemAuthPostService {
* @param id 主键
* @return SystemPostVo
*/
SystemPostVo detail(Integer id);
SystemAuthPostVo detail(Integer id);
/**
* 岗位新增

6
server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAuthRoleService.java
View File

@ -2,7 +2,7 @@ package com.hxkj.admin.service.system;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemAuthRoleParam;
import com.hxkj.admin.vo.system.SystemRoleVo;
import com.hxkj.admin.vo.system.SystemAuthRoleVo;
import com.hxkj.common.core.PageResult;
import org.springframework.validation.annotation.Validated;
@ -18,7 +18,7 @@ public interface ISystemAuthRoleService {
* @param pageParam 参数
* @return PageResult<SysRoleListVo>
*/
PageResult<SystemRoleVo> list(@Validated PageParam pageParam);
PageResult<SystemAuthRoleVo> list(@Validated PageParam pageParam);
/**
* 角色详情
@ -27,7 +27,7 @@ public interface ISystemAuthRoleService {
* @param id 主键参数
* @return SysRole
*/
SystemRoleVo detail(Integer id);
SystemAuthRoleVo detail(Integer id);
/**
* 角色新增

42
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthAdminServiceImpl.java
View File

@ -13,9 +13,9 @@ import com.hxkj.admin.service.system.ISystemAuthPermService;
import com.hxkj.admin.service.system.ISystemAuthRoleService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemAuthAdminParam;
import com.hxkj.admin.vo.system.SystemAdminVo;
import com.hxkj.admin.vo.system.SystemRoleVo;
import com.hxkj.admin.vo.system.SystemSelfVo;
import com.hxkj.admin.vo.system.SystemAuthAdminVo;
import com.hxkj.admin.vo.system.SystemAuthRoleVo;
import com.hxkj.admin.vo.system.SystemAuthSelfVo;
import com.hxkj.common.config.GlobalConfig;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.system.SystemAuthAdmin;
@ -69,7 +69,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
* @return PageResult<SysAdminListVo>
*/
@Override
public PageResult<SystemAdminVo> list(PageParam pageParam, Map<String, String> params) {
public PageResult<SystemAuthAdminVo> list(PageParam pageParam, Map<String, String> params) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
@ -88,12 +88,12 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
"=:role:int"
});
IPage<SystemAdminVo> iPage = systemAuthAdminMapper.selectJoinPage(
IPage<SystemAuthAdminVo> iPage = systemAuthAdminMapper.selectJoinPage(
new Page<>(page, limit),
SystemAdminVo.class,
SystemAuthAdminVo.class,
mpjQueryWrapper);
for (SystemAdminVo vo : iPage.getRecords()) {
for (SystemAuthAdminVo vo : iPage.getRecords()) {
if (vo.getId() == 1) {
vo.setRole("系统管理员");
}
@ -118,7 +118,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
* @return SystemSelfVo
*/
@Override
public SystemSelfVo self(Integer adminId) {
public SystemAuthSelfVo self(Integer adminId) {
// 管理员信息
SystemAuthAdmin sysAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select(SystemAuthAdmin.class, info->
@ -130,14 +130,14 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
.eq("id", adminId)
.last("limit 1"));
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()));
systemAdminVo.setCreateTime(TimeUtil.timestampToDate(sysAdmin.getCreateTime()));
systemAdminVo.setLastLoginTime(TimeUtil.timestampToDate(sysAdmin.getLastLoginTime()));
SystemAuthAdminVo systemAuthAdminVo = new SystemAuthAdminVo();
BeanUtils.copyProperties(sysAdmin, systemAuthAdminVo);
systemAuthAdminVo.setDept(String.valueOf(sysAdmin.getDeptId()));
systemAuthAdminVo.setRole(String.valueOf(sysAdmin.getRole()));
systemAuthAdminVo.setAvatar(UrlUtil.toAbsoluteUrl(sysAdmin.getAvatar()));
systemAuthAdminVo.setUpdateTime(TimeUtil.timestampToDate(sysAdmin.getUpdateTime()));
systemAuthAdminVo.setCreateTime(TimeUtil.timestampToDate(sysAdmin.getCreateTime()));
systemAuthAdminVo.setLastLoginTime(TimeUtil.timestampToDate(sysAdmin.getLastLoginTime()));
// 角色权限
List<String> auths = new LinkedList<>();
@ -167,8 +167,8 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
}
// 返回数据
SystemSelfVo vo = new SystemSelfVo();
vo.setUser(systemAdminVo);
SystemAuthSelfVo vo = new SystemAuthSelfVo();
vo.setUser(systemAuthAdminVo);
vo.setPermissions(auths);
return vo;
}
@ -181,7 +181,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
* @return SysAdmin
*/
@Override
public SystemAdminVo detail(Integer id) {
public SystemAuthAdminVo detail(Integer id) {
SystemAuthAdmin sysAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select(SystemAuthAdmin.class, info->
!info.getColumn().equals("salt") &&
@ -194,7 +194,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
Assert.notNull(sysAdmin, "账号已不存在！");
SystemAdminVo vo = new SystemAdminVo();
SystemAuthAdminVo vo = new SystemAuthAdminVo();
BeanUtils.copyProperties(sysAdmin, vo);
vo.setDept(String.valueOf(vo.getDeptId()));
@ -228,7 +228,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
.eq("nickname", systemAuthAdminParam.getNickname())
.last("limit 1")), "昵称已存在换一个吧！");
SystemRoleVo roleVo = iSystemAuthRoleService.detail(systemAuthAdminParam.getRole());
SystemAuthRoleVo roleVo = iSystemAuthRoleService.detail(systemAuthAdminParam.getRole());
Assert.notNull(roleVo, "角色不存在!");
Assert.isTrue(roleVo.getIsDisable() <= 0, "当前角色已被禁用!");

16
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthDeptServiceImpl.java
View File

@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.hxkj.admin.service.system.ISystemAuthDeptService;
import com.hxkj.admin.validate.system.SystemAuthDeptParam;
import com.hxkj.admin.vo.system.SystemDeptVo;
import com.hxkj.admin.vo.system.SystemAuthDeptVo;
import com.hxkj.common.entity.system.SystemAuthAdmin;
import com.hxkj.common.entity.system.SystemAuthDept;
import com.hxkj.common.mapper.system.SystemAuthAdminMapper;
@ -40,15 +40,15 @@ class SystemAuthDeptServiceImpl implements ISystemAuthDeptService {
* @return List<SystemPostVo>
*/
@Override
public List<SystemDeptVo> all() {
public List<SystemAuthDeptVo> all() {
List<SystemAuthDept> systemAuthDeptList = systemAuthDeptMapper.selectList(new QueryWrapper<SystemAuthDept>()
.gt("pid", 0)
.eq("is_delete", 0)
.orderByDesc((Arrays.asList("id", "sort"))));
List<SystemDeptVo> adminVoArrayList = new ArrayList<>();
List<SystemAuthDeptVo> adminVoArrayList = new ArrayList<>();
for (SystemAuthDept systemAuthDept : systemAuthDeptList) {
SystemDeptVo vo = new SystemDeptVo();
SystemAuthDeptVo vo = new SystemAuthDeptVo();
BeanUtils.copyProperties(systemAuthDept, vo);
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthDept.getUpdateTime()));
@ -82,9 +82,9 @@ class SystemAuthDeptServiceImpl implements ISystemAuthDeptService {
List<SystemAuthDept> systemAuthDeptList = systemAuthDeptMapper.selectList(queryWrapper);
List<SystemDeptVo> lists = new ArrayList<>();
List<SystemAuthDeptVo> lists = new ArrayList<>();
for (SystemAuthDept systemAuthDept : systemAuthDeptList) {
SystemDeptVo vo = new SystemDeptVo();
SystemAuthDeptVo vo = new SystemAuthDeptVo();
BeanUtils.copyProperties(systemAuthDept, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthDept.getCreateTime()));
@ -104,7 +104,7 @@ class SystemAuthDeptServiceImpl implements ISystemAuthDeptService {
* @return SystemDeptVo
*/
@Override
public SystemDeptVo detail(Integer id) {
public SystemAuthDeptVo detail(Integer id) {
SystemAuthDept systemAuthDept = systemAuthDeptMapper.selectOne(
new QueryWrapper<SystemAuthDept>()
.select(SystemAuthDept.class, info ->
@ -116,7 +116,7 @@ class SystemAuthDeptServiceImpl implements ISystemAuthDeptService {
Assert.notNull(systemAuthDept, "部门已不存在!");
SystemDeptVo vo = new SystemDeptVo();
SystemAuthDeptVo vo = new SystemAuthDeptVo();
BeanUtils.copyProperties(systemAuthDept, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthDept.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthDept.getUpdateTime()));

14
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthMenuServiceImpl.java
View File

@ -8,7 +8,7 @@ import com.hxkj.admin.config.AdminConfig;
import com.hxkj.admin.service.system.ISystemAuthMenuService;
import com.hxkj.admin.service.system.ISystemAuthPermService;
import com.hxkj.admin.validate.system.SystemAuthMenuParam;
import com.hxkj.admin.vo.system.SystemMenuVo;
import com.hxkj.admin.vo.system.SystemAuthMenuVo;
import com.hxkj.common.entity.system.SystemAuthMenu;
import com.hxkj.common.mapper.system.SystemAuthMenuMapper;
import com.hxkj.common.utils.*;
@ -54,9 +54,9 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService {
List<SystemAuthMenu> systemAuthMenus = systemAuthMenuMapper.selectList(queryWrapper);
List<SystemMenuVo> lists = new ArrayList<>();
List<SystemAuthMenuVo> lists = new ArrayList<>();
for (SystemAuthMenu systemAuthMenu : systemAuthMenus) {
SystemMenuVo vo = new SystemMenuVo();
SystemAuthMenuVo vo = new SystemAuthMenuVo();
BeanUtils.copyProperties(systemAuthMenu, vo);
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthMenu.getUpdateTime()));
@ -81,9 +81,9 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService {
List<SystemAuthMenu> systemAuthMenus = systemAuthMenuMapper.selectList(queryWrapper);
List<SystemMenuVo> lists = new ArrayList<>();
List<SystemAuthMenuVo> lists = new ArrayList<>();
for (SystemAuthMenu systemAuthMenu : systemAuthMenus) {
SystemMenuVo vo = new SystemMenuVo();
SystemAuthMenuVo vo = new SystemAuthMenuVo();
BeanUtils.copyProperties(systemAuthMenu, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthMenu.getCreateTime()));
@ -103,11 +103,11 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService {
* @return SysMenu
*/
@Override
public SystemMenuVo detail(Integer id) {
public SystemAuthMenuVo detail(Integer id) {
SystemAuthMenu systemAuthMenu = systemAuthMenuMapper.selectOne(new QueryWrapper<SystemAuthMenu>().eq("id", id));
Assert.notNull(systemAuthMenu, "菜单已不存在!");
SystemMenuVo vo = new SystemMenuVo();
SystemAuthMenuVo vo = new SystemAuthMenuVo();
BeanUtils.copyProperties(systemAuthMenu, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthMenu.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthMenu.getUpdateTime()));

18
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthPostServiceImpl.java
View File

@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxkj.admin.service.system.ISystemAuthPostService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemAuthPostParam;
import com.hxkj.admin.vo.system.SystemPostVo;
import com.hxkj.admin.vo.system.SystemAuthPostVo;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.system.SystemAuthAdmin;
import com.hxkj.common.entity.system.SystemAuthPost;
@ -42,14 +42,14 @@ public class SystemAuthPostServiceImpl implements ISystemAuthPostService {
* @return List<SystemPostVo>
*/
@Override
public List<SystemPostVo> all() {
public List<SystemAuthPostVo> all() {
List<SystemAuthPost> systemAuthPostList = systemAuthPostMapper.selectList(new QueryWrapper<SystemAuthPost>()
.eq("is_delete", 0)
.orderByDesc((Arrays.asList("id", "sort"))));
List<SystemPostVo> adminVoArrayList = new ArrayList<>();
List<SystemAuthPostVo> adminVoArrayList = new ArrayList<>();
for (SystemAuthPost systemAuthPost : systemAuthPostList) {
SystemPostVo vo = new SystemPostVo();
SystemAuthPostVo vo = new SystemAuthPostVo();
BeanUtils.copyProperties(systemAuthPost, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthPost.getCreateTime()));
@ -69,7 +69,7 @@ public class SystemAuthPostServiceImpl implements ISystemAuthPostService {
* @return PageResult<SystemPostVo>
*/
@Override
public PageResult<SystemPostVo> list(PageParam pageParam, Map<String, String> params) {
public PageResult<SystemAuthPostVo> list(PageParam pageParam, Map<String, String> params) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
@ -88,9 +88,9 @@ public class SystemAuthPostServiceImpl implements ISystemAuthPostService {
IPage<SystemAuthPost> iPage = systemAuthPostMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<SystemPostVo> list = new ArrayList<>();
List<SystemAuthPostVo> list = new ArrayList<>();
for (SystemAuthPost systemAuthPost : iPage.getRecords()) {
SystemPostVo vo = new SystemPostVo();
SystemAuthPostVo vo = new SystemAuthPostVo();
BeanUtils.copyProperties(systemAuthPost, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthPost.getCreateTime()));
@ -109,7 +109,7 @@ public class SystemAuthPostServiceImpl implements ISystemAuthPostService {
* @return SystemPostVo
*/
@Override
public SystemPostVo detail(Integer id) {
public SystemAuthPostVo detail(Integer id) {
SystemAuthPost systemAuthPost = systemAuthPostMapper.selectOne(new QueryWrapper<SystemAuthPost>()
.select(SystemAuthPost.class, info ->
!info.getColumn().equals("is_delete") &&
@ -120,7 +120,7 @@ public class SystemAuthPostServiceImpl implements ISystemAuthPostService {
Assert.notNull(systemAuthPost, "岗位不存在");
SystemPostVo vo = new SystemPostVo();
SystemAuthPostVo vo = new SystemAuthPostVo();
BeanUtils.copyProperties(systemAuthPost, vo);
vo.setCreateTime(TimeUtil.timestampToDate(systemAuthPost.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthPost.getUpdateTime()));

12
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthRoleServiceImpl.java
View File

@ -9,7 +9,7 @@ import com.hxkj.admin.service.system.ISystemAuthPermService;
import com.hxkj.admin.service.system.ISystemAuthRoleService;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.validate.system.SystemAuthRoleParam;
import com.hxkj.admin.vo.system.SystemRoleVo;
import com.hxkj.admin.vo.system.SystemAuthRoleVo;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.system.SystemAuthAdmin;
import com.hxkj.common.entity.system.SystemAuthRole;
@ -50,7 +50,7 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService {
* @return PageResult<SysRoleListVo>
*/
@Override
public PageResult<SystemRoleVo> list(@Validated PageParam pageParam) {
public PageResult<SystemAuthRoleVo> list(@Validated PageParam pageParam) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
@ -59,9 +59,9 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService {
IPage<SystemAuthRole> iPage = systemAuthRoleMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<SystemRoleVo> list = new ArrayList<>();
List<SystemAuthRoleVo> list = new ArrayList<>();
for (SystemAuthRole systemAuthRole : iPage.getRecords()) {
SystemRoleVo vo = new SystemRoleVo();
SystemAuthRoleVo vo = new SystemAuthRoleVo();
BeanUtils.copyProperties(systemAuthRole, vo);
Integer member = systemAuthAdminMapper.selectCount(new QueryWrapper<SystemAuthAdmin>()
@ -86,7 +86,7 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService {
* @return SysRole
*/
@Override
public SystemRoleVo detail(Integer id) {
public SystemAuthRoleVo detail(Integer id) {
SystemAuthRole systemAuthRole = systemAuthRoleMapper.selectOne(new QueryWrapper<SystemAuthRole>()
.eq("id", id)
.last("limit 1"));
@ -97,7 +97,7 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService {
.eq("is_delete", 0)
.eq("role", systemAuthRole.getId()));
SystemRoleVo vo = new SystemRoleVo();
SystemAuthRoleVo vo = new SystemAuthRoleVo();
BeanUtils.copyProperties(systemAuthRole, vo);
vo.setMember(member);
vo.setMenus(iSystemAuthPermService.selectMenuIdsByRoleId(systemAuthRole.getId()));

10
server/like-admin/src/main/java/com/hxkj/admin/vo/common/album/AlbumCateVo.java
View File

@ -12,10 +12,10 @@ public class AlbumCateVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private Integer pid;
private String name;
private String createTime;
private String updateTime;
private Integer id; // 主键
private Integer pid; // 类目父级
private String name; // 类目名称
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

16
server/like-admin/src/main/java/com/hxkj/admin/vo/common/album/AlbumVo.java
View File

@ -12,13 +12,13 @@ public class AlbumVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private Integer cid;
private String name;
private String uri;
private String ext;
private String size;
private String createTime;
private String updateTime;
private Integer id; // 主键
private Integer cid; // 所属类目
private String name; // 文件名称
private String uri; // 文件路径
private String ext; // 文件扩展
private String size; // 文件大小
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

14
server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleCateVo.java
View File

@ -10,11 +10,13 @@ import java.io.Serializable;
@Data
public class ArticleCateVo implements Serializable {
private Integer id;
private String name;
private Integer sort;
private Integer isShow;
private String createTime;
private String updateTime;
private static final long serialVersionUID = 1L;
private Integer id; // 主键
private String name; // 分类名称
private Integer sort; // 排序编号
private Integer isShow; // 是否显示
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

22
server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleDetailVo.java
View File

@ -12,16 +12,16 @@ public class ArticleDetailVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private Integer cid;
private String title;
private String image;
private String intro;
private String content;
private Integer visit;
private Integer sort;
private Integer isShow;
private String createTime;
private String updateTime;
private Integer id; // 主键
private Integer cid; // 分类
private String title; // 标题
private String image; // 图片
private String intro; // 简介
private String content; // 内容
private Integer visit; // 访问
private Integer sort; // 排序
private Integer isShow; // 是否显示: [0=否, 1=是]
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

21
server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleListVo.java
View File

@ -4,19 +4,22 @@ import lombok.Data;
import java.io.Serializable;
/**
* 文章列表Vo
*/
@Data
public class ArticleListVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private String category;
private String title;
private String image;
private Integer visit;
private Integer sort;
private Integer isShow;
private String createTime;
private String updateTime;
private Integer id; // 主键
private String category; // 分类
private String title; // 标题
private String image; // 图片
private Integer visit; // 访问
private Integer sort; // 排序
private Integer isShow; // 是否显示: [0=否, 1=是]
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

18
server/like-admin/src/main/java/com/hxkj/admin/vo/setting/DictDataVo.java
View File

@ -12,14 +12,14 @@ public class DictDataVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private Integer typeId;
private String name;
private String value;
private String remark;
private Integer sort;
private Integer status;
private String createTime;
private String updateTime;
private Integer id; // 主键
private Integer typeId; // 类型
private String name; // 键
private String value; // 值
private String remark; // 备注
private Integer sort; // 排序
private Integer status; // 状态: [0=停用, 1=禁用]
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

14
server/like-admin/src/main/java/com/hxkj/admin/vo/setting/DictTypeVo.java
View File

@ -12,12 +12,12 @@ public class DictTypeVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private String dictName;
private String dictType;
private String dictRemark;
private Integer dictStatus;
private String createTime;
private String updateTime;
private Integer id; // 主键
private String dictName; // 字典名称
private String dictType; // 字典类型
private String dictRemark; // 字典备注
private Integer dictStatus; // 字典状态
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

14
server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java
View File

@ -12,12 +12,12 @@ public class LogLoginVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private String username;
private String ip;
private String os;
private String browser;
private Integer status;
private String createTime;
private Integer id; // 主键
private String username; // 用户名称
private String ip; // 来源IP
private String os; // 终端设备
private String browser; // 浏览器UA
private Integer status; // 操作状态: [0=失败, 1=成功]
private String createTime; // 创建时间
}

30
server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java
View File

@ -12,20 +12,20 @@ public class LogOperateVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private String username;
private String nickname;
private String type;
private String title;
private String method;
private String ip;
private String url;
private String args;
private String error;
private Integer status;
private String taskTime;
private String startTime;
private String endTime;
private String createTime;
private Integer id; // 主键
private String username; // 用户账号
private String nickname; // 用户昵称
private String type; // 请求类型
private String title; // 请求模块
private String method; // 请求方式
private String ip; // 请求IP
private String url; // 请求地址
private String args; // 请求参数
private String error; // 错误信息
private Integer status; // 执行状态: [0=失败, 1=成功]
private String taskTime; // 执行耗时
private String startTime; // 开始时间
private String endTime; // 结束时间
private String createTime; // 创建时间
}

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

@ -1,30 +0,0 @@
package com.hxkj.admin.vo.system;
import lombok.Data;
import java.io.Serializable;
/**
* 管理员Vo
*/
@Data
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;
private String lastLoginIp;
private String lastLoginTime;
private String createTime;
private String updateTime;
}

30
server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAuthAdminVo.java Normal file
View File

@ -0,0 +1,30 @@
package com.hxkj.admin.vo.system;
import lombok.Data;
import java.io.Serializable;
/**
* 管理员Vo
*/
@Data
public class SystemAuthAdminVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id; // 主键
private Integer deptId; // 部门ID
private Integer postId; // 岗位ID
private String username; // 账号
private String nickname; // 昵称
private String avatar; // 头像
private String dept; // 部门
private String role; // 角色
private Integer isMultipoint; // 多端登录: [0=否, 1=是]
private Integer isDisable; // 是否禁用: [0=否, 1=是]
private String lastLoginIp; // 最后登录IP
private String lastLoginTime; // 最后登录时间
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

25
server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAuthDeptVo.java Normal file
View File

@ -0,0 +1,25 @@
package com.hxkj.admin.vo.system;
import lombok.Data;
import java.io.Serializable;
/**
* 部门Vo
*/
@Data
public class SystemAuthDeptVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id; // 主键
private Integer pid; // 部门父级
private String name; // 部门名称
private String duty; // 负责人
private String mobile; // 联系电话
private Integer sort; // 排序编号
private Integer isStop; // 是否停用: [0=否, 1=是]
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

32
server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAuthMenuVo.java Normal file
View File

@ -0,0 +1,32 @@
package com.hxkj.admin.vo.system;
import lombok.Data;
import java.io.Serializable;
/**
* 系统菜单Vo
*/
@Data
public class SystemAuthMenuVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id; // 主键
private Integer pid; // 上级菜单
private String menuType; // 权限类型: [M=目录, C=菜单, A=按钮]
private String menuName; // 菜单名称
private String menuIcon; // 菜单图标
private Integer menuSort; // 菜单排序
private String perms; // 权限标识
private String paths; // 路由地址
private String component; // 前端组件
private String selected; // 选中路径
private String params; // 路由参数
private Integer isCache; // 是否缓存: [0=否, 1=是]
private Integer isShow; // 是否显示: [0=否, 1=是]
private Integer isDisable; // 是否禁用: [0=否, 1=是]
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

24
server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAuthPostVo.java Normal file
View File

@ -0,0 +1,24 @@
package com.hxkj.admin.vo.system;
import lombok.Data;
import java.io.Serializable;
/**
* 系统岗位Vo
*/
@Data
public class SystemAuthPostVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id; // 主键
private String code; // 岗位编号
private String name; // 岗位名称
private String remarks; // 岗位备注
private Integer sort; // 岗位排序
private Integer isStop; // 是否停用: [0=否, 1=是]
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

25
server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAuthRoleVo.java Normal file
View File

@ -0,0 +1,25 @@
package com.hxkj.admin.vo.system;
import lombok.Data;
import java.io.Serializable;
/**
* 系统角色Vo
*/
@Data
public class SystemAuthRoleVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id; // 主键
private String name; // 角色名称
private String remark; // 角色备注
private Object menus; // 关联菜单
private Integer member; // 成员数量
private Integer sort; // 角色排序
private Integer isDisable; // 是否禁用: [0=否, 1=是]
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

14
server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAuthSelfVo.java Normal file
View File

@ -0,0 +1,14 @@
package com.hxkj.admin.vo.system;
import lombok.Data;
/**
* 当前系统管理员Vo
*/
@Data
public class SystemAuthSelfVo {
private Object user; // 用户信息
private Object permissions; // 权限集合: [[*]=>所有权限, ['article:add']=>部分权限]
}

18
server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAuthVo.java
View File

@ -1,18 +0,0 @@
package com.hxkj.admin.vo.system;
import lombok.Data;
import java.io.Serializable;
/**
* 权限Vo
*/
@Data
public class SystemAuthVo implements Serializable {
private static final long serialVersionUID = 1L;
private String path;
private Object auth;
}

25
server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemDeptVo.java
View File

@ -1,25 +0,0 @@
package com.hxkj.admin.vo.system;
import lombok.Data;
import java.io.Serializable;
/**
* 部门Vo
*/
@Data
public class SystemDeptVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private Integer pid;
private String name;
private String duty;
private String mobile;
private Integer sort;
private Integer isStop;
private String createTime;
private String updateTime;
}

32
server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java
View File

@ -1,32 +0,0 @@
package com.hxkj.admin.vo.system;
import lombok.Data;
import java.io.Serializable;
/**
* 系统菜单Vo
*/
@Data
public class SystemMenuVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private Integer pid;
private String menuType;
private String menuName;
private String menuIcon;
private Integer menuSort;
private String perms;
private String paths;
private String component;
private String selected;
private String params;
private Integer isCache;
private Integer isShow;
private Integer isDisable;
private String createTime;
private String updateTime;
}

24
server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemPostVo.java
View File

@ -1,24 +0,0 @@
package com.hxkj.admin.vo.system;
import lombok.Data;
import java.io.Serializable;
/**
* 系统岗位Vo
*/
@Data
public class SystemPostVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private String code;
private String name;
private String remarks;
private Integer sort;
private Integer isStop;
private String createTime;
private String updateTime;
}

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

@ -1,25 +0,0 @@
package com.hxkj.admin.vo.system;
import lombok.Data;
import java.io.Serializable;
/**
* 系统角色Vo
*/
@Data
public class SystemRoleVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private String name;
private String remark;
private Object menus;
private Integer member;
private Integer sort;
private Integer isDisable;
private String createTime;
private String updateTime;
}

14
server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemSelfVo.java
View File

@ -1,14 +0,0 @@
package com.hxkj.admin.vo.system;
import lombok.Data;
/**
* 当前系统管理员Vo
*/
@Data
public class SystemSelfVo {
private Object user;
private Object permissions;
}