Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
education
Project
Project
Details
Activity
Releases
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
李丛阳
education
Commits
1ec5783b
Commit
1ec5783b
authored
Oct 22, 2019
by
王淑君
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改同步人员
parent
8d2fd6b2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
7 deletions
+14
-7
CurUserAspect.java
src/main/java/org/rcisoft/core/aop/CurUserAspect.java
+2
-1
SysUserController.java
...va/org/rcisoft/sys/user/controller/SysUserController.java
+6
-3
SysUserService.java
...ain/java/org/rcisoft/sys/user/service/SysUserService.java
+2
-1
SysUserServiceImpl.java
...org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java
+4
-2
No files found.
src/main/java/org/rcisoft/core/aop/CurUserAspect.java
View file @
1ec5783b
...
@@ -25,6 +25,7 @@ import org.springframework.stereotype.Component;
...
@@ -25,6 +25,7 @@ import org.springframework.stereotype.Component;
import
org.springframework.transaction.annotation.Propagation
;
import
org.springframework.transaction.annotation.Propagation
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.text.ParseException
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
@@ -44,7 +45,7 @@ public class CurUserAspect {
...
@@ -44,7 +45,7 @@ public class CurUserAspect {
* @param joinPoint
* @param joinPoint
*/
*/
@Before
(
"execution(* org.rcisoft..*.controller.*.*(..))"
)
@Before
(
"execution(* org.rcisoft..*.controller.*.*(..))"
)
public
void
beforeInsert
(
JoinPoint
joinPoint
)
{
public
void
beforeInsert
(
JoinPoint
joinPoint
)
throws
ParseException
{
if
(
joinPoint
.
getArgs
().
length
<
2
)
if
(
joinPoint
.
getArgs
().
length
<
2
)
return
;
return
;
Object
model
=
joinPoint
.
getArgs
()[
0
];
Object
model
=
joinPoint
.
getArgs
()[
0
];
...
...
src/main/java/org/rcisoft/sys/user/controller/SysUserController.java
View file @
1ec5783b
...
@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
...
@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
import
springfox.documentation.annotations.ApiIgnore
;
import
springfox.documentation.annotations.ApiIgnore
;
import
javax.validation.Valid
;
import
javax.validation.Valid
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
import
java.time.Instant
;
import
java.time.Instant
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
...
@@ -51,6 +52,8 @@ public class SysUserController extends PaginationController<SysUser> {
...
@@ -51,6 +52,8 @@ public class SysUserController extends PaginationController<SysUser> {
@Autowired
@Autowired
private
SysUserService
userServiceImpl
;
private
SysUserService
userServiceImpl
;
@Autowired
private
SynchronizationTimeService
synchronizationTimeServiceImpl
;
/**
/**
* 同步人员
* 同步人员
...
@@ -58,10 +61,10 @@ public class SysUserController extends PaginationController<SysUser> {
...
@@ -58,10 +61,10 @@ public class SysUserController extends PaginationController<SysUser> {
* @return
* @return
*/
*/
@Transactional
@Transactional
@GetMapping
(
"/
user/
gets"
)
@GetMapping
(
"/gets"
)
@ApiOperation
(
value
=
"|personnels|同步人员"
,
notes
=
"同步人员信息"
)
@ApiOperation
(
value
=
"|personnels|同步人员"
,
notes
=
"同步人员信息"
)
public
Result
synchronizedUsers
(
@RequestParam
String
corpId
){
public
Result
synchronizedUsers
(
@RequestParam
String
corpId
)
throws
ParseException
{
return
Result
.
builder
(
new
PersistModel
(
userServiceImpl
.
synchronizedUsers
(
corpId
)
),
return
Result
.
builder
(
new
PersistModel
(
'1'
),
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
userServiceImpl
.
synchronizedUsers
(
corpId
));
userServiceImpl
.
synchronizedUsers
(
corpId
));
...
...
src/main/java/org/rcisoft/sys/user/service/SysUserService.java
View file @
1ec5783b
...
@@ -10,6 +10,7 @@ import org.rcisoft.sys.user.dto.QuerySysUserDTO;
...
@@ -10,6 +10,7 @@ import org.rcisoft.sys.user.dto.QuerySysUserDTO;
import
org.rcisoft.sys.user.dto.MyInfoDTO
;
import
org.rcisoft.sys.user.dto.MyInfoDTO
;
import
org.rcisoft.sys.user.entity.SysUser
;
import
org.rcisoft.sys.user.entity.SysUser
;
import
java.text.ParseException
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -41,7 +42,7 @@ public interface SysUserService {
...
@@ -41,7 +42,7 @@ public interface SysUserService {
int
insertOrUpdateList
(
List
<
SysUser
>
sysUserList
);
int
insertOrUpdateList
(
List
<
SysUser
>
sysUserList
);
int
synchronizedUsers
(
String
corpId
);
int
synchronizedUsers
(
String
corpId
)
throws
ParseException
;
/**
/**
* zhangqingle
* zhangqingle
...
...
src/main/java/org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java
View file @
1ec5783b
...
@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
...
@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Propagation
;
import
org.springframework.transaction.annotation.Propagation
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
java.util.*
;
...
@@ -274,13 +275,14 @@ public class SysUserServiceImpl implements SysUserService {
...
@@ -274,13 +275,14 @@ public class SysUserServiceImpl implements SysUserService {
}
}
@Override
@Override
public
int
synchronizedUsers
(
String
corpId
)
{
public
int
synchronizedUsers
(
String
corpId
)
throws
ParseException
{
SynchronizationTime
synchronizationTime
=
synchronizationTimeServiceImpl
.
getById
(
"1"
);
SynchronizationTime
synchronizationTime
=
synchronizationTimeServiceImpl
.
getById
(
"1"
);
SimpleDateFormat
df
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
//调用智信接口根据更新时间查询所有人员
SimpleDateFormat
df
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
//调用智信接口根据更新时间查询所有人员
if
(
null
==
synchronizationTime
)
{
if
(
null
==
synchronizationTime
)
{
synchronizationTime
=
new
SynchronizationTime
();
synchronizationTime
=
new
SynchronizationTime
();
synchronizationTime
.
setBusinessId
(
"1"
);
synchronizationTime
.
setBusinessId
(
"1"
);
synchronizationTime
.
setSynchronizationTime
(
new
Date
(
1999
,
01
,
01
,
0
,
0
,
0
));
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
synchronizationTime
.
setSynchronizationTime
(
sdf
.
parse
(
"1999-01-01 00:00:00"
));
synchronizationTimeServiceImpl
.
save
(
synchronizationTime
);
synchronizationTimeServiceImpl
.
save
(
synchronizationTime
);
}
}
String
updateTime
=
df
.
format
(
synchronizationTime
.
getSynchronizationTime
());
String
updateTime
=
df
.
format
(
synchronizationTime
.
getSynchronizationTime
());
...
...
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