Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
9b3ec7f4
Commit
9b3ec7f4
authored
Jan 24, 2019
by
cjl
Browse files
抽取获取当前登录人信息为公共方法
parent
2b771198
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
View file @
9b3ec7f4
...
@@ -10,20 +10,17 @@ import com.jsh.erp.datasource.mappers.SerialNumberMapperEx;
...
@@ -10,20 +10,17 @@ import com.jsh.erp.datasource.mappers.SerialNumberMapperEx;
import
com.jsh.erp.exception.BusinessRunTimeException
;
import
com.jsh.erp.exception.BusinessRunTimeException
;
import
com.jsh.erp.service.depotItem.DepotItemService
;
import
com.jsh.erp.service.depotItem.DepotItemService
;
import
com.jsh.erp.service.material.MaterialService
;
import
com.jsh.erp.service.material.MaterialService
;
import
com.jsh.erp.service.user.UserService
;
import
com.jsh.erp.utils.StringUtil
;
import
com.jsh.erp.utils.StringUtil
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.web.context.request.RequestContextHolder
;
import
org.springframework.web.context.request.ServletRequestAttributes
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Objects
;
/**
/**
* Description
* Description
...
@@ -43,6 +40,8 @@ public class SerialNumberService {
...
@@ -43,6 +40,8 @@ public class SerialNumberService {
private
MaterialMapperEx
materialMapperEx
;
private
MaterialMapperEx
materialMapperEx
;
@Resource
@Resource
private
DepotItemService
depotItemService
;
private
DepotItemService
depotItemService
;
@Resource
private
UserService
userService
;
public
SerialNumber
getSerialNumber
(
long
id
)
{
public
SerialNumber
getSerialNumber
(
long
id
)
{
...
@@ -180,8 +179,7 @@ public class SerialNumberService {
...
@@ -180,8 +179,7 @@ public class SerialNumberService {
Date
date
=
new
Date
();
Date
date
=
new
Date
();
serialNumberEx
.
setCreateTime
(
date
);
serialNumberEx
.
setCreateTime
(
date
);
serialNumberEx
.
setUpdateTime
(
date
);
serialNumberEx
.
setUpdateTime
(
date
);
HttpServletRequest
request
=
((
ServletRequestAttributes
)
Objects
.
requireNonNull
(
RequestContextHolder
.
getRequestAttributes
())).
getRequest
();
User
userInfo
=
userService
.
getCurrentUser
();
User
userInfo
=(
User
)
request
.
getSession
().
getAttribute
(
"user"
);
serialNumberEx
.
setCreator
(
userInfo
==
null
?
null
:
userInfo
.
getId
());
serialNumberEx
.
setCreator
(
userInfo
==
null
?
null
:
userInfo
.
getId
());
serialNumberEx
.
setUpdater
(
userInfo
==
null
?
null
:
userInfo
.
getId
());
serialNumberEx
.
setUpdater
(
userInfo
==
null
?
null
:
userInfo
.
getId
());
int
result
=
serialNumberMapperEx
.
addSerialNumber
(
serialNumberEx
);
int
result
=
serialNumberMapperEx
.
addSerialNumber
(
serialNumberEx
);
...
@@ -199,8 +197,7 @@ public class SerialNumberService {
...
@@ -199,8 +197,7 @@ public class SerialNumberService {
serialNumberEx
.
setMaterialId
(
getSerialNumberMaterialIdByMaterialName
(
serialNumberEx
.
getMaterialName
()));
serialNumberEx
.
setMaterialId
(
getSerialNumberMaterialIdByMaterialName
(
serialNumberEx
.
getMaterialName
()));
Date
date
=
new
Date
();
Date
date
=
new
Date
();
serialNumberEx
.
setUpdateTime
(
date
);
serialNumberEx
.
setUpdateTime
(
date
);
HttpServletRequest
request
=
((
ServletRequestAttributes
)
Objects
.
requireNonNull
(
RequestContextHolder
.
getRequestAttributes
())).
getRequest
();
User
userInfo
=
userService
.
getCurrentUser
();
User
userInfo
=(
User
)
request
.
getSession
().
getAttribute
(
"user"
);
serialNumberEx
.
setUpdater
(
userInfo
==
null
?
null
:
userInfo
.
getId
());
serialNumberEx
.
setUpdater
(
userInfo
==
null
?
null
:
userInfo
.
getId
());
int
result
=
serialNumberMapperEx
.
updateSerialNumber
(
serialNumberEx
);
int
result
=
serialNumberMapperEx
.
updateSerialNumber
(
serialNumberEx
);
if
(
result
==
1
){
if
(
result
==
1
){
...
...
src/main/java/com/jsh/erp/service/user/UserService.java
View file @
9b3ec7f4
...
@@ -10,12 +10,15 @@ import org.slf4j.Logger;
...
@@ -10,12 +10,15 @@ import org.slf4j.Logger;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.web.context.request.RequestContextHolder
;
import
org.springframework.web.context.request.ServletRequestAttributes
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
java.security.NoSuchAlgorithmException
;
import
java.security.NoSuchAlgorithmException
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Objects
;
@Service
@Service
public
class
UserService
{
public
class
UserService
{
...
@@ -168,4 +171,16 @@ public class UserService {
...
@@ -168,4 +171,16 @@ public class UserService {
List
<
User
>
list
=
userMapper
.
selectByExample
(
example
);
List
<
User
>
list
=
userMapper
.
selectByExample
(
example
);
return
list
.
size
();
return
list
.
size
();
}
}
/**
* create by: cjl
* description:
* 获取当前用户信息
* create time: 2019/1/24 10:01
* @Param:
* @return com.jsh.erp.datasource.entities.User
*/
public
User
getCurrentUser
(){
HttpServletRequest
request
=
((
ServletRequestAttributes
)
Objects
.
requireNonNull
(
RequestContextHolder
.
getRequestAttributes
())).
getRequest
();
return
(
User
)
request
.
getSession
().
getAttribute
(
"user"
);
}
}
}
Write
Preview
Supports
Markdown
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