Commit 1ec5783b authored by 王淑君's avatar 王淑君

修改同步人员

parent 8d2fd6b2
......@@ -25,6 +25,7 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -44,7 +45,7 @@ public class CurUserAspect {
* @param joinPoint
*/
@Before("execution(* org.rcisoft..*.controller.*.*(..))")
public void beforeInsert(JoinPoint joinPoint) {
public void beforeInsert(JoinPoint joinPoint) throws ParseException {
if (joinPoint.getArgs().length < 2)
return;
Object model = joinPoint.getArgs()[0];
......
......@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDateTime;
......@@ -51,6 +52,8 @@ public class SysUserController extends PaginationController<SysUser> {
@Autowired
private SysUserService userServiceImpl;
@Autowired
private SynchronizationTimeService synchronizationTimeServiceImpl;
/**
* 同步人员
......@@ -58,10 +61,10 @@ public class SysUserController extends PaginationController<SysUser> {
* @return
*/
@Transactional
@GetMapping("/user/gets")
@GetMapping("/gets")
@ApiOperation(value = "|personnels|同步人员", notes = "同步人员信息")
public Result synchronizedUsers(@RequestParam String corpId){
return Result.builder(new PersistModel(userServiceImpl.synchronizedUsers(corpId)),
public Result synchronizedUsers(@RequestParam String corpId) throws ParseException {
return Result.builder(new PersistModel('1'),
MessageConstant.MESSAGE_ALERT_SUCCESS,
MessageConstant.MESSAGE_ALERT_ERROR,
userServiceImpl.synchronizedUsers(corpId));
......
......@@ -10,6 +10,7 @@ import org.rcisoft.sys.user.dto.QuerySysUserDTO;
import org.rcisoft.sys.user.dto.MyInfoDTO;
import org.rcisoft.sys.user.entity.SysUser;
import java.text.ParseException;
import java.util.List;
import java.util.Map;
......@@ -41,7 +42,7 @@ public interface SysUserService {
int insertOrUpdateList(List<SysUser> sysUserList);
int synchronizedUsers(String corpId);
int synchronizedUsers(String corpId) throws ParseException;
/**
* zhangqingle
......
......@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
......@@ -274,13 +275,14 @@ public class SysUserServiceImpl implements SysUserService {
}
@Override
public int synchronizedUsers(String corpId) {
public int synchronizedUsers(String corpId) throws ParseException {
SynchronizationTime synchronizationTime = synchronizationTimeServiceImpl.getById("1");
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //调用智信接口根据更新时间查询所有人员
if (null == synchronizationTime) {
synchronizationTime = new SynchronizationTime();
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);
}
String updateTime = df.format(synchronizationTime.getSynchronizationTime());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment