Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
guns-vip
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenjunxiong
guns-vip
Commits
909894ca
Commit
909894ca
authored
Oct 28, 2018
by
fengshuonan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复一些多余的配置和注解
parent
d2af8b95
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
19 deletions
+13
-19
src/main/java/cn/stylefeng/guns/modular/system/service/IDeptService.java
+1
-2
src/main/java/cn/stylefeng/guns/modular/system/service/IDictService.java
+3
-4
src/main/java/cn/stylefeng/guns/modular/system/service/IMenuService.java
+2
-3
src/main/java/cn/stylefeng/guns/modular/system/service/IRoleService.java
+2
-3
src/main/java/cn/stylefeng/guns/modular/system/service/IUserService.java
+5
-6
src/main/webapp/static/js/common/bootstrap-table-object.js
+0
-1
No files found.
src/main/java/cn/stylefeng/guns/modular/system/service/IDeptService.java
View file @
909894ca
...
...
@@ -18,7 +18,6 @@ package cn.stylefeng.guns.modular.system.service;
import
cn.stylefeng.guns.core.common.node.ZTreeNode
;
import
cn.stylefeng.guns.modular.system.model.Dept
;
import
com.baomidou.mybatisplus.service.IService
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -44,5 +43,5 @@ public interface IDeptService extends IService<Dept> {
/**
* 获取所有部门列表
*/
List
<
Map
<
String
,
Object
>>
list
(
@Param
(
"condition"
)
String
condition
);
List
<
Map
<
String
,
Object
>>
list
(
String
condition
);
}
src/main/java/cn/stylefeng/guns/modular/system/service/IDictService.java
View file @
909894ca
...
...
@@ -17,7 +17,6 @@ package cn.stylefeng.guns.modular.system.service;
import
cn.stylefeng.guns.modular.system.model.Dict
;
import
com.baomidou.mybatisplus.service.IService
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -48,16 +47,16 @@ public interface IDictService extends IService<Dict> {
/**
* 根据编码获取词典列表
*/
List
<
Dict
>
selectByCode
(
@Param
(
"code"
)
String
code
);
List
<
Dict
>
selectByCode
(
String
code
);
/**
* 根据父类编码获取词典列表
*/
List
<
Dict
>
selectByParentCode
(
@Param
(
"code"
)
String
code
);
List
<
Dict
>
selectByParentCode
(
String
code
);
/**
* 查询字典列表
*/
List
<
Map
<
String
,
Object
>>
list
(
@Param
(
"condition"
)
String
conditiion
);
List
<
Map
<
String
,
Object
>>
list
(
String
conditiion
);
}
src/main/java/cn/stylefeng/guns/modular/system/service/IMenuService.java
View file @
909894ca
...
...
@@ -19,7 +19,6 @@ import cn.stylefeng.guns.core.common.node.MenuNode;
import
cn.stylefeng.guns.core.common.node.ZTreeNode
;
import
cn.stylefeng.guns.modular.system.model.Menu
;
import
com.baomidou.mybatisplus.service.IService
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -54,7 +53,7 @@ public interface IMenuService extends IService<Menu> {
* @return
* @date 2017年2月12日 下午9:14:34
*/
List
<
Map
<
String
,
Object
>>
selectMenus
(
@Param
(
"condition"
)
String
condition
,
@Param
(
"level"
)
String
level
);
List
<
Map
<
String
,
Object
>>
selectMenus
(
String
condition
,
String
level
);
/**
* 根据条件查询菜单
...
...
@@ -62,7 +61,7 @@ public interface IMenuService extends IService<Menu> {
* @return
* @date 2017年2月12日 下午9:14:34
*/
List
<
Long
>
getMenuIdsByRoleId
(
@Param
(
"roleId"
)
Integer
roleId
);
List
<
Long
>
getMenuIdsByRoleId
(
Integer
roleId
);
/**
* 获取菜单列表树
...
...
src/main/java/cn/stylefeng/guns/modular/system/service/IRoleService.java
View file @
909894ca
...
...
@@ -18,7 +18,6 @@ package cn.stylefeng.guns.modular.system.service;
import
cn.stylefeng.guns.core.common.node.ZTreeNode
;
import
cn.stylefeng.guns.modular.system.model.Role
;
import
com.baomidou.mybatisplus.service.IService
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -54,7 +53,7 @@ public interface IRoleService extends IService<Role> {
* @return
* @date 2017年2月12日 下午9:14:34
*/
List
<
Map
<
String
,
Object
>>
selectRoles
(
@Param
(
"condition"
)
String
condition
);
List
<
Map
<
String
,
Object
>>
selectRoles
(
String
condition
);
/**
* 删除某个角色的所有权限
...
...
@@ -63,7 +62,7 @@ public interface IRoleService extends IService<Role> {
* @return
* @date 2017年2月13日 下午7:57:51
*/
int
deleteRolesById
(
@Param
(
"roleId"
)
Integer
roleId
);
int
deleteRolesById
(
Integer
roleId
);
/**
* 获取角色列表树
...
...
src/main/java/cn/stylefeng/guns/modular/system/service/IUserService.java
View file @
909894ca
...
...
@@ -18,7 +18,6 @@ package cn.stylefeng.guns.modular.system.service;
import
cn.stylefeng.guns.modular.system.model.User
;
import
cn.stylefeng.roses.core.datascope.DataScope
;
import
com.baomidou.mybatisplus.service.IService
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -36,26 +35,26 @@ public interface IUserService extends IService<User> {
/**
* 修改用户状态
*/
int
setStatus
(
@Param
(
"userId"
)
Integer
userId
,
@Param
(
"status"
)
int
status
);
int
setStatus
(
Integer
userId
,
int
status
);
/**
* 修改密码
*/
int
changePwd
(
@Param
(
"userId"
)
Integer
userId
,
@Param
(
"pwd"
)
String
pwd
);
int
changePwd
(
Integer
userId
,
String
pwd
);
/**
* 根据条件查询用户列表
*/
List
<
Map
<
String
,
Object
>>
selectUsers
(
@Param
(
"dataScope"
)
DataScope
dataScope
,
@Param
(
"name"
)
String
name
,
@Param
(
"beginTime"
)
String
beginTime
,
@Param
(
"endTime"
)
String
endTime
,
@Param
(
"deptid"
)
Integer
deptid
);
List
<
Map
<
String
,
Object
>>
selectUsers
(
DataScope
dataScope
,
String
name
,
String
beginTime
,
String
endTime
,
Integer
deptid
);
/**
* 设置用户的角色
*/
int
setRoles
(
@Param
(
"userId"
)
Integer
userId
,
@Param
(
"roleIds"
)
String
roleIds
);
int
setRoles
(
Integer
userId
,
String
roleIds
);
/**
* 通过账号获取用户
*/
User
getByAccount
(
@Param
(
"account"
)
String
account
);
User
getByAccount
(
String
account
);
}
src/main/webapp/static/js/common/bootstrap-table-object.js
View file @
909894ca
...
...
@@ -37,7 +37,6 @@
toolbar
:
"#"
+
this
.
toolbarId
,
//顶部工具条
striped
:
true
,
//是否显示行间隔色
cache
:
false
,
//是否使用缓存,默认为true
pagination
:
true
,
//是否显示分页(*)
sortable
:
true
,
//是否启用排序
sortOrder
:
"desc"
,
//排序方式
pageNumber
:
1
,
//初始化加载第一页,默认第一页
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment