Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
zhiliao
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
zhiliao
Commits
06b32c36
提交
06b32c36
authored
5月 09, 2020
作者:
zhouzhigang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
c64c4ec8
隐藏空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
114 行增加
和
3 行删除
+114
-3
DepartmentController.java
...zrqx/sysuser/bg/controller/dept/DepartmentController.java
+9
-0
RoleController.java
...a/com/zrqx/sysuser/bg/controller/role/RoleController.java
+6
-2
DepartmentPowerrelationMapper.java
...sysuser/bg/mapper/dept/DepartmentPowerrelationMapper.java
+4
-0
RolePowerrelationMapper.java
.../zrqx/sysuser/bg/mapper/role/RolePowerrelationMapper.java
+5
-0
DepartmentService.java
...a/com/zrqx/sysuser/bg/service/dept/DepartmentService.java
+12
-0
DepartmentServiceImpl.java
...m/zrqx/sysuser/bg/service/dept/DepartmentServiceImpl.java
+12
-1
RoleService.java
...in/java/com/zrqx/sysuser/bg/service/role/RoleService.java
+12
-0
RoleServiceImpl.java
...ava/com/zrqx/sysuser/bg/service/role/RoleServiceImpl.java
+18
-0
DeptDetailVO.java
...ava/com/zrqx/sysuser/commons/vo/bg/dept/DeptDetailVO.java
+18
-0
RoleDetailVO.java
...ava/com/zrqx/sysuser/commons/vo/bg/role/RoleDetailVO.java
+18
-0
没有找到文件。
app/sysuser/src/main/java/com/zrqx/sysuser/bg/controller/dept/DepartmentController.java
浏览文件 @
06b32c36
...
...
@@ -6,6 +6,7 @@ import java.util.List;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -21,6 +22,7 @@ import com.zrqx.sysuser.bg.service.dept.DepartmentService;
import
com.zrqx.sysuser.commons.form.bg.dept.ModulepowerToDepartmentForm
;
import
com.zrqx.sysuser.commons.model.dept.Department
;
import
com.zrqx.sysuser.commons.vo.bg.dept.DepartmentVO
;
import
com.zrqx.sysuser.commons.vo.bg.dept.DeptDetailVO
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
...
...
@@ -110,4 +112,11 @@ public class DepartmentController {
public
CallBack
<
Boolean
>
saveModulepowerToDepartment
(
@RequestBody
ModulepowerToDepartmentForm
form
){
return
CallBack
.
success
(
departmentSerivce
.
saveModulepowerToDepartment
(
form
));
}
@ApiOperation
(
value
=
"部门绑定的模块"
,
notes
=
"部门绑定的模块"
)
@GetMapping
(
value
=
"/get/oid"
)
public
CallBack
<
DeptDetailVO
>
getById
(
@PathVariable
Integer
id
){
return
CallBack
.
success
(
departmentSerivce
.
getById
(
id
));
}
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/controller/role/RoleController.java
浏览文件 @
06b32c36
...
...
@@ -19,6 +19,8 @@ import com.zrqx.core.util.response.CallBack;
import
com.zrqx.sysuser.bg.service.role.RoleService
;
import
com.zrqx.sysuser.commons.form.bg.role.SaveRoleOperatepowerForm
;
import
com.zrqx.sysuser.commons.model.role.Role
;
import
com.zrqx.sysuser.commons.vo.bg.dept.DeptDetailVO
;
import
com.zrqx.sysuser.commons.vo.bg.role.RoleDetailVO
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
...
...
@@ -66,8 +68,8 @@ public class RoleController {
}
@ApiOperation
(
value
=
"查询"
,
notes
=
"根据ID查询"
)
@GetMapping
(
value
=
"/{oid}"
)
public
CallBack
<
Role
>
getById
(
@PathVariable
Integer
oid
)
{
return
CallBack
.
success
(
roleService
.
selectByPrimaryKey
(
oid
));
public
CallBack
<
Role
DetailVO
>
getById
(
@PathVariable
Integer
oid
)
{
return
CallBack
.
success
(
roleService
.
getById
(
oid
));
}
@ApiOperation
(
value
=
"查询角色"
,
notes
=
"查询角色"
)
@GetMapping
(
value
=
"/page"
)
...
...
@@ -96,4 +98,6 @@ public class RoleController {
}
return
CallBack
.
success
(
roleService
.
selectOneByExample
(
example
)
!=
null
);
}
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/dept/DepartmentPowerrelationMapper.java
浏览文件 @
06b32c36
...
...
@@ -52,4 +52,8 @@ public interface DepartmentPowerrelationMapper extends BaseMapper<DepartmentPowe
+
" eq(d.departmentId,departmentId) "
+
"</script>"
)
List
<
Integer
>
getMPIDListByDeptId
(
@Param
(
"departmentId"
)
Integer
departmentId
);
@Select
(
"select mpId from sys_department_module_power where departmentId = #{id}"
)
List
<
Integer
>
queryList
(
@Param
(
"id"
)
Integer
id
);
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/role/RolePowerrelationMapper.java
浏览文件 @
06b32c36
...
...
@@ -5,6 +5,7 @@ import java.util.List;
import
org.apache.ibatis.annotations.Delete
;
import
org.apache.ibatis.annotations.Insert
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Select
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.sysuser.commons.model.role.RolePowerrelation
;
...
...
@@ -35,4 +36,8 @@ public interface RolePowerrelationMapper extends BaseMapper<RolePowerrelation>{
@Delete
(
"delete from sys_role_operate_power where roleId = #{roleId}"
)
int
deleteOperatepowerToRole
(
Integer
roleId
);
@Select
(
"select opId from sys_role_operate_power where roleId = #{id}"
)
List
<
Integer
>
queryList
(
Integer
id
);
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/dept/DepartmentService.java
浏览文件 @
06b32c36
...
...
@@ -2,9 +2,12 @@ package com.zrqx.sysuser.bg.service.dept;
import
java.util.List
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
com.zrqx.core.service.BaseService
;
import
com.zrqx.sysuser.commons.form.bg.dept.ModulepowerToDepartmentForm
;
import
com.zrqx.sysuser.commons.model.dept.Department
;
import
com.zrqx.sysuser.commons.vo.bg.dept.DeptDetailVO
;
/**
* 部门
*/
...
...
@@ -12,4 +15,13 @@ public interface DepartmentService extends BaseService<Department,Integer>{
boolean
saveModulepowerToDepartment
(
ModulepowerToDepartmentForm
form
);
List
<
Integer
>
getMPListByDeptId
(
Integer
deptId
);
/**
* 部门详情
* @param id
* @return
* @author chyj
* @date: 2020年5月9日 下午1:55:35
*/
DeptDetailVO
getById
(
@PathVariable
Integer
id
);
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/dept/DepartmentServiceImpl.java
浏览文件 @
06b32c36
...
...
@@ -8,11 +8,13 @@ import org.springframework.stereotype.Service;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.core.util.bean.BeanUtils
;
import
com.zrqx.sysuser.bg.mapper.dept.DepartmentMapper
;
import
com.zrqx.sysuser.bg.mapper.dept.DepartmentPowerrelationMapper
;
import
com.zrqx.sysuser.commons.form.bg.dept.ModulepowerToDepartmentForm
;
import
com.zrqx.sysuser.commons.model.dept.Department
;
import
com.zrqx.sysuser.commons.model.dept.DepartmentPowerrelation
;
import
com.zrqx.sysuser.commons.vo.bg.dept.DeptDetailVO
;
/**
* 部门和模块关系
*/
...
...
@@ -50,8 +52,17 @@ public class DepartmentServiceImpl extends BaseServiceImpl<Department,Integer> i
List
<
Integer
>
mpidList
=
dpMapper
.
getMPIDListByDeptId
(
deptId
);
return
mpidList
;
}
@Override
public
DeptDetailVO
getById
(
Integer
id
)
{
Department
department
=
departmentMapper
.
selectByPrimaryKey
(
id
);
DeptDetailVO
vo
=
BeanUtils
.
copy
(
department
,
DeptDetailVO
.
class
);
//部门已绑定的模块
List
<
Integer
>
ids
=
dpMapper
.
queryList
(
id
);
vo
.
setModuleIds
(
ids
);
return
vo
;
}
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/role/RoleService.java
浏览文件 @
06b32c36
package
com
.
zrqx
.
sysuser
.
bg
.
service
.
role
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
com.zrqx.core.service.BaseService
;
import
com.zrqx.sysuser.commons.form.bg.role.SaveRoleOperatepowerForm
;
import
com.zrqx.sysuser.commons.model.role.Role
;
import
com.zrqx.sysuser.commons.vo.bg.role.RoleDetailVO
;
/**
* 角色
*/
public
interface
RoleService
extends
BaseService
<
Role
,
Integer
>{
Boolean
saveOperatepowerToRole
(
SaveRoleOperatepowerForm
form
);
/**
* 角色详情
* @param oid
* @return
* @author chyj
* @date: 2020年5月9日 下午2:07:46
*/
RoleDetailVO
getById
(
@PathVariable
Integer
oid
);
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/role/RoleServiceImpl.java
浏览文件 @
06b32c36
...
...
@@ -8,11 +8,13 @@ import org.springframework.stereotype.Service;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.core.util.bean.BeanUtils
;
import
com.zrqx.sysuser.bg.mapper.role.RoleMapper
;
import
com.zrqx.sysuser.bg.mapper.role.RolePowerrelationMapper
;
import
com.zrqx.sysuser.commons.form.bg.role.SaveRoleOperatepowerForm
;
import
com.zrqx.sysuser.commons.model.role.Role
;
import
com.zrqx.sysuser.commons.model.role.RolePowerrelation
;
import
com.zrqx.sysuser.commons.vo.bg.role.RoleDetailVO
;
/**
* 角色
*/
...
...
@@ -44,4 +46,20 @@ public class RoleServiceImpl extends BaseServiceImpl<Role,Integer> implements Ro
return
roleMapper
;
}
@Override
public
RoleDetailVO
getById
(
Integer
oid
)
{
Role
role
=
notNull
(
oid
);
RoleDetailVO
vo
=
BeanUtils
.
copy
(
role
,
RoleDetailVO
.
class
);
//角色已绑定的按钮
List
<
Integer
>
operateIds
=
rolePowerrelationMapper
.
queryList
(
oid
);
vo
.
setOpreatIds
(
operateIds
);
return
vo
;
}
}
app/sysuser/src/main/java/com/zrqx/sysuser/commons/vo/bg/dept/DeptDetailVO.java
0 → 100644
浏览文件 @
06b32c36
package
com
.
zrqx
.
sysuser
.
commons
.
vo
.
bg
.
dept
;
import
java.util.List
;
import
com.zrqx.sysuser.commons.model.dept.Department
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
@ApiModel
(
value
=
"DeptDetailVO"
,
description
=
"部门详情vo"
)
public
class
DeptDetailVO
extends
Department
{
@ApiModelProperty
(
"模块id集合"
)
private
List
<
Integer
>
moduleIds
;
}
app/sysuser/src/main/java/com/zrqx/sysuser/commons/vo/bg/role/RoleDetailVO.java
0 → 100644
浏览文件 @
06b32c36
package
com
.
zrqx
.
sysuser
.
commons
.
vo
.
bg
.
role
;
import
java.util.List
;
import
com.zrqx.sysuser.commons.model.role.Role
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
@ApiModel
(
value
=
"RoleDetailVO"
,
description
=
"角色详情vo"
)
public
class
RoleDetailVO
extends
Role
{
@ApiModelProperty
(
"按钮id集合"
)
private
List
<
Integer
>
opreatIds
;
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论