czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

分页

Browse Source
This commit is contained in:
GYJ
2025-01-02 19:49:10 +08:00
parent f5626621f0
commit 96aebfdd8b
14 changed files with 269 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/sqx/modules/sys/controller/SysConfigController.java
View File

@@ -1,16 +1,20 @@
package com.sqx.modules.sys.controller;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sqx.common.annotation.SysLog;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Result;
import com.sqx.common.validator.ValidatorUtils;
import com.sqx.modules.sys.entity.SysConfigEntity;
import com.sqx.modules.sys.service.SysConfigService;
import com.sqx.modules.utils.ParamPageUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
@@ -29,9 +33,10 @@ public class SysConfigController extends AbstractController {
@GetMapping("/list")
@RequiresPermissions("sys:config:list")
public Result list(@RequestParam Map<String, Object> params){
PageUtils page = sysConfigService.queryPage(params);
return Result.success().put("page", page);
PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
List<SysConfigEntity> list = sysConfigService.list();
PageInfo<SysConfigEntity> pageInfo = new PageInfo<>(list);
return Result.success().put("page", PageUtils.page(pageInfo));
}

21
src/main/java/com/sqx/modules/sys/controller/SysDictController.java
View File

@@ -1,20 +1,23 @@
package com.sqx.modules.sys.controller;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Result;
import com.sqx.common.validator.ValidatorUtils;
import com.sqx.modules.sys.entity.SysDictEntity;
import com.sqx.modules.sys.service.SysDictService;
import com.sqx.modules.utils.ParamPageUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* 数据字典
*
*/
@RestController
@RequestMapping("sys/dict")
@@ -27,10 +30,12 @@ public class SysDictController {
*/
@RequestMapping("/list")
@RequiresPermissions("sys:dict:list")
public Result list(@RequestParam Map<String, Object> params){
PageUtils page = sysDictService.queryPage(params);
public Result list(@RequestParam Map<String, Object> params) {
PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
List<SysDictEntity> list = sysDictService.list();
PageInfo<SysDictEntity> pageInfo = new PageInfo<>(list);
return Result.success().put("page", page);
return Result.success().put("page", PageUtils.page(pageInfo));
}
@@ -39,7 +44,7 @@ public class SysDictController {
*/
@RequestMapping("/info/{id}")
@RequiresPermissions("sys:dict:info")
public Result info(@PathVariable("id") Long id){
public Result info(@PathVariable("id") Long id) {
SysDictEntity dict = sysDictService.getById(id);
return Result.success().put("dict", dict);
@@ -50,7 +55,7 @@ public class SysDictController {
*/
@RequestMapping("/save")
@RequiresPermissions("sys:dict:save")
public Result save(@RequestBody SysDictEntity dict){
public Result save(@RequestBody SysDictEntity dict) {
//校验类型
ValidatorUtils.validateEntity(dict);
@@ -64,7 +69,7 @@ public class SysDictController {
*/
@RequestMapping("/update")
@RequiresPermissions("sys:dict:update")
public Result update(@RequestBody SysDictEntity dict){
public Result update(@RequestBody SysDictEntity dict) {
//校验类型
ValidatorUtils.validateEntity(dict);
@@ -78,7 +83,7 @@ public class SysDictController {
*/
@RequestMapping("/delete")
@RequiresPermissions("sys:dict:delete")
public Result delete(@RequestBody Long[] ids){
public Result delete(@RequestBody Long[] ids) {
sysDictService.removeByIds(Arrays.asList(ids));
return Result.success();

36
src/main/java/com/sqx/modules/sys/controller/SysLogController.java
View File

@@ -1,8 +1,12 @@
package com.sqx.modules.sys.controller;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Result;
import com.sqx.modules.sys.entity.SysLogEntity;
import com.sqx.modules.sys.service.SysLogService;
import com.sqx.modules.utils.ParamPageUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -11,29 +15,31 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
import java.util.Map;
/**
* 系统日志
*
*/
@Controller
@RequestMapping("/sys/log")
public class SysLogController {
@Autowired
private SysLogService sysLogService;
/**
* 列表
*/
@ResponseBody
@GetMapping("/list")
@RequiresPermissions("sys:log:list")
public Result list(@RequestParam Map<String, Object> params){
PageUtils page = sysLogService.queryPage(params);
@Autowired
private SysLogService sysLogService;
/**
* 列表
*/
@ResponseBody
@GetMapping("/list")
@RequiresPermissions("sys:log:list")
public Result list(@RequestParam Map<String, Object> params) {
PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
List<SysLogEntity> entities = sysLogService.list();
PageInfo<SysLogEntity> pageInfo = new PageInfo<>(entities);
return Result.success().put("page", PageUtils.page(pageInfo));
}
return Result.success().put("page", page);
}
}

148
src/main/java/com/sqx/modules/sys/controller/SysRoleController.java
View File

@@ -1,5 +1,7 @@
package com.sqx.modules.sys.controller;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sqx.common.annotation.SysLog;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Result;
@@ -7,6 +9,7 @@ import com.sqx.common.validator.ValidatorUtils;
import com.sqx.modules.sys.entity.SysRoleEntity;
import com.sqx.modules.sys.service.SysRoleMenuService;
import com.sqx.modules.sys.service.SysRoleService;
import com.sqx.modules.utils.ParamPageUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -17,101 +20,102 @@ import java.util.Map;
/**
* 角色管理
*
*/
@RestController
@RequestMapping("/sys/role")
public class SysRoleController extends AbstractController {
@Autowired
private SysRoleService sysRoleService;
@Autowired
private SysRoleMenuService sysRoleMenuService;
@Autowired
private SysRoleService sysRoleService;
@Autowired
private SysRoleMenuService sysRoleMenuService;
/**
* 角色列表
*/
@GetMapping("/list")
@RequiresPermissions("sys:role:list")
public Result list(@RequestParam Map<String, Object> params){
//如果不是超级管理员，则只查询自己创建的角色列表
/**
* 角色列表
*/
@GetMapping("/list")
@RequiresPermissions("sys:role:list")
public Result list(@RequestParam Map<String, Object> params) {
//如果不是超级管理员，则只查询自己创建的角色列表
/*if(getUserId() != Constant.SUPER_ADMIN){
params.put("createUserId", getUserId());
}*/
PageUtils page = sysRoleService.queryPage(params);
return Result.success().put("page", page);
}
PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
List<SysRoleEntity> list = sysRoleService.list();
PageInfo<SysRoleEntity> pageInfo = new PageInfo<>(list);
return Result.success().put("page", PageUtils.page(pageInfo));
}
/**
* 角色列表
*/
@GetMapping("/select")
@RequiresPermissions("sys:role:select")
public Result select(){
Map<String, Object> map = new HashMap<>();
/**
* 角色列表
*/
@GetMapping("/select")
@RequiresPermissions("sys:role:select")
public Result select() {
Map<String, Object> map = new HashMap<>();
//如果不是超级管理员，则只查询自己所拥有的角色列表
//如果不是超级管理员，则只查询自己所拥有的角色列表
/*if(getUserId() != Constant.SUPER_ADMIN){
map.put("create_user_id", getUserId());
}*/
List<SysRoleEntity> list = (List<SysRoleEntity>) sysRoleService.listByMap(map);
List<SysRoleEntity> list = (List<SysRoleEntity>) sysRoleService.listByMap(map);
return Result.success().put("list", list);
}
return Result.success().put("list", list);
}
/**
* 角色信息
*/
@GetMapping("/info/{roleId}")
@RequiresPermissions("sys:role:info")
public Result info(@PathVariable("roleId") Long roleId){
SysRoleEntity role = sysRoleService.getById(roleId);
/**
* 角色信息
*/
@GetMapping("/info/{roleId}")
@RequiresPermissions("sys:role:info")
public Result info(@PathVariable("roleId") Long roleId) {
SysRoleEntity role = sysRoleService.getById(roleId);
//查询角色对应的菜单
List<Long> menuIdList = sysRoleMenuService.queryMenuIdList(roleId);
role.setMenuIdList(menuIdList);
//查询角色对应的菜单
List<Long> menuIdList = sysRoleMenuService.queryMenuIdList(roleId);
role.setMenuIdList(menuIdList);
return Result.success().put("role", role);
}
return Result.success().put("role", role);
}
/**
* 保存角色
*/
@SysLog("保存角色")
@PostMapping("/save")
@RequiresPermissions("sys:role:save")
public Result save(@RequestBody SysRoleEntity role){
ValidatorUtils.validateEntity(role);
/**
* 保存角色
*/
@SysLog("保存角色")
@PostMapping("/save")
@RequiresPermissions("sys:role:save")
public Result save(@RequestBody SysRoleEntity role) {
ValidatorUtils.validateEntity(role);
role.setCreateUserId(getUserId());
sysRoleService.saveRole(role);
role.setCreateUserId(getUserId());
sysRoleService.saveRole(role);
return Result.success();
}
return Result.success();
}
/**
* 修改角色
*/
@SysLog("修改角色")
@PostMapping("/update")
@RequiresPermissions("sys:role:update")
public Result update(@RequestBody SysRoleEntity role){
ValidatorUtils.validateEntity(role);
/**
* 修改角色
*/
@SysLog("修改角色")
@PostMapping("/update")
@RequiresPermissions("sys:role:update")
public Result update(@RequestBody SysRoleEntity role) {
ValidatorUtils.validateEntity(role);
role.setCreateUserId(getUserId());
sysRoleService.update(role);
role.setCreateUserId(getUserId());
sysRoleService.update(role);
return Result.success();
}
return Result.success();
}
/**
* 删除角色
*/
@SysLog("删除角色")
@PostMapping("/delete")
@RequiresPermissions("sys:role:delete")
public Result delete(@RequestBody Long[] roleIds){
sysRoleService.deleteBatch(roleIds);
/**
* 删除角色
*/
@SysLog("删除角色")
@PostMapping("/delete")
@RequiresPermissions("sys:role:delete")
public Result delete(@RequestBody Long[] roleIds) {
sysRoleService.deleteBatch(roleIds);
return Result.success();
}
return Result.success();
}
}

44
src/main/java/com/sqx/modules/sys/controller/SysUserController.java
View File

@@ -1,5 +1,7 @@
package com.sqx.modules.sys.controller;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sqx.common.annotation.SysLog;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Result;
@@ -11,6 +13,7 @@ import com.sqx.modules.sys.entity.SysUserEntity;
import com.sqx.modules.sys.form.PasswordForm;
import com.sqx.modules.sys.service.SysUserRoleService;
import com.sqx.modules.sys.service.SysUserService;
import com.sqx.modules.utils.ParamPageUtils;
import org.apache.commons.lang.ArrayUtils;
import org.apache.shiro.crypto.hash.Sha256Hash;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,11 +44,12 @@ public class SysUserController extends AbstractController {
/*if(getUserId() != Constant.SUPER_ADMIN){
params.put("createUserId", getUserId());
}*/
PageUtils page = sysUserService.queryPage(params);
return Result.success().put("page", page);
PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
List<SysUserEntity> list = sysUserService.list();
PageInfo<SysUserEntity> pageInfo = new PageInfo<>(list);
return Result.success().put("page", PageUtils.page(pageInfo));
}
/**
* 获取登录的用户信息
*/
@@ -53,42 +57,42 @@ public class SysUserController extends AbstractController {
public Result info(){
return Result.success().put("user", getUser());
}
/**
* 修改登录用户密码
*/
@SysLog("修改密码")
public Result password(@RequestBody PasswordForm form){
Assert.isBlank(form.getNewPassword(), "新密码不为能空");
//sha256加密
String password = new Sha256Hash(form.getPassword(), getUser().getSalt()).toHex();
//sha256加密
String newPassword = new Sha256Hash(form.getNewPassword(), getUser().getSalt()).toHex();
//更新密码
boolean flag = sysUserService.updatePassword(getUserId(), password, newPassword);
if(!flag){
return Result.error("原密码不正确");
}
return Result.success();
}
/**
* 用户信息
*/
@GetMapping("/info/{userId}")
public Result info(@PathVariable("userId") Long userId){
SysUserEntity user = sysUserService.getById(userId);
//获取用户所属的角色列表
List<Long> roleIdList = sysUserRoleService.queryRoleIdList(userId);
user.setRoleIdList(roleIdList);
return Result.success().put("user", user);
}
/**
* 保存用户
*/
@@ -96,13 +100,13 @@ public class SysUserController extends AbstractController {
@PostMapping("/save")
public Result save(@RequestBody SysUserEntity user){
ValidatorUtils.validateEntity(user, AddGroup.class);
user.setCreateUserId(getUserId());
sysUserService.saveUser(user);
return Result.success();
}
/**
* 修改用户
*/
@@ -113,10 +117,10 @@ public class SysUserController extends AbstractController {
user.setCreateUserId(getUserId());
sysUserService.update(user);
return Result.success();
}
/**
* 删除用户
*/
@@ -126,13 +130,13 @@ public class SysUserController extends AbstractController {
if(ArrayUtils.contains(userIds, 1L)){
return Result.error("系统管理员不能删除");
}
if(ArrayUtils.contains(userIds, getUserId())){
return Result.error("当前用户不能删除");
}
sysUserService.deleteBatch(userIds);
return Result.success();
}
}

128
src/main/java/com/sqx/modules/sys/service/impl/SysConfigServiceImpl.java
View File

@@ -1,99 +1,97 @@
package com.sqx.modules.sys.service.impl;
import cn.hutool.core.map.MapProxy;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.gson.Gson;
import com.sqx.common.exception.SqxException;
import com.sqx.common.utils.Constant;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Query;
import com.sqx.modules.sys.dao.SysConfigDao;
import com.sqx.modules.sys.entity.SysConfigEntity;
import com.sqx.modules.sys.redis.SysConfigRedis;
import com.sqx.modules.sys.service.SysConfigService;
import com.sqx.modules.utils.ParamPageUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@Service("sysConfigService")
public class SysConfigServiceImpl extends ServiceImpl<SysConfigDao, SysConfigEntity> implements SysConfigService {
@Autowired
private SysConfigRedis sysConfigRedis;
@Autowired
private SysConfigRedis sysConfigRedis;
@Override
public PageUtils queryPage(Map<String, Object> params) {
String paramKey = (String)params.get("paramKey");
@Override
public PageUtils queryPage(Map<String, Object> params) {
String paramKey = (String) params.get("paramKey");
MapProxy proxy = MapProxy.create(params);
long pageNum = proxy.getLong(Constant.PAGE, 1L);
long pageSize = proxy.getLong(Constant.LIMIT, 10L);
PageHelper.startPage((int) pageNum, (int) pageSize);
return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper<SysConfigEntity>()
.like(StringUtils.isNotBlank(paramKey),"param_key", paramKey)
.eq("status", 1))));
}
PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
List<SysConfigEntity> entityList = baseMapper.selectList(new QueryWrapper<SysConfigEntity>()
.like(StringUtils.isNotBlank(paramKey), "param_key", paramKey)
.eq("status", 1)
);
PageInfo<SysConfigEntity> pageInfo = new PageInfo<>(entityList);
return PageUtils.page(pageInfo);
}
@Override
public void saveConfig(SysConfigEntity config) {
this.save(config);
sysConfigRedis.saveOrUpdate(config);
}
@Override
public void saveConfig(SysConfigEntity config) {
this.save(config);
sysConfigRedis.saveOrUpdate(config);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(SysConfigEntity config) {
this.updateById(config);
sysConfigRedis.saveOrUpdate(config);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(SysConfigEntity config) {
this.updateById(config);
sysConfigRedis.saveOrUpdate(config);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateValueByKey(String key, String value) {
baseMapper.updateValueByKey(key, value);
sysConfigRedis.delete(key);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateValueByKey(String key, String value) {
baseMapper.updateValueByKey(key, value);
sysConfigRedis.delete(key);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteBatch(Long[] ids) {
for(Long id : ids){
SysConfigEntity config = this.getById(id);
sysConfigRedis.delete(config.getParamKey());
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteBatch(Long[] ids) {
for (Long id : ids) {
SysConfigEntity config = this.getById(id);
sysConfigRedis.delete(config.getParamKey());
}
this.removeByIds(Arrays.asList(ids));
}
this.removeByIds(Arrays.asList(ids));
}
@Override
public String getValue(String key) {
SysConfigEntity config = sysConfigRedis.get(key);
if(config == null){
config = baseMapper.queryByKey(key);
sysConfigRedis.saveOrUpdate(config);
}
@Override
public String getValue(String key) {
SysConfigEntity config = sysConfigRedis.get(key);
if (config == null) {
config = baseMapper.queryByKey(key);
sysConfigRedis.saveOrUpdate(config);
}
return config == null ? null : config.getParamValue();
}
@Override
public <T> T getConfigObject(String key, Class<T> clazz) {
String value = getValue(key);
if(StringUtils.isNotBlank(value)){
return new Gson().fromJson(value, clazz);
}
return config == null ? null : config.getParamValue();
}
try {
return clazz.newInstance();
} catch (Exception e) {
throw new SqxException("获取参数失败");
}
}
@Override
public <T> T getConfigObject(String key, Class<T> clazz) {
String value = getValue(key);
if (StringUtils.isNotBlank(value)) {
return new Gson().fromJson(value, clazz);
}
try {
return clazz.newInstance();
} catch (Exception e) {
throw new SqxException("获取参数失败");
}
}
}

22
src/main/java/com/sqx/modules/sys/service/impl/SysDictServiceImpl.java
View File

@@ -1,20 +1,18 @@
package com.sqx.modules.sys.service.impl;
import cn.hutool.core.map.MapProxy;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sqx.common.utils.Constant;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Query;
import com.sqx.modules.sys.dao.SysDictDao;
import com.sqx.modules.sys.entity.SysDictEntity;
import com.sqx.modules.sys.service.SysDictService;
import com.sqx.modules.utils.ParamPageUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@@ -23,16 +21,14 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictDao, SysDictEntity> i
@Override
public PageUtils queryPage(Map<String, Object> params) {
String name = (String)params.get("name");
MapProxy proxy = MapProxy.create(params);
long pageNum = proxy.getLong(Constant.PAGE, 1L);
long pageSize = proxy.getLong(Constant.LIMIT, 10L);
PageHelper.startPage((int) pageNum, (int) pageSize);
return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper<SysDictEntity>()
.like(StringUtils.isNotBlank(name),"name", name))));
String name = (String) params.get("name");
PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
List<SysDictEntity> entityList = baseMapper.selectList(new QueryWrapper<SysDictEntity>()
.like(StringUtils.isNotBlank(name), "name", name)
);
PageInfo<SysDictEntity> pageInfo = new PageInfo<>(entityList);
return PageUtils.page(pageInfo);
}
}

17
src/main/java/com/sqx/modules/sys/service/impl/SysLogServiceImpl.java
View File

@@ -1,20 +1,18 @@
package com.sqx.modules.sys.service.impl;
import cn.hutool.core.map.MapProxy;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sqx.common.utils.Constant;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Query;
import com.sqx.modules.sys.dao.SysLogDao;
import com.sqx.modules.sys.entity.SysLogEntity;
import com.sqx.modules.sys.service.SysLogService;
import com.sqx.modules.utils.ParamPageUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@@ -23,12 +21,11 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogDao, SysLogEntity> impl
@Override
public PageUtils queryPage(Map<String, Object> params) {
String key = (String)params.get("key");
String key = (String) params.get("key");
MapProxy proxy = MapProxy.create(params);
long pageNum = proxy.getLong(Constant.PAGE, 1L);
long pageSize = proxy.getLong(Constant.LIMIT, 10L);
PageHelper.startPage((int) pageNum, (int) pageSize);
return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper<SysLogEntity>().like(StringUtils.isNotBlank(key),"username", key))));
PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
List<SysLogEntity> list = baseMapper.selectList(new QueryWrapper<SysLogEntity>().like(StringUtils.isNotBlank(key), "username", key));
PageInfo<SysLogEntity> pageInfo = new PageInfo<>(list);
return PageUtils.page(pageInfo);
}
}

26
src/main/java/com/sqx/modules/sys/service/impl/SysRoleServiceImpl.java
View File

@@ -1,20 +1,16 @@
package com.sqx.modules.sys.service.impl;
import cn.hutool.core.map.MapProxy;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sqx.common.utils.Constant;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Query;
import com.sqx.modules.sys.dao.SysRoleDao;
import com.sqx.modules.sys.entity.SysRoleEntity;
import com.sqx.modules.sys.service.SysRoleMenuService;
import com.sqx.modules.sys.service.SysRoleService;
import com.sqx.modules.sys.service.SysUserRoleService;
import com.sqx.modules.sys.service.SysUserService;
import com.sqx.modules.utils.ParamPageUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,8 +29,6 @@ import java.util.Map;
public class SysRoleServiceImpl extends ServiceImpl<SysRoleDao, SysRoleEntity> implements SysRoleService {
@Autowired
private SysRoleMenuService sysRoleMenuService;
@Autowired
private SysUserService sysUserService;
@Autowired
private SysUserRoleService sysUserRoleService;
@@ -42,13 +36,13 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleDao, SysRoleEntity> i
public PageUtils queryPage(Map<String, Object> params) {
String roleName = (String)params.get("roleName");
Long createUserId = (Long)params.get("createUserId");
MapProxy proxy = MapProxy.create(params);
long pageNum = proxy.getLong(Constant.PAGE, 1L);
long pageSize = proxy.getLong(Constant.LIMIT, 10L);
PageHelper.startPage((int) pageNum, (int) pageSize);
return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper<SysRoleEntity>()
.like(StringUtils.isNotBlank(roleName),"role_name", roleName)
.eq(createUserId != null,"create_user_id", createUserId))));
PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
List<SysRoleEntity> sysRoleEntities = baseMapper.selectList(new QueryWrapper<SysRoleEntity>()
.like(StringUtils.isNotBlank(roleName), "role_name", roleName)
.eq(createUserId != null, "create_user_id", createUserId));
PageInfo<SysRoleEntity> pageInfo = new PageInfo<>(sysRoleEntities);
return PageUtils.page(pageInfo);
}
@Override
@@ -103,10 +97,10 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleDao, SysRoleEntity> i
if(role.getCreateUserId() == Constant.SUPER_ADMIN){
return ;
}
//查询用户所拥有的菜单列表
List<Long> menuIdList = sysUserService.queryAllMenuId(role.getCreateUserId());
//判断是否越权
if(!menuIdList.containsAll(role.getMenuIdList())){
throw new SqxException("新增角色的权限，已超出你的权限范围");

20
src/main/java/com/sqx/modules/sys/service/impl/SysUserServiceImpl.java
View File

@@ -1,20 +1,17 @@
package com.sqx.modules.sys.service.impl;
import cn.hutool.core.map.MapProxy;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sqx.common.utils.Constant;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Query;
import com.sqx.modules.sys.dao.SysUserDao;
import com.sqx.modules.sys.entity.SysUserEntity;
import com.sqx.modules.sys.service.SysRoleService;
import com.sqx.modules.sys.service.SysUserRoleService;
import com.sqx.modules.sys.service.SysUserService;
import com.sqx.modules.utils.InvitationCodeUtil;
import com.sqx.modules.utils.ParamPageUtils;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.crypto.hash.Sha256Hash;
@@ -45,17 +42,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
Long createUserId = (Long) params.get("createUserId");
Object isChannel = params.get("isChannel");
Object sysUserId = params.get("sysUserId");
MapProxy proxy = MapProxy.create(params);
long pageNum = proxy.getLong(Constant.PAGE, 1L);
long pageSize = proxy.getLong(Constant.LIMIT, 10L);
PageHelper.startPage((int) pageNum, (int) pageSize);
return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper<SysUserEntity>()
PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
List<SysUserEntity> sysUserEntities = baseMapper.selectList(new QueryWrapper<SysUserEntity>()
.like(StringUtils.isNotBlank(username), "username", username)
.eq(createUserId != null, "create_user_id", createUserId)
.eq(isChannel != null, "is_channel", isChannel)
.eq(sysUserId != null, "sys_user_id", sysUserId)
.isNull(sysUserId == null, "sys_user_id")
.isNull(isChannel == null, "is_channel"))));
.isNull(isChannel == null, "is_channel"));
PageInfo<SysUserEntity> pageInfo = new PageInfo<>(sysUserEntities);
return PageUtils.page(pageInfo);
}
@Override
@@ -135,7 +131,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
if(user.getCreateUserId() == Constant.SUPER_ADMIN){
return ;
}
//查询用户创建的角色列表
List<Long> roleIdList = sysRoleService.queryRoleIdList(user.getCreateUserId());
@@ -150,4 +146,4 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
return baseMapper.selectOne(new QueryWrapper<SysUserEntity>().isNull("sys_user_id").eq("qd_code", qdCode));
}
}
}