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
e9248ed7
Commit
e9248ed7
authored
Aug 10, 2018
by
liuyongshuai
Committed by
liuyongshuai
Aug 10, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完善用户新增功能,增加身份证号验证
parent
731078b7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
62 additions
and
21 deletions
+62
-21
src/main/java/com/xzxtshiro/controller/admin/SysUserController.java
+15
-6
src/main/java/com/xzxtshiro/dao/SysUserDao.java
+1
-1
src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml
+5
-4
src/main/java/com/xzxtshiro/pojo/SysUser.java
+4
-0
src/main/java/com/xzxtshiro/service/imp/SysUserServiceImpl.java
+21
-7
src/main/webapp/WEB-INF/jsp/admin/user/add.jsp
+15
-1
src/main/webapp/WEB-INF/jsp/admin/user/update.jsp
+1
-2
No files found.
src/main/java/com/xzxtshiro/controller/admin/SysUserController.java
View file @
e9248ed7
...
...
@@ -153,12 +153,9 @@ public class SysUserController {
@RequestMapping
(
value
=
"/add"
,
method
=
RequestMethod
.
POST
)
public
String
add
(
SysUser
user
,
Model
model
)
{
SysUser
add
=
userService
.
add
(
user
);
if
(
add
.
getUsername
()
==
null
)
{
setZtreeData
(
model
,
userService
,
dictitemService
,
roleService
);
model
.
addAttribute
(
"user"
,
user
);
model
.
addAttribute
(
"msg"
,
"用户名已存在,请修改用户名!"
);
return
"admin/user/add"
;
}
else
{
String
msg
=
""
;
String
reStr
=
""
;
if
(
""
.
equals
(
add
.
getReason
())){
//用户增加成功,同步警综信息
SysUser
dlUser
=
TokenUtil
.
getUser
();
String
unit
=
dlUser
.
getUnitcode
();
...
...
@@ -171,6 +168,18 @@ public class SysUserController {
tbJZuserxx
(
user
);
}
return
"redirect:/admin/user/index?msg=success"
;
}
else
{
if
(
"username"
.
equals
(
add
.
getReason
()))
{
msg
=
"用户名已存在,请修改用户名!"
;
reStr
=
"admin/user/add"
;
}
else
if
(
"identitycard"
.
equals
(
add
.
getReason
())){
msg
=
"身份证号已存在,请修改身份证号码!"
;
reStr
=
"admin/user/add"
;
}
setZtreeData
(
model
,
userService
,
dictitemService
,
roleService
);
model
.
addAttribute
(
"user"
,
user
);
model
.
addAttribute
(
"msg"
,
msg
);
return
reStr
;
}
}
...
...
src/main/java/com/xzxtshiro/dao/SysUserDao.java
View file @
e9248ed7
...
...
@@ -16,7 +16,7 @@ public interface SysUserDao {
List
<
SysRole
>
selectSysRolesByUserId
(
String
userId
);
SysUser
findBy
UserName
(
String
username
);
SysUser
findBy
Condition
(
SysUser
username
);
List
<
String
>
selectSysRoleIdByUserId
(
String
userId
);
...
...
src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml
View file @
e9248ed7
...
...
@@ -452,14 +452,15 @@
where A.USER_ID=#{userId,jdbcType=VARCHAR} and A.ROLE_ID=b.id
</select>
<!--根据用户名查询用户-->
<select
id=
"findBy
UserName"
parameterType=
"string
"
resultMap=
"BaseResultMap"
>
<!--根据用户名
/身份证号
查询用户-->
<select
id=
"findBy
Condition"
parameterType=
"com.xzxtshiro.pojo.SysUser
"
resultMap=
"BaseResultMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM
Sys_user
WHERE
USERNAME=#{username,jdbcType=VARCHAR} and scbz=0
WHERE scbz=0
<if
test=
"username !=null"
>
and USERNAME=#{username,jdbcType=VARCHAR}
</if>
<if
test=
"identitycard !=null"
>
and IDENTITYCARD=#{identitycard,jdbcType=VARCHAR}
</if>
</select>
<!--根据用户id查询角色id-->
<select
id=
"selectSysRoleIdByUserId"
parameterType=
"String"
resultType=
"String"
>
...
...
src/main/java/com/xzxtshiro/pojo/SysUser.java
View file @
e9248ed7
...
...
@@ -112,5 +112,8 @@ public class SysUser extends BaseModel implements Serializable {
/**批量授权的用户id合集*/
protected
String
ids
;
//保存失败的原因
protected
String
reason
;
}
\ No newline at end of file
src/main/java/com/xzxtshiro/service/imp/SysUserServiceImpl.java
View file @
e9248ed7
...
...
@@ -37,7 +37,9 @@ public class SysUserServiceImpl implements SysUserService {
@Override
public
SysUser
login
(
String
username
,
String
password
)
{
SysUser
user
=
userDao
.
findByUserName
(
username
);
SysUser
user
=
new
SysUser
();
user
.
setUsername
(
username
);
user
=
userDao
.
findByCondition
(
user
);
// 密码匹配的工作交给 Shiro 去完成
if
(
user
==
null
)
{
// 因为缓存切面的原因,在这里就抛出用户名不存在的异常
...
...
@@ -129,9 +131,21 @@ public class SysUserServiceImpl implements SysUserService {
Base64PasswordEncrypter
base
=
new
Base64PasswordEncrypter
();
password
=
base
.
encryptPassword
(
password
);
user
.
setPassword
(
password
);
SysUser
u
=
userDao
.
findByUserName
(
user
.
getUsername
());
SysUser
userNameCheck
=
new
SysUser
();
userNameCheck
.
setUsername
(
user
.
getUsername
());
userNameCheck
=
userDao
.
findByCondition
(
userNameCheck
);
SysUser
idcardCheck
=
new
SysUser
();
idcardCheck
.
setIdentitycard
(
user
.
getIdentitycard
());
idcardCheck
=
userDao
.
findByCondition
(
idcardCheck
);
//判断要插入的目标对象是否存在
if
(
u
==
null
)
{
if
(
userNameCheck
!=
null
){
user
.
setReason
(
"username"
);
}
else
if
(
idcardCheck
!=
null
){
user
.
setReason
(
"identitycard"
);
}
else
{
String
userId
=
SequenceUtil
.
getNextXxzjbh
();
user
.
setId
(
userId
);
user
.
setLrr
(
dlUser
.
getUsername
());
...
...
@@ -169,9 +183,7 @@ public class SysUserServiceImpl implements SysUserService {
}
int
j
=
userDao
.
batchAddSysUserRole
(
userRoles
);
}
}
else
{
System
.
out
.
println
(
"保存失败"
);
user
=
new
SysUser
();
user
.
setReason
(
""
);
}
return
user
;
}
...
...
@@ -282,7 +294,9 @@ public class SysUserServiceImpl implements SysUserService {
@Override
public
SysUser
loadByUsername
(
String
username
)
{
return
userDao
.
findByUserName
(
username
);
SysUser
user
=
new
SysUser
();
user
.
setUsername
(
username
);
return
userDao
.
findByCondition
(
user
);
}
@Override
...
...
src/main/webapp/WEB-INF/jsp/admin/user/add.jsp
View file @
e9248ed7
...
...
@@ -274,8 +274,22 @@
//设置用户等级和三员回显
var
grade
=
"${user.grade}"
;
$
(
"#grade"
).
val
(
grade
);
form
.
render
(
'select'
);
//设置三员回显
var
gzzmPlay
=
"${user.gzzmPlay}"
;
//获取复选框选中的值
var
groupCheckbox
=
$
(
"input[name='gzzmPlay']"
);
for
(
var
i
=
0
;
i
<
groupCheckbox
.
length
;
i
++
)
{
var
val
=
groupCheckbox
[
i
].
value
;
if
(
gzzmPlay
.
split
(
','
).
indexOf
(
val
)
!=-
1
){
groupCheckbox
[
i
].
checked
=
true
;
}
}
//出生日期转化
var
birthday
=
"${user.birthday}"
;
$
(
"#birthday"
).
val
(
formatTime
(
birthday
));
form
.
render
();
var
data
=
$
{
unit
};
var
zNodes
=
[];
...
...
src/main/webapp/WEB-INF/jsp/admin/user/update.jsp
View file @
e9248ed7
...
...
@@ -284,13 +284,12 @@
groupCheckbox
[
i
].
checked
=
true
;
}
}
form
.
render
();
//出生日期转化
var
birthday
=
"${user.birthday}"
;
$
(
"#birthday"
).
val
(
formatTime
(
birthday
));
form
.
render
();
var
data
=
$
{
unit
};
var
zNodes
=
[];
...
...
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