Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-shiro
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
xzxt-shiro
Commits
3edcf174
Commit
3edcf174
authored
Aug 09, 2018
by
chang_chao@founder.com.cn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改错误代码
parent
5901f589
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
24 deletions
+15
-24
src/main/java/com/xzxtshiro/controller/admin/SysMemberController.java
+0
-4
src/main/java/com/xzxtshiro/controller/admin/SysUserController.java
+9
-10
src/main/java/com/xzxtshiro/dao/SysUserDao.java
+0
-1
src/main/java/com/xzxtshiro/dao/TbStAsjDao.java
+1
-1
src/main/java/com/xzxtshiro/pojo/BaseModel.java
+0
-1
src/main/java/com/xzxtshiro/pojo/SysPermissionNew.java
+1
-1
src/main/java/com/xzxtshiro/pojo/SysRole.java
+0
-1
src/main/java/com/xzxtshiro/service/SysUserService.java
+1
-2
src/main/java/com/xzxtshiro/util/ZtreeDataUtil.java
+3
-3
No files found.
src/main/java/com/xzxtshiro/controller/admin/SysMemberController.java
View file @
3edcf174
package
com
.
xzxtshiro
.
controller
.
admin
;
package
com
.
xzxtshiro
.
controller
.
admin
;
import
com.shiro.demo.pojo.User
;
import
com.shiro.demo.service.RoleService
;
import
com.shiro.demo.service.UserService
;
import
com.shiro.demo.util.ShiroKit
;
import
com.xzxtshiro.pojo.SysUser
;
import
com.xzxtshiro.pojo.SysUser
;
import
com.xzxtshiro.service.SysRoleService
;
import
com.xzxtshiro.service.SysRoleService
;
import
com.xzxtshiro.service.SysUserService
;
import
com.xzxtshiro.service.SysUserService
;
...
...
src/main/java/com/xzxtshiro/controller/admin/SysUserController.java
View file @
3edcf174
...
@@ -48,8 +48,7 @@ public class SysUserController {
...
@@ -48,8 +48,7 @@ public class SysUserController {
@Autowired
@Autowired
private
SysDictitemService
dictitemService
;
private
SysDictitemService
dictitemService
;
@Autowired
private
JedisClient
jedisClient
;
/**
/**
* 跳转到用户列表
* 跳转到用户列表
...
@@ -61,7 +60,7 @@ public class SysUserController {
...
@@ -61,7 +60,7 @@ public class SysUserController {
/*if (msg!=null&&msg!=""){
/*if (msg!=null&&msg!=""){
model.addAttribute("msg","用户添加成功!");
model.addAttribute("msg","用户添加成功!");
}*/
}*/
setZtreeData
(
model
,
userService
,
dictitemService
,
roleService
,
jedisClient
);
setZtreeData
(
model
,
userService
,
dictitemService
,
roleService
);
return
"admin/user/list"
;
return
"admin/user/list"
;
}
}
...
@@ -124,15 +123,15 @@ public class SysUserController {
...
@@ -124,15 +123,15 @@ public class SysUserController {
*/
*/
@RequestMapping
(
value
=
"/add"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/add"
,
method
=
RequestMethod
.
GET
)
public
String
addIndex
(
Model
model
)
{
public
String
addIndex
(
Model
model
)
{
setZtreeData
(
model
,
userService
,
dictitemService
,
roleService
,
jedisClient
);
setZtreeData
(
model
,
userService
,
dictitemService
,
roleService
);
return
"admin/user/add"
;
return
"admin/user/add"
;
}
}
/**
/**
* 设置添加用户页面所需要的角色和单位代码数据
* 设置添加用户页面所需要的角色和单位代码数据
*/
*/
private
static
void
setZtreeData
(
Model
model
,
SysUserService
userService
,
SysDictitemService
dictitemService
,
SysRoleService
roleService
,
JedisClient
jedisClient
)
{
private
static
void
setZtreeData
(
Model
model
,
SysUserService
userService
,
SysDictitemService
dictitemService
,
SysRoleService
roleService
)
{
new
ZtreeDataUtil
().
setUnitAndRole
(
model
,
dictitemService
,
userService
,
roleService
,
jedisClient
);
new
ZtreeDataUtil
().
setUnitAndRole
(
model
,
dictitemService
,
userService
,
roleService
);
}
}
/**
/**
...
@@ -155,7 +154,7 @@ public class SysUserController {
...
@@ -155,7 +154,7 @@ public class SysUserController {
public
String
add
(
SysUser
user
,
Model
model
)
{
public
String
add
(
SysUser
user
,
Model
model
)
{
SysUser
add
=
userService
.
add
(
user
);
SysUser
add
=
userService
.
add
(
user
);
if
(
add
.
getUsername
()
==
null
)
{
if
(
add
.
getUsername
()
==
null
)
{
setZtreeData
(
model
,
userService
,
dictitemService
,
roleService
,
jedisClient
);
setZtreeData
(
model
,
userService
,
dictitemService
,
roleService
);
model
.
addAttribute
(
"user"
,
user
);
model
.
addAttribute
(
"user"
,
user
);
model
.
addAttribute
(
"msg"
,
"用户名已存在,请修改用户名!"
);
model
.
addAttribute
(
"msg"
,
"用户名已存在,请修改用户名!"
);
return
"admin/user/add"
;
return
"admin/user/add"
;
...
@@ -230,7 +229,7 @@ public class SysUserController {
...
@@ -230,7 +229,7 @@ public class SysUserController {
user
.
setPassword
(
new
Base64PasswordEncrypter
().
decryptPassword
(
user
.
getPassword
()));
user
.
setPassword
(
new
Base64PasswordEncrypter
().
decryptPassword
(
user
.
getPassword
()));
List
<
SysRole
>
roles
=
userService
.
selectSysRoleByUserId
(
id
);
List
<
SysRole
>
roles
=
userService
.
selectSysRoleByUserId
(
id
);
JSONArray
oldRole
=
JSONArray
.
fromObject
(
roles
);
JSONArray
oldRole
=
JSONArray
.
fromObject
(
roles
);
setZtreeData
(
model
,
userService
,
dictitemService
,
roleService
,
jedisClient
);
setZtreeData
(
model
,
userService
,
dictitemService
,
roleService
);
model
.
addAttribute
(
"oldRole"
,
oldRole
);
model
.
addAttribute
(
"oldRole"
,
oldRole
);
model
.
addAttribute
(
"user"
,
user
);
model
.
addAttribute
(
"user"
,
user
);
return
"admin/user/update"
;
return
"admin/user/update"
;
...
@@ -254,7 +253,7 @@ public class SysUserController {
...
@@ -254,7 +253,7 @@ public class SysUserController {
//查询用户原先的角色
//查询用户原先的角色
List
<
SysRole
>
roles
=
userService
.
selectSysRoleByUserId
(
user
.
getId
());
List
<
SysRole
>
roles
=
userService
.
selectSysRoleByUserId
(
user
.
getId
());
JSONArray
oldRole
=
JSONArray
.
fromObject
(
roles
);
JSONArray
oldRole
=
JSONArray
.
fromObject
(
roles
);
setZtreeData
(
model
,
userService
,
dictitemService
,
roleService
,
jedisClient
);
setZtreeData
(
model
,
userService
,
dictitemService
,
roleService
);
model
.
addAttribute
(
"oldRole"
,
oldRole
);
model
.
addAttribute
(
"oldRole"
,
oldRole
);
model
.
addAttribute
(
"user"
,
user
);
model
.
addAttribute
(
"user"
,
user
);
model
.
addAttribute
(
"msg"
,
"用户修改失败!"
);
model
.
addAttribute
(
"msg"
,
"用户修改失败!"
);
...
@@ -275,7 +274,7 @@ public class SysUserController {
...
@@ -275,7 +274,7 @@ public class SysUserController {
System
.
out
.
println
(
choseUsers
.
size
());
System
.
out
.
println
(
choseUsers
.
size
());
System
.
out
.
println
(
"userList=========================="
);
System
.
out
.
println
(
"userList=========================="
);
System
.
out
.
println
(
userList
);
System
.
out
.
println
(
userList
);
setZtreeData
(
model
,
userService
,
dictitemService
,
roleService
,
jedisClient
);
setZtreeData
(
model
,
userService
,
dictitemService
,
roleService
);
model
.
addAttribute
(
"userList"
,
choseUsers
);
model
.
addAttribute
(
"userList"
,
choseUsers
);
return
"admin/user/batchUpdate"
;
return
"admin/user/batchUpdate"
;
}
}
...
...
src/main/java/com/xzxtshiro/dao/SysUserDao.java
View file @
3edcf174
package
com
.
xzxtshiro
.
dao
;
package
com
.
xzxtshiro
.
dao
;
import
com.shiro.demo.pojo.User
;
import
com.xzxtshiro.pojo.*
;
import
com.xzxtshiro.pojo.*
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
...
...
src/main/java/com/xzxtshiro/dao/TbStAsjDao.java
View file @
3edcf174
package
com
.
hczzdpgl
.
dao
;
package
com
.
xzxtshiro
.
dao
;
import
java.util.Map
;
import
java.util.Map
;
...
...
src/main/java/com/xzxtshiro/pojo/BaseModel.java
View file @
3edcf174
package
com
.
xzxtshiro
.
pojo
;
package
com
.
xzxtshiro
.
pojo
;
import
com.shiro.demo.pojo.Role
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
...
...
src/main/java/com/xzxtshiro/pojo/SysPermissionNew.java
View file @
3edcf174
package
com
.
xzxtshiro
.
pojo
;
package
com
.
xzxtshiro
.
pojo
;
import
com.shiro.demo.pojo.PageBean
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
...
...
src/main/java/com/xzxtshiro/pojo/SysRole.java
View file @
3edcf174
package
com
.
xzxtshiro
.
pojo
;
package
com
.
xzxtshiro
.
pojo
;
import
com.shiro.demo.pojo.PageBean
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
...
...
src/main/java/com/xzxtshiro/service/SysUserService.java
View file @
3edcf174
package
com
.
xzxtshiro
.
service
;
package
com
.
xzxtshiro
.
service
;
import
com.shiro.demo.pojo.Permission
;
import
com.shiro.demo.pojo.User
;
import
com.xzxtshiro.pojo.*
;
import
com.xzxtshiro.pojo.*
;
import
java.util.List
;
import
java.util.List
;
...
...
src/main/java/com/xzxtshiro/util/ZtreeDataUtil.java
View file @
3edcf174
...
@@ -29,8 +29,8 @@ public class ZtreeDataUtil {
...
@@ -29,8 +29,8 @@ public class ZtreeDataUtil {
* @param userService
* @param userService
* @param roleService
* @param roleService
*/
*/
public
static
void
setUnitAndRole
(
Model
model
,
SysDictitemService
dictitemService
,
SysUserService
userService
,
SysRoleService
roleService
,
JedisClient
jedisClient
)
{
public
static
void
setUnitAndRole
(
Model
model
,
SysDictitemService
dictitemService
,
SysUserService
userService
,
SysRoleService
roleService
)
{
setUnitZtreeData
(
model
,
dictitemService
,
jedisClient
);
setUnitZtreeData
(
model
,
dictitemService
);
setRoleZtreeData
(
model
,
userService
,
roleService
);
setRoleZtreeData
(
model
,
userService
,
roleService
);
}
}
...
@@ -44,7 +44,7 @@ public class ZtreeDataUtil {
...
@@ -44,7 +44,7 @@ public class ZtreeDataUtil {
* @param model
* @param model
* @param dictitemService
* @param dictitemService
*/
*/
public
static
void
setUnitZtreeData
(
Model
model
,
SysDictitemService
dictitemService
,
JedisClient
jedisClient
){
public
static
void
setUnitZtreeData
(
Model
model
,
SysDictitemService
dictitemService
){
SysUser
user
=
TokenUtil
.
getUser
();
SysUser
user
=
TokenUtil
.
getUser
();
String
unitStr
=
user
.
getUnitcode
();
String
unitStr
=
user
.
getUnitcode
();
String
usergrade
=
user
.
getGrade
();
String
usergrade
=
user
.
getGrade
();
...
...
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