Skip to content

G
guns-vip
Commit 9082d7e2 by fengshuonan
Options

适配数据库

parent 701769ab
Showing with 63 additions and 54 deletions
src/main/java/cn/stylefeng/guns/modular/system/controller/DeptController.java
...@@ -164,7 +164,7 @@ public class DeptController extends BaseController { ...@@ -164,7 +164,7 @@ public class DeptController extends BaseController {
@Permission @Permission
@ResponseBody @ResponseBody
public Object list(@RequestParam(value = "condition", required = false) String condition, public Object list(@RequestParam(value = "condition", required = false) String condition,
@RequestParam(value = "deptId", required = false) String deptId) { @RequestParam(value = "deptId", required = false) Long deptId) {
Page<Map<String, Object>> list = this.deptService.list(condition, deptId); Page<Map<String, Object>> list = this.deptService.list(condition, deptId);
Page<Map<String, Object>> wrap = new DeptWrapper(list).wrap(); Page<Map<String, Object>> wrap = new DeptWrapper(list).wrap();
return LayuiPageFactory.createPageInfo(wrap); return LayuiPageFactory.createPageInfo(wrap);
......
src/main/java/cn/stylefeng/guns/modular/system/controller/RoleController.java
...@@ -253,8 +253,16 @@ public class RoleController extends BaseController { ...@@ -253,8 +253,16 @@ public class RoleController extends BaseController {
if (ToolUtil.isEmpty(roleId)) { if (ToolUtil.isEmpty(roleId)) {
return this.roleService.roleTreeList(); return this.roleService.roleTreeList();
} else { } else {
String[] strArray = roleId.split(","); String[] strArray = roleId.split(",");
return this.roleService.roleTreeListByRoleId(strArray);
//转化成Long[]
Long[] longArray = new Long[strArray.length];
for (int i = 0; i < strArray.length; i++) {
longArray[i] = Long.valueOf(strArray[i]);
}
return this.roleService.roleTreeListByRoleId(longArray);
} }
} }
......
src/main/java/cn/stylefeng/guns/modular/system/mapper/DeptMapper.java
...@@ -28,7 +28,7 @@ public interface DeptMapper extends BaseMapper<Dept> { ...@@ -28,7 +28,7 @@ public interface DeptMapper extends BaseMapper<Dept> {
/** /**
* 获取所有部门列表 * 获取所有部门列表
*/ */
Page<Map<String, Object>> list(@Param("page") Page page, @Param("condition") String condition, @Param("deptId") String deptId); Page<Map<String, Object>> list(@Param("page") Page page, @Param("condition") String condition, @Param("deptId") Long deptId);
/** /**
* 获取所有部门树列表 * 获取所有部门树列表
...@@ -38,5 +38,5 @@ public interface DeptMapper extends BaseMapper<Dept> { ...@@ -38,5 +38,5 @@ public interface DeptMapper extends BaseMapper<Dept> {
/** /**
* where pids like '' * where pids like ''
*/ */
List<Dept> likePids(Long deptId); List<Dept> likePids(@Param("deptId") Long deptId);
} }
src/main/java/cn/stylefeng/guns/modular/system/mapper/DictMapper.java
...@@ -3,6 +3,7 @@ package cn.stylefeng.guns.modular.system.mapper; ...@@ -3,6 +3,7 @@ package cn.stylefeng.guns.modular.system.mapper;
import cn.stylefeng.guns.core.common.node.ZTreeNode; import cn.stylefeng.guns.core.common.node.ZTreeNode;
import cn.stylefeng.guns.modular.system.entity.Dict; import cn.stylefeng.guns.modular.system.entity.Dict;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -19,10 +20,10 @@ public interface DictMapper extends BaseMapper<Dict> { ...@@ -19,10 +20,10 @@ public interface DictMapper extends BaseMapper<Dict> {
/** /**
* 获取ztree的节点列表 * 获取ztree的节点列表
*/ */
List<ZTreeNode> dictTree(Long dictTypeId); List<ZTreeNode> dictTree(@Param("dictTypeId") Long dictTypeId);
/** /**
* where parentIds like '' * where parentIds like ''
*/ */
List<Dict> likeParentIds(Long dictId); List<Dict> likeParentIds(@Param("dictId") Long dictId);
} }
src/main/java/cn/stylefeng/guns/modular/system/mapper/MenuMapper.java
...@@ -59,7 +59,7 @@ public interface MenuMapper extends BaseMapper<Menu> { ...@@ -59,7 +59,7 @@ public interface MenuMapper extends BaseMapper<Menu> {
* @return * @return
* @date 2017年2月19日 下午4:10:59 * @date 2017年2月19日 下午4:10:59
*/ */
int deleteRelationByMenu(Long menuId); int deleteRelationByMenu(@Param("menuId") Long menuId);
/** /**
* 获取资源url通过角色id * 获取资源url通过角色id
...@@ -68,7 +68,7 @@ public interface MenuMapper extends BaseMapper<Menu> { ...@@ -68,7 +68,7 @@ public interface MenuMapper extends BaseMapper<Menu> {
* @return * @return
* @date 2017年2月19日 下午7:12:38 * @date 2017年2月19日 下午7:12:38
*/ */
List<String> getResUrlsByRoleId(Long roleId); List<String> getResUrlsByRoleId(@Param("roleId") Long roleId);
/** /**
* 根据角色获取菜单 * 根据角色获取菜单
......
src/main/java/cn/stylefeng/guns/modular/system/mapper/RoleMapper.java
...@@ -50,6 +50,6 @@ public interface RoleMapper extends BaseMapper<Role> { ...@@ -50,6 +50,6 @@ public interface RoleMapper extends BaseMapper<Role> {
* @return * @return
* @date 2017年2月18日 上午10:32:04 * @date 2017年2月18日 上午10:32:04
*/ */
List<ZTreeNode> roleTreeListByRoleId(String[] roleId); List<ZTreeNode> roleTreeListByRoleId(Long[] roleId);
} }
src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/DeptMapper.xml
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
dept_id AS deptId, pid AS pid, pids AS pids, simple_name AS simpleName, full_name AS fullName, description AS description, version AS version, sort AS sort, create_time AS createTime, update_time AS updateTime, create_user AS createUser, update_user AS updateUser dept_id AS "deptId", pid AS "pid", pids AS "pids", simple_name AS "simpleName", full_name AS "fullName", description AS "description", version AS "version", sort AS "sort", create_time AS "createTime", update_time AS "updateTime", create_user AS "createUser", update_user AS "updateUser"
</sql> </sql>
<select id="tree" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode"> <select id="tree" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode">
select dept_id AS id, pid as pId, simple_name as name, select dept_id AS id, pid as "pId", simple_name as name,
( (
CASE CASE
WHEN (pid = 0 OR pid IS NULL) THEN WHEN (pid = 0 OR pid IS NULL) THEN
...@@ -49,16 +49,16 @@ ...@@ -49,16 +49,16 @@
</select> </select>
<select id="treeviewNodes" resultType="cn.stylefeng.guns.core.common.node.TreeviewNode"> <select id="treeviewNodes" resultType="cn.stylefeng.guns.core.common.node.TreeviewNode">
select dept_id AS tags, pid as parentId, simple_name as text from sys_dept select dept_id AS tags, pid as "parentId", simple_name as text from sys_dept
</select> </select>
<select id="likePids" resultType="cn.stylefeng.guns.modular.system.entity.Dept"> <select id="likePids" resultType="cn.stylefeng.guns.modular.system.entity.Dept">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from sys_dept from sys_dept where 1 = 1
<where> <if test="deptId != null and deptId != ''">
pids LIKE CONCAT('%$[',#{deptId},'$]%') escape '$' and pids LIKE CONCAT('%$[',#{deptId},'$]%') escape '$'
</where> </if>
</select> </select>
</mapper> </mapper>
src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/DictMapper.xml
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
dict_id AS dictId, dict_type_id AS dictTypeId, code AS code, name AS name, parent_id AS parentId, parent_ids AS parentIds, status AS status, sort AS sort, description AS description, create_time AS createTime, update_time AS updateTime, create_user AS createUser, update_user AS updateUser dict_id AS "dictId", dict_type_id AS "dictTypeId", code AS "code", name AS "name", parent_id AS "parentId", parent_ids AS "parentIds", status AS "status", sort AS "sort", description AS "description", create_time AS "createTime", update_time AS "updateTime", create_user AS "createUser", update_user AS "updateUser"
</sql> </sql>
<select id="dictTree" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode"> <select id="dictTree" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode">
select dict_id AS id, parent_id as pId, name as name, select dict_id AS id, parent_id as "pId", name as name,
( (
CASE CASE
WHEN (parent_id = 0 OR parent_id IS NULL) THEN WHEN (parent_id = 0 OR parent_id IS NULL) THEN
...@@ -39,10 +39,10 @@ ...@@ -39,10 +39,10 @@
<select id="likeParentIds" resultType="cn.stylefeng.guns.modular.system.entity.Dict"> <select id="likeParentIds" resultType="cn.stylefeng.guns.modular.system.entity.Dict">
select select
<include refid="Base_Column_List"></include> <include refid="Base_Column_List"></include>
from sys_dict as base from sys_dict where 1 = 1
<where> <if test="dictId != null and dictId != ''">
parent_ids LIKE CONCAT('%$[',#{dictId},'$]%') escape '$' and parent_ids LIKE CONCAT('%$[',#{dictId},'$]%') escape '$'
</where> </if>
</select> </select>
</mapper> </mapper>
src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/DictTypeMapper.xml
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
base.dict_type_id AS dictTypeId, base.code AS code, base.name AS name, base.description AS description, base.system_flag AS systemFlag, base.status AS status, base.sort AS sort, base.create_time AS createTime, base.create_user AS createUser, base.update_time AS updateTime, base.update_user AS updateUser dict_type_id AS "dictTypeId", code AS "code", name AS "name", description AS "description", system_flag AS "systemFlag", status AS "status", sort AS "sort", create_time AS "createTime", create_user AS "createUser", update_time AS "updateTime", update_user AS "updateUser"
</sql> </sql>
</mapper> </mapper>
src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/FileInfoMapper.xml
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
base.file_id AS fileId, base.file_data AS fileData, base.create_time AS createTime, base.update_time AS updateTime, base.create_user AS createUser, base.update_user AS updateUser file_id AS "fileId", file_data AS "fileData", create_time AS "createTime", update_time AS "updateTime", create_user AS "createUser", update_user AS "updateUser"
</sql> </sql>
</mapper> </mapper>
src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/LoginLogMapper.xml
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
login_log_id AS loginLogId, log_name AS logName, user_id AS userId, create_time AS createTime, succeed AS succeed, message AS message, ip_address AS ipAddress login_log_id AS "loginLogId", log_name AS "logName", user_id AS "userId", create_time AS "createTime", succeed AS "succeed", message AS "message", ip_address AS "ipAddress"
</sql> </sql>
<select id="getLoginLogs" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> <select id="getLoginLogs" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
......
src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/MenuMapper.xml
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
menu_id AS menuId, code AS code, pcode AS pcode, pcodes AS pcodes, name AS name, icon AS icon, url AS url, sort AS sort, levels AS levels, menu_flag AS menuFlag, description AS description, status AS status, new_page_flag AS newPageFlag, open_flag AS openFlag, create_time AS createTime, update_time AS updateTime, create_user AS createUser, update_user AS updateUser menu_id AS "menuId", code AS "code", pcode AS "pcode", pcodes AS "pcodes", name AS "name", icon AS "icon", url AS "url", sort AS "sort", levels AS "levels", menu_flag AS "menuFlag", description AS "description", status AS "status", new_page_flag AS "newPageFlag", open_flag AS "openFlag", create_time AS "createTime", update_time AS "updateTime", create_user AS "createUser", update_user AS "updateUser"
</sql> </sql>
<select id="selectMenus" resultType="map"> <select id="selectMenus" resultType="map">
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
ELSE ELSE
m2.menu_id m2.menu_id
END END
) AS pId, ) AS "pId",
m1.name AS name, m1.name AS name,
( (
CASE CASE
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
ELSE ELSE
'true' 'true'
END END
) as 'checked' ) as "checked"
FROM FROM
sys_menu m1 sys_menu m1
LEFT JOIN LEFT JOIN
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
ELSE ELSE
m2.menu_id m2.menu_id
END END
) AS parentId, ) AS "parentId",
m1.name as name, m1.name as name,
m1.url as url, m1.url as url,
m1.levels as levels, m1.levels as levels,
...@@ -198,11 +198,10 @@ ...@@ -198,11 +198,10 @@
<select id="getMenusLikePcodes" resultType="cn.stylefeng.guns.modular.system.entity.Menu"> <select id="getMenusLikePcodes" resultType="cn.stylefeng.guns.modular.system.entity.Menu">
select select
<include refid="Base_Column_List"></include> <include refid="Base_Column_List"></include>
from sys_menu from sys_menu where 1 = 1
<where> <if test="code != null and code != ''">
pcodes LIKE CONCAT('%$[',#{code},'$]%') escape '$' and pcodes LIKE CONCAT('%$[',#{code},'$]%') escape '$'
</where> </if>
</select> </select>
</mapper> </mapper>
src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/NoticeMapper.xml
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
notice_id AS noticeId, title AS title, content AS content, create_time AS createTime, create_user AS createUser, update_time AS updateTime, update_user AS updateUser notice_id AS "noticeId", title AS "title", content AS "content", create_time AS "createTime", create_user AS "createUser", update_time AS "updateTime", update_user AS "updateUser"
</sql> </sql>
<select id="list" resultType="map"> <select id="list" resultType="map">
......
src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/OperationLogMapper.xml
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
operation_log_id AS operationLogId, log_type AS logType, log_name AS logName, user_id AS userId, class_name AS className, method AS method, create_time AS createTime, succeed AS succeed, message AS message operation_log_id AS "operationLogId", log_type AS "logType", log_name AS "logName", user_id AS "userId", class_name AS "className", method AS "method", create_time AS "createTime", succeed AS "succeed", message AS "message"
</sql> </sql>
<select id="getOperationLogs" resultType="map"> <select id="getOperationLogs" resultType="map">
......
src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/RelationMapper.xml
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
base.relation_id AS relationId, base.menu_id AS menuId, base.role_id AS roleId relation_id AS "relationId", menu_id AS "menuId", role_id AS "roleId"
</sql> </sql>
</mapper> </mapper>
src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/RoleMapper.xml
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
role_id AS roleId, pid AS pid, name AS name, description AS description, sort AS sort, version AS version, create_time AS createTime, update_time AS updateTime, create_user AS createUser, update_user AS updateUser role_id AS "roleId", pid AS "pid", name AS "name", description AS "description", sort AS "sort", version AS "version", create_time AS "createTime", update_time AS "updateTime", create_user AS "createUser", update_user AS "updateUser"
</sql> </sql>
<select id="selectRoles" resultType="map"> <select id="selectRoles" resultType="map">
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</delete> </delete>
<select id="roleTreeList" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode"> <select id="roleTreeList" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode">
select role_id AS id, pid as pId, select role_id AS id, pid as "pId",
name as name, (case when (pid = 0 or pid is null) then 'true' name as name, (case when (pid = 0 or pid is null) then 'true'
else 'false' end) as "open" from sys_role else 'false' end) as "open" from sys_role
</select> </select>
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
<select id="roleTreeListByRoleId" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode"> <select id="roleTreeListByRoleId" resultType="cn.stylefeng.guns.core.common.node.ZTreeNode">
SELECT SELECT
r.role_id as id, r.role_id as id,
pid as pId, pid as "pId",
name AS 'name', name AS "name",
( (
CASE CASE
WHEN (pid = 0 OR pid IS NULL) THEN WHEN (pid = 0 OR pid IS NULL) THEN
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
ELSE ELSE
'true' 'true'
END END
) as checked ) as "checked"
FROM FROM
sys_role r sys_role r
LEFT JOIN ( LEFT JOIN (
......
src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/UserMapper.xml
...@@ -26,14 +26,11 @@ ...@@ -26,14 +26,11 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
user_id AS userId, avatar AS avatar, account AS account, password AS password, salt AS salt, name AS name, birthday AS birthday, sex AS sex, email AS email, phone AS phone, role_id AS roleId, dept_id AS deptId, status AS status, create_time AS createTime, create_user AS createUser, update_time AS updateTime, update_user AS updateUser, version AS version user_id AS "userId", avatar AS "avatar", account AS "account", salt AS "salt", name AS "name", birthday AS "birthday", sex AS "sex", email AS "email", phone AS "phone", role_id AS "roleId", dept_id AS "deptId", status AS "status", create_time AS "createTime", create_user AS "createUser", update_time AS "updateTime", update_user AS "updateUser", version AS "version"
</sql> </sql>
<sql id="Base_Column_List_With_Pwd"> <sql id="Base_Column_List_With_Pwd">
user_id AS userId, avatar AS avatar, account AS account, password AS password, user_id AS "userId", avatar AS "avatar", account AS "account", salt AS "salt", password AS "password", name AS "name", birthday AS "birthday", sex AS "sex", email AS "email", phone AS "phone", role_id AS "roleId", dept_id AS "deptId", status AS "status", create_time AS "createTime", create_user AS "createUser", update_time AS "updateTime", update_user AS "updateUser", version AS "version"
salt AS salt, name AS name, birthday AS birthday, sex AS sex, email AS email, phone AS phone,
role_id AS roleId, dept_id AS deptId, status AS status, create_time AS createTime, create_user AS createUser,
update_time AS updateTime, update_user AS updateUser, version AS version
</sql> </sql>
<select id="selectUsers" resultType="map"> <select id="selectUsers" resultType="map">
......
src/main/java/cn/stylefeng/guns/modular/system/service/DeptService.java
...@@ -115,7 +115,7 @@ public class DeptService extends ServiceImpl<DeptMapper, Dept> { ...@@ -115,7 +115,7 @@ public class DeptService extends ServiceImpl<DeptMapper, Dept> {
* @author fengshuonan * @author fengshuonan
* @Date 2018/12/23 5:16 PM * @Date 2018/12/23 5:16 PM
*/ */
public Page<Map<String, Object>> list(String condition, String deptId) { public Page<Map<String, Object>> list(String condition, Long deptId) {
Page page = LayuiPageFactory.defaultPage(); Page page = LayuiPageFactory.defaultPage();
return this.baseMapper.list(page, condition, deptId); return this.baseMapper.list(page, condition, deptId);
} }
......
src/main/java/cn/stylefeng/guns/modular/system/service/DictService.java
...@@ -246,13 +246,17 @@ public class DictService extends ServiceImpl<DictMapper, Dict> { ...@@ -246,13 +246,17 @@ public class DictService extends ServiceImpl<DictMapper, Dict> {
private List<Long> getSubIds(Long dictId) { private List<Long> getSubIds(Long dictId) {
List<Dict> list = this.baseMapper.likeParentIds(dictId);
ArrayList<Long> longs = new ArrayList<>(); ArrayList<Long> longs = new ArrayList<>();
for (Dict dict : list) {
longs.add(dict.getDictId()); if(ToolUtil.isEmpty(dictId)){
return longs;
}else{
List<Dict> list = this.baseMapper.likeParentIds(dictId);
for (Dict dict : list) {
longs.add(dict.getDictId());
}
return longs;
} }
return longs;
} }
private void dictSetPids(Dict param) { private void dictSetPids(Dict param) {
......
src/main/java/cn/stylefeng/guns/modular/system/service/RoleService.java
...@@ -180,7 +180,7 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> { ...@@ -180,7 +180,7 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> {
* @return * @return
* @date 2017年2月18日 上午10:32:04 * @date 2017年2月18日 上午10:32:04
*/ */
public List<ZTreeNode> roleTreeListByRoleId(String[] roleId) { public List<ZTreeNode> roleTreeListByRoleId(Long[] roleId) {
return this.baseMapper.roleTreeListByRoleId(roleId); return this.baseMapper.roleTreeListByRoleId(roleId);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment