fix: 重构底层基础数据同步的代码逻辑，去掉清空表数据的操作，更换为更新或添加操作
This commit is contained in:
zyd
+70
-83
@@ -9,11 +9,14 @@ import com.adc.da.slrs.sarPosition.service.ITsPositionService;
|
||||
import com.adc.da.slrs.sarUser.entity.TsUser;
|
||||
import com.adc.da.slrs.sarUser.service.ITsUserService;
|
||||
import com.adc.da.sync.service.SyncUserService;
|
||||
import com.adc.da.sys.constant.ValidFlagEnum;
|
||||
import com.adc.da.sys.entity.UserOrgEO;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import lombok.extern.log4j.Log4j;
|
||||
import org.apache.ibatis.jdbc.Null;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -40,14 +43,12 @@ public class DataSyncServiceImpl implements IDataSyncService {
|
||||
|
||||
|
||||
@Transactional(rollbackFor = {RuntimeException.class,Exception.class})
|
||||
@Override
|
||||
public String dataSync(){
|
||||
try{
|
||||
SyncUserService syncUserService = new SyncUserService();
|
||||
List<String> res = syncUserService.syncFotonUser();
|
||||
//存放岗位信息
|
||||
Map<String, String> positionMap = new HashMap<>();
|
||||
Map<String, String> useDistinct = new HashMap<>();
|
||||
TsPosition position = new TsPosition();
|
||||
position.setCurrent(1);
|
||||
position.setPageSize(100000);
|
||||
@@ -58,90 +59,76 @@ public class DataSyncServiceImpl implements IDataSyncService {
|
||||
positionMap.put(tsPosition.getName(), tsPosition.getId());
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 得到数据时,删除系统表中所有用户信息
|
||||
*/
|
||||
if (res.size()>0){
|
||||
tsUserService.deleteUser();
|
||||
}
|
||||
List<TsUser> addUserList = new ArrayList<>();
|
||||
List<TsUser> upUserList = new ArrayList<>();
|
||||
for (String s : res) {
|
||||
//获取到所有用户数据
|
||||
List<TsUser> tsUsers = new ArrayList<>();
|
||||
|
||||
JSONArray jsonArray = JSONArray.parseArray(JSONObject.parseObject(s.toString()).getString("results"));
|
||||
jsonArray.forEach(object -> {
|
||||
JSONObject jsonObject = JSONObject.parseObject(object.toString());
|
||||
//先获取岗位以及岗位id
|
||||
TsUser tsUser = new TsUser();
|
||||
UserOrgEO userOrgEO = new UserOrgEO();
|
||||
//设置岗位
|
||||
if (null != jsonObject.getString("title")) {
|
||||
//通过岗位名称查询系统表中是否有岗位,有则设定用户的岗位为系统中的岗位,否则新增
|
||||
if (null == positionMap.get(jsonObject.getString("title"))) {
|
||||
TsPosition tsPosition = new TsPosition();
|
||||
tsPosition.setId(String.valueOf(UUID.randomUUID()));
|
||||
tsPosition.setName(jsonObject.getString("title"));
|
||||
tsPositionService.addPosition(tsPosition);
|
||||
//放入岗位的map集合中
|
||||
positionMap.put(tsPosition.getName(), tsPosition.getId());
|
||||
//放入类中
|
||||
tsUser.setPositionName(tsPosition.getName());
|
||||
tsUser.setPositionId(tsPosition.getId());
|
||||
} else {
|
||||
tsUser.setPositionName(jsonObject.getString("title").trim());
|
||||
tsUser.setPositionId(positionMap.get(jsonObject.getString("title").trim()));
|
||||
JSONObject userData = JSONObject.parseObject(s);
|
||||
if(userData.containsKey("results")){
|
||||
JSONArray jsonArray = userData.getJSONArray("results");
|
||||
jsonArray.forEach(object -> {
|
||||
JSONObject jsonObject = JSONObject.parseObject(object.toString());
|
||||
String userid = jsonObject.getString("userid");
|
||||
TsUser userEO = tsUserService.getById(userid);
|
||||
String userState = "";
|
||||
if(userEO != null){
|
||||
userState = "UPDATE";
|
||||
}else{
|
||||
userState = "ADD";
|
||||
userEO = new TsUser();
|
||||
}
|
||||
}
|
||||
//设置其他数据
|
||||
Timestamp createTime = new Timestamp(new Date().getTime());
|
||||
tsUser.setState(jsonObject.getString("userStatus"));
|
||||
tsUser.setUname(null!=jsonObject.getString("name")?jsonObject.getString("name"):"");
|
||||
tsUser.setValidFlag("0");
|
||||
tsUser.setDisableFlag("0");
|
||||
tsUser.setCreationTime(createTime);
|
||||
tsUser.setUserId(jsonObject.getString("userid"));
|
||||
tsUser.setAccount(jsonObject.getString("userid"));
|
||||
tsUser.setInstitutionId(null!=jsonObject.getString("orgNumber")?jsonObject.getString("orgNumber"):"" );
|
||||
tsUser.setInstitutionName(null!=jsonObject.getString("orgName")?jsonObject.getString("orgName"):"" );
|
||||
//2022-05-23：用户同步增加状态标识，将停用的用户过滤掉
|
||||
if (null == useDistinct.get(jsonObject.getString("userid")) && "1".equals(jsonObject.getString("userStatus"))) {
|
||||
tsUsers.add(tsUser);
|
||||
|
||||
}
|
||||
|
||||
// //测试数据删除
|
||||
// if (! "anbin".equals(jsonObject.getString("userid"))){
|
||||
//
|
||||
// //测试数据修改
|
||||
// if ("anbing".equals(jsonObject.getString("userid"))){
|
||||
// tsUser.setUname("DDDDDD");
|
||||
// tsUsers.add(tsUser);
|
||||
// } else if (null == useDistinct.get(jsonObject.getString("userid"))) {
|
||||
// tsUsers.add(tsUser);
|
||||
//
|
||||
// }
|
||||
// }
|
||||
useDistinct.put(tsUser.getUserId(),tsUser.getUserId());
|
||||
});
|
||||
tsUserService.saveBatch(tsUsers);
|
||||
//先获取岗位以及岗位id
|
||||
//设置岗位
|
||||
if (null != jsonObject.getString("title")) {
|
||||
//通过岗位名称查询系统表中是否有岗位,有则设定用户的岗位为系统中的岗位,否则新增
|
||||
if (null == positionMap.get(jsonObject.getString("title"))) {
|
||||
TsPosition tsPosition = new TsPosition();
|
||||
tsPosition.setId(String.valueOf(UUID.randomUUID()));
|
||||
tsPosition.setName(jsonObject.getString("title"));
|
||||
tsPositionService.addPosition(tsPosition);
|
||||
//放入岗位的map集合中
|
||||
positionMap.put(tsPosition.getName(), tsPosition.getId());
|
||||
//放入类中
|
||||
userEO.setPositionName(tsPosition.getName());
|
||||
userEO.setPositionId(tsPosition.getId());
|
||||
} else {
|
||||
userEO.setPositionName(jsonObject.getString("title").trim());
|
||||
userEO.setPositionId(positionMap.get(jsonObject.getString("title").trim()));
|
||||
}
|
||||
}else{
|
||||
userEO.setPositionId(null);
|
||||
userEO.setPositionName(null);
|
||||
}
|
||||
//设置其他数据
|
||||
Timestamp createTime = new Timestamp(new Date().getTime());
|
||||
userEO.setState(jsonObject.getString("userStatus"));
|
||||
userEO.setUname(null!=jsonObject.getString("name")?jsonObject.getString("name"):"");
|
||||
userEO.setCreationTime(createTime);
|
||||
userEO.setUserId(jsonObject.getString("userid"));
|
||||
userEO.setAccount(jsonObject.getString("userid"));
|
||||
userEO.setInstitutionId(null!=jsonObject.getString("orgNumber")?jsonObject.getString("orgNumber"):"" );
|
||||
userEO.setInstitutionName(null!=jsonObject.getString("orgName")?jsonObject.getString("orgName"):"" );
|
||||
//2022-05-23：用户同步增加状态标识，将停用的用户过滤掉
|
||||
if("1".equals(jsonObject.getString("userStatus"))){
|
||||
userEO.setValidFlag(ValidFlagEnum.VALID_FALSE.getValue()+"");
|
||||
userEO.setDisableFlag(ValidFlagEnum.VALID_FALSE.getValue()+"");
|
||||
}else{
|
||||
userEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue()+"");
|
||||
userEO.setDisableFlag(ValidFlagEnum.VALID_TRUE.getValue()+"");
|
||||
}
|
||||
if("ADD".equals(userState)){
|
||||
addUserList.add(userEO);
|
||||
}else {
|
||||
upUserList.add(userEO);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
if(!addUserList.isEmpty()){
|
||||
tsUserService.saveBatch(addUserList);
|
||||
}
|
||||
if(!upUserList.isEmpty()){
|
||||
tsUserService.updateBatchById(upUserList);
|
||||
}
|
||||
|
||||
//测试数据添加
|
||||
// TsUser addUser = new TsUser();
|
||||
// addUser.setState("FFFFFFF");
|
||||
// addUser.setUname("zhaokaiyao");
|
||||
// addUser.setValidFlag("0");
|
||||
// addUser.setDisableFlag("0");
|
||||
// addUser.setCreationTime(new Timestamp(new Date().getTime()));
|
||||
// addUser.setUserId("FFFFFFF");
|
||||
// addUser.setAccount("zhaokaiyao");
|
||||
// addUser.setInstitutionId("10022745");
|
||||
// addUser.setInstitutionName("福田营销其他");
|
||||
//
|
||||
// List<TsUser> addUserList = Arrays.asList(addUser);
|
||||
// tsUserService.saveBatch(addUserList);
|
||||
|
||||
}catch(Exception e){
|
||||
logger.error(e.getMessage(),e);
|
||||
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
||||
|
||||
Reference in New Issue
Block a user