LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
梁琦涛
2021-08-26 17:58:29 +08:00
parent 16cc747448 f87ea78248
commit 58c037a850
22 changed files with 1263 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java
+35
View File
@@ -13,8 +13,11 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.system.vo.SysDepartTreeModel;
import com.jero.common.system.vo.SysRoleTreeModel;
import com.jero.modules.system.entity.*;
import com.jero.modules.system.service.*;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.authz.annotation.RequiresRoles;
import com.jero.common.api.vo.Result;
@@ -101,6 +104,38 @@ public class SysRoleController {
result.setResult(pageList);
return result;
}
/**
* 查询数据 查出所有角色,并以树结构数据格式响应给前端
*
* @return
*/
@ApiOperation(value="树结构查询", notes="查询数据 查出所有角色,并以树结构数据格式响应给前端")
@RequiresPermissions("sys:depart:list")
@RequestMapping(value = "/treeList", method = RequestMethod.GET)
public Result<List<SysRoleTreeModel>> queryTreeList() {
List<SysRoleTreeModel> list = sysRoleService.queryTreeList();
return Result.OK(list);
}
/**
* 查询数据分页 查出所有角色,并以树结构数据格式响应给前端
*
* @return
*/
@ApiOperation(value="树结构分页查询", notes="查询数据分页 查出所有角色,并以树结构数据格式响应给前端")
@RequiresPermissions("sys:depart:list")
@RequestMapping(value = "/treeListPage", method = RequestMethod.GET)
public Result<Page<SysRoleTreeModel>> queryTreeListPage(SysRole role,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<SysRole> queryWrapper = QueryGenerator.initQueryWrapper(role, req.getParameterMap());
queryWrapper.isNull("parent_id");
Page<SysRole> page = new Page<>(pageNo, pageSize);
Page<SysRoleTreeModel> roleTreeModelPage = sysRoleService.queryTreeListPage(page, queryWrapper);
return Result.OK(roleTreeModelPage);
}
/**
* 添加
jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysRole.java
+5
View File
@@ -35,6 +35,11 @@ public class SysRole implements Serializable {
*/
@TableId(type = IdType.ASSIGN_ID)
private String id;
/**
* 父类id
*/
private String parentId;
/**
* 角色名称
jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysRoleService.java
+13
View File
@@ -1,11 +1,16 @@
package com.jero.modules.system.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.common.api.vo.Result;
import com.jero.common.system.vo.SysRoleTreeModel;
import com.jero.modules.system.entity.SysRole;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/**
* <p>
* 角色表 服务类
@@ -40,4 +45,12 @@ public interface ISysRoleService extends IService<SysRole> {
*/
public boolean deleteBatchRole(String[] roleids);
/**
* 查询角色树
* @return
* @param page
*/
List<SysRoleTreeModel> queryTreeList();
Page<SysRoleTreeModel> queryTreeListPage(Page<SysRole> page, QueryWrapper<SysRole> queryWrapper);
}
jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java
+71 -5
View File
@@ -1,25 +1,25 @@
package com.jero.modules.system.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.poi.ss.formula.functions.T;
import com.jero.common.system.vo.SysRoleTreeModel;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.util.ImportExcelUtil;
import com.jero.common.util.PmsUtil;
import com.jero.modules.quartz.service.IQuartzJobService;
import com.jero.modules.system.entity.SysRole;
import com.jero.modules.system.mapper.SysRoleMapper;
import com.jero.modules.system.mapper.SysUserMapper;
import com.jero.modules.system.service.ISysRoleService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -90,4 +90,70 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
this.removeByIds(Arrays.asList(roleIds));
return true;
}
@Override
public List<SysRoleTreeModel> queryTreeList() {
//1:获取所有父级
List<SysRoleTreeModel> parent = getChildrenByParentId(null);
return parent;
}
/**
* 根据父级id获取所有子集
* @param parentId
* @return
*/
private List<SysRoleTreeModel> getChildrenByParentId(String parentId){
LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<>();
if (parentId==null){
wrapper.isNull(SysRole::getParentId);
}else {
wrapper.eq(SysRole::getParentId,parentId);
}
List<SysRole> list = sysRoleMapper.selectList(wrapper);
List<SysRoleTreeModel> treeModelList = new ArrayList<>();
for (SysRole sysRole : list) {
SysRoleTreeModel treeModel = new SysRoleTreeModel();
BeanUtils.copyProperties(sysRole,treeModel);
treeModel.setKey(sysRole.getId());
treeModel.setValue(sysRole.getId());
treeModel.setTitle(sysRole.getRoleName());
List<SysRoleTreeModel> children = getChildrenByParentId(sysRole.getId());
treeModel.setChildren(children);
treeModelList.add(treeModel);
}
return treeModelList;
}
/**
* 获取角色分页
* @return
* @param page
* @param queryWrapper
*/
@Override
public Page<SysRoleTreeModel> queryTreeListPage(Page<SysRole> page, QueryWrapper<SysRole> queryWrapper){
//查询分页
Page<SysRole> sysRolePage = sysRoleMapper.selectPage(page, queryWrapper);
//new一个角色树分页
Page<SysRoleTreeModel> roleTreeModelPage = new Page<>();
BeanUtils.copyProperties(sysRolePage,roleTreeModelPage);
//遍历角色列表给角色树列表
List<SysRole> records = sysRolePage.getRecords();
List<SysRoleTreeModel> treeModelList = new ArrayList<>();
for (SysRole sysRole : records) {
SysRoleTreeModel treeModel = new SysRoleTreeModel();
BeanUtils.copyProperties(sysRole,treeModel);
treeModel.setKey(sysRole.getId());
treeModel.setValue(sysRole.getId());
treeModel.setTitle(sysRole.getRoleName());
//查询当前角色的子集
List<SysRoleTreeModel> children = getChildrenByParentId(sysRole.getId());
treeModel.setChildren(children);
treeModelList.add(treeModel);
}
roleTreeModelPage.setRecords(treeModelList);
return roleTreeModelPage;
}
}