weizhiqiang1995/erp-pro
1
1
Fork 0
mirror of https://github.com/weizhiqiang1995/erp-pro.git synced 2025-03-01 01:43:45 +08:00
Code Issues Projects Releases Packages Wiki Activity

【角色】角色列表整改

Browse source
This commit is contained in:
weizhiqiang 2022-07-15 00:14:39 +08:00
parent ade3af8923
commit b00e50dcaa
5 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/SysEveRoleController.java
View file

@ -8,6 +8,7 @@ import com.skyeye.annotation.api.Api;
import com.skyeye.annotation.api.ApiImplicitParam;
import com.skyeye.annotation.api.ApiImplicitParams;
import com.skyeye.annotation.api.ApiOperation;
import com.skyeye.common.entity.CommonPageInfo;
import com.skyeye.common.object.InputObject;
import com.skyeye.common.object.OutputObject;
import com.skyeye.eve.entity.userauth.auth.RoleMation;
@ -38,10 +39,7 @@ public class SysEveRoleController {
* @param outputObject
*/
@ApiOperation(id = "sys013", value = "获取角色列表", method = "POST", allUse = "1")
@ApiImplicitParams({
@ApiImplicitParam(id = "limit", name = "limit", value = "分页参数,每页多少条数据", required = "required,num"),
@ApiImplicitParam(id = "page", name = "page", value = "分页参数,第几页", required = "required,num"),
@ApiImplicitParam(id = "roleName", name = "roleName", value = "角色名称", required = "")})
@ApiImplicitParams(classBean = CommonPageInfo.class)
@RequestMapping("/post/SysEveRoleController/querySysRoleList")
public void querySysRoleList(InputObject inputObject, OutputObject outputObject) {
sysEveRoleService.querySysRoleList(inputObject, outputObject);

3
skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/dao/SysEveRoleDao.java
View file

@ -4,6 +4,7 @@
package com.skyeye.eve.dao;
import com.skyeye.common.entity.CommonPageInfo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -19,7 +20,7 @@ import java.util.Map;
*/
public interface SysEveRoleDao {
List<Map<String, Object>> querySysRoleList(Map<String, Object> map);
List<Map<String, Object>> querySysRoleList(CommonPageInfo commonPageInfo);
List<Map<String, Object>> querySysRoleBandMenuList(Map<String, Object> map);

3
skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/ExExplainServiceImpl.java
View file

@ -16,7 +16,6 @@ import com.skyeye.jedis.JedisClientService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.util.HtmlUtils;
import java.util.HashMap;
import java.util.Map;
@ -68,7 +67,6 @@ public class ExExplainServiceImpl implements ExExplainService {
public void queryExExplainMation(InputObject inputObject, OutputObject outputObject) {
Map<String, Object> map = inputObject.getParams();
Map<String, Object> bean = exExplainDao.queryExExplainMation(map);
bean.put("content", HtmlUtils.htmlUnescape(bean.get("content").toString()));
outputObject.setBean(bean);
outputObject.settotal(1);
}
@ -112,7 +110,6 @@ public class ExExplainServiceImpl implements ExExplainService {
map.put("title", "标题");
map.put("content", "等待发布说明。");
} else {
bean.put("content", HtmlUtils.htmlUnescape(bean.get("content").toString()));
jedisClient.set(key, JSONUtil.toJsonStr(bean));
map = bean;
}

7
skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveRoleServiceImpl.java
View file

@ -7,6 +7,7 @@ package com.skyeye.eve.service.impl;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.skyeye.common.constans.Constants;
import com.skyeye.common.entity.CommonPageInfo;
import com.skyeye.common.object.InputObject;
import com.skyeye.common.object.OutputObject;
import com.skyeye.common.util.DateUtil;
@ -49,9 +50,9 @@ public class SysEveRoleServiceImpl implements SysEveRoleService {
*/
@Override
public void querySysRoleList(InputObject inputObject, OutputObject outputObject) {
Map<String, Object> map = inputObject.getParams();
Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString()));
List<Map<String, Object>> beans = sysEveRoleDao.querySysRoleList(map);
CommonPageInfo commonPageInfo = inputObject.getParams(CommonPageInfo.class);
Page pages = PageHelper.startPage(commonPageInfo.getPage(), commonPageInfo.getLimit());
List<Map<String, Object>> beans = sysEveRoleDao.querySysRoleList(commonPageInfo);
outputObject.setBeans(beans);
outputObject.settotal(pages.getTotal());
}

11
skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveRoleMapper.xml
View file

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.skyeye.eve.dao.SysEveRoleDao">
<select id="querySysRoleList" parameterType="java.util.Map" resultType="java.util.Map">
<select id="querySysRoleList" resultType="java.util.Map">
SELECT
a.id,
a.role_name roleName,
@ -12,10 +12,11 @@
(SELECT COUNT(*) FROM sys_eve_user b WHERE INSTR(CONCAT(',', b.role_id, ','), CONCAT(',', a.id, ','))) userNum
FROM
sys_eve_role a
WHERE 1 = 1
<if test="roleName != '' and roleName != null">
AND a.role_name LIKE '%${roleName}%'
</if>
<where>
<!-- <if test="roleName != '' and roleName != null">-->
<!-- AND a.role_name LIKE '%${roleName}%'-->
<!-- </if>-->
</where>
ORDER BY a.create_time DESC
</select>