|
|
|
|
@ -3,17 +3,14 @@ package com.glxp.api.service.sync;
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
|
|
import cn.hutool.core.lang.Dict;
|
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
import com.alibaba.fastjson.TypeReference;
|
|
|
|
|
import com.glxp.api.common.enums.ResultEnum;
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
|
|
import com.glxp.api.common.res.BaseResponse;
|
|
|
|
|
import com.glxp.api.common.util.ResultVOUtils;
|
|
|
|
|
import com.glxp.api.constant.BasicExportTypeEnum;
|
|
|
|
|
import com.glxp.api.constant.BasicProcessStatus;
|
|
|
|
|
import com.glxp.api.constant.ConstantStatus;
|
|
|
|
|
import com.glxp.api.constant.*;
|
|
|
|
|
import com.glxp.api.dao.basic.*;
|
|
|
|
|
import com.glxp.api.dao.inout.IoCodeLostMapper;
|
|
|
|
|
import com.glxp.api.dao.inout.IoCodeRelMapper;
|
|
|
|
|
@ -25,13 +22,19 @@ import com.glxp.api.entity.purchase.*;
|
|
|
|
|
import com.glxp.api.entity.sync.BasicDownloadStatusEntity;
|
|
|
|
|
import com.glxp.api.entity.sync.BasicExportStatusEntity;
|
|
|
|
|
import com.glxp.api.entity.sync.BasicExportStatusTimeEntity;
|
|
|
|
|
import com.glxp.api.entity.system.SyncDataBustypeEntity;
|
|
|
|
|
import com.glxp.api.entity.system.SyncDataSetEntity;
|
|
|
|
|
import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity;
|
|
|
|
|
import com.glxp.api.http.sync.SpGetHttpClient;
|
|
|
|
|
import com.glxp.api.req.sync.SpsSyncDataRequest;
|
|
|
|
|
import com.glxp.api.res.sync.*;
|
|
|
|
|
import com.glxp.api.service.basic.IBasicBusTypeChangeService;
|
|
|
|
|
import com.glxp.api.service.basic.IBasicBussinessTypeService;
|
|
|
|
|
import com.glxp.api.service.inout.*;
|
|
|
|
|
import com.glxp.api.service.thrsys.IThrBusTypeOriginService;
|
|
|
|
|
import com.glxp.api.util.CustomUtil;
|
|
|
|
|
import com.glxp.api.util.DateUtil;
|
|
|
|
|
import com.glxp.api.util.JsonUtils;
|
|
|
|
|
import com.glxp.api.util.RedisUtil;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.apache.ibatis.session.ExecutorType;
|
|
|
|
|
@ -44,8 +47,8 @@ import org.springframework.transaction.annotation.Propagation;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
import java.util.function.Function;
|
|
|
|
|
|
|
|
|
|
@Slf4j
|
|
|
|
|
@Service
|
|
|
|
|
@ -199,6 +202,422 @@ public class HeartService {
|
|
|
|
|
return ResultVOUtils.success();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private final RedisUtil redisUtil;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Transactional
|
|
|
|
|
public void chooseData(SyncDataSetEntity info, Date syncTime, BasicExportTypeEnum exportType) {
|
|
|
|
|
|
|
|
|
|
Date now = new Date();
|
|
|
|
|
String taskId = CustomUtil.getId();
|
|
|
|
|
switch (exportType) {
|
|
|
|
|
case BASIC_DATA:
|
|
|
|
|
if (needExec(info.getBasicProducts(), info.getBasicCorp(), info.getSupCert())) {
|
|
|
|
|
uploadData(exportType, taskId, x -> x.getBasicData(info, taskId, now, syncTime));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case OTHER_DATA:
|
|
|
|
|
if (needExec(info.getUdiCodeLost(), info.getUdiCodeRel())) {
|
|
|
|
|
uploadData(exportType, taskId, x -> x.getOtherData(info, taskId, now, syncTime));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case DOCUMENT_TYPE:
|
|
|
|
|
if (needExec(info.getTypeBus(), info.getTypeScan(), info.getTypeThird())) {
|
|
|
|
|
uploadData(exportType, taskId, x -> x.getDocumentTypeData(info, taskId, now, syncTime));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case COUNTRY_DI_DATA:
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取基础数据模块数据
|
|
|
|
|
*
|
|
|
|
|
* @param info 同步设置
|
|
|
|
|
* @param now 当前时间
|
|
|
|
|
* @param syncTime 同步时间 -- 传入时不操作exportTime表
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public SpsSyncBasicDataResponse getBasicData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) {
|
|
|
|
|
SpsSyncBasicDataResponse dataResponse = null;
|
|
|
|
|
Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
|
|
|
|
|
syncTimeMap.put("isNew", true);
|
|
|
|
|
syncTimeMap.put("oldDate", syncTime);
|
|
|
|
|
//确认有开启物资字典同步
|
|
|
|
|
if (needExec(info.getBasicProducts())) {
|
|
|
|
|
Map<String, Object> map;
|
|
|
|
|
if (syncTime == null) {
|
|
|
|
|
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_PRODUCTS);
|
|
|
|
|
} else {
|
|
|
|
|
map = syncTimeMap;
|
|
|
|
|
}
|
|
|
|
|
List<BasicHospTypeEntity> hospTypeList = basicHospTypeDao.selectList(Wrappers.lambdaQuery(BasicHospTypeEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), BasicHospTypeEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), BasicHospTypeEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(hospTypeList)) {
|
|
|
|
|
dataResponse = new SpsSyncBasicDataResponse();
|
|
|
|
|
dataResponse.setHospTypeList(hospTypeList);
|
|
|
|
|
}
|
|
|
|
|
List<UdiRelevanceEntity> udiRelevanceList = udiRelevanceDao.selectList(Wrappers.lambdaQuery(UdiRelevanceEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), UdiRelevanceEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), UdiRelevanceEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(udiRelevanceList)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncBasicDataResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setUdiRelevanceList(udiRelevanceList);
|
|
|
|
|
}
|
|
|
|
|
List<BasicProductsEntity> productsList = basicProductsDao.selectList(Wrappers.lambdaQuery(BasicProductsEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), BasicProductsEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), BasicProductsEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(productsList)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncBasicDataResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setProductsList(productsList);
|
|
|
|
|
}
|
|
|
|
|
List<CompanyProductRelevanceEntity> relevanceList = relevanceDao.selectList(Wrappers.lambdaQuery(CompanyProductRelevanceEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), CompanyProductRelevanceEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), CompanyProductRelevanceEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(relevanceList)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncBasicDataResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setRelevanceList(relevanceList);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//确认有开启往来单位字典同步
|
|
|
|
|
if (needExec(info.getBasicCorp())) {
|
|
|
|
|
Map<String, Object> map;
|
|
|
|
|
if (syncTime == null) {
|
|
|
|
|
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_CORP);
|
|
|
|
|
} else {
|
|
|
|
|
map = syncTimeMap;
|
|
|
|
|
}
|
|
|
|
|
List<BasicCorpEntity> corpList = corpDao.selectList(Wrappers.lambdaQuery(BasicCorpEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), BasicCorpEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), BasicCorpEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(corpList)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncBasicDataResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setCorpList(corpList);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//确认有开启首营资质同步
|
|
|
|
|
if (info.getSupCert() == 2) {
|
|
|
|
|
Map<String, Object> map;
|
|
|
|
|
if (syncTime == null) {
|
|
|
|
|
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SUP_CERT);
|
|
|
|
|
} else {
|
|
|
|
|
map = syncTimeMap;
|
|
|
|
|
}
|
|
|
|
|
List<SupCertEntity> supCertList = supCertDao.selectList(Wrappers.lambdaQuery(SupCertEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), SupCertEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), SupCertEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(supCertList)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncBasicDataResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setSupCertList(supCertList);
|
|
|
|
|
}
|
|
|
|
|
List<SupCertSetEntity> supCertSetList = supCertSetDao.selectList(Wrappers.lambdaQuery(SupCertSetEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), SupCertSetEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), SupCertSetEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(supCertSetList)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncBasicDataResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setSupCertSetList(supCertSetList);
|
|
|
|
|
}
|
|
|
|
|
List<SupCompanyEntity> supCompanyList = supCompanyDao.selectList(Wrappers.lambdaQuery(SupCompanyEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), SupCompanyEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), SupCompanyEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(supCompanyList)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncBasicDataResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setSupCompanyList(supCompanyList);
|
|
|
|
|
}
|
|
|
|
|
List<SupManufacturerEntity> supManufacturerList = supManufacturerDao.selectList(Wrappers.lambdaQuery(SupManufacturerEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), SupManufacturerEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), SupManufacturerEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(supManufacturerList)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncBasicDataResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setSupManufacturerList(supManufacturerList);
|
|
|
|
|
}
|
|
|
|
|
List<SupProductEntity> supProductList = supProductDao.selectList(Wrappers.lambdaQuery(SupProductEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), SupProductEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), SupProductEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(supProductList)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncBasicDataResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setSupProductList(supProductList);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
if (dataResponse != null) {
|
|
|
|
|
dataResponse.setTaskId(taskId);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return dataResponse;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取其他数据模块数据
|
|
|
|
|
*
|
|
|
|
|
* @param info 同步设置
|
|
|
|
|
* @param now 当前时间
|
|
|
|
|
* @param syncTime 同步时间 -- 传入时不操作exportTime表
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public SpsSyncOtherDataResponse getOtherData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) {
|
|
|
|
|
|
|
|
|
|
SpsSyncOtherDataResponse dataResponse = null;
|
|
|
|
|
Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
|
|
|
|
|
syncTimeMap.put("isNew", true);
|
|
|
|
|
syncTimeMap.put("oldDate", syncTime);
|
|
|
|
|
//确认有开启udi码补齐同步
|
|
|
|
|
if (needExec(info.getUdiCodeLost())) {
|
|
|
|
|
Map<String, Object> map;
|
|
|
|
|
if (syncTime == null) {
|
|
|
|
|
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_PRODUCTS);
|
|
|
|
|
} else {
|
|
|
|
|
map = syncTimeMap;
|
|
|
|
|
}
|
|
|
|
|
List<IoCodeLostEntity> ioCodeLostList = ioCodeLostMapper.selectList(Wrappers.lambdaQuery(IoCodeLostEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), IoCodeLostEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), IoCodeLostEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(ioCodeLostList)) {
|
|
|
|
|
dataResponse = new SpsSyncOtherDataResponse();
|
|
|
|
|
dataResponse.setIoCodeLostList(ioCodeLostList);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//确认有开启udi关联关系同步
|
|
|
|
|
if (needExec(info.getUdiCodeRel())) {
|
|
|
|
|
Map<String, Object> map;
|
|
|
|
|
if (syncTime == null) {
|
|
|
|
|
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.IO_CODE_REL);
|
|
|
|
|
} else {
|
|
|
|
|
map = syncTimeMap;
|
|
|
|
|
}
|
|
|
|
|
List<IoCodeRelEntity> ioCodeRelList = ioCodeRelMapper.selectList(Wrappers.lambdaQuery(IoCodeRelEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), IoCodeRelEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), IoCodeRelEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(ioCodeRelList)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncOtherDataResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setIoCodeRelList(ioCodeRelList);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (dataResponse != null) {
|
|
|
|
|
dataResponse.setTaskId(taskId);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return dataResponse;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private final IBasicBussinessTypeService bussinessTypeService;
|
|
|
|
|
private final IBasicBusTypeChangeService busTypeChangeService;
|
|
|
|
|
private final IThrBusTypeOriginService thrBusTypeOriginService;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取单据类型数据
|
|
|
|
|
*
|
|
|
|
|
* @param info 同步设置
|
|
|
|
|
* @param now 当前时间
|
|
|
|
|
* @param syncTime 同步时间 -- 传入时不操作exportTime表
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public SpsSyncBusResponse getDocumentTypeData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) {
|
|
|
|
|
SpsSyncBusResponse dataResponse = null;
|
|
|
|
|
Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
|
|
|
|
|
syncTimeMap.put("isNew", true);
|
|
|
|
|
syncTimeMap.put("oldDate", syncTime);
|
|
|
|
|
|
|
|
|
|
//确认有开启业务单据类型同步
|
|
|
|
|
if (needExec(info.getTypeBus())) {
|
|
|
|
|
Map<String, Object> map;
|
|
|
|
|
if (syncTime == null) {
|
|
|
|
|
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSSINESS_TYPE);
|
|
|
|
|
} else {
|
|
|
|
|
map = syncTimeMap;
|
|
|
|
|
}
|
|
|
|
|
List<BasicBussinessTypeEntity> bussinessTypeEntities = bussinessTypeService.list(Wrappers.lambdaQuery(BasicBussinessTypeEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), BasicBussinessTypeEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), BasicBussinessTypeEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(bussinessTypeEntities)) {
|
|
|
|
|
dataResponse = new SpsSyncBusResponse();
|
|
|
|
|
dataResponse.setBussinessTypeEntities(bussinessTypeEntities);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//确认有开启扫码单据类型同步
|
|
|
|
|
if (needExec(info.getTypeScan())) {
|
|
|
|
|
Map<String, Object> map;
|
|
|
|
|
if (syncTime == null) {
|
|
|
|
|
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSTYPE_CHANGE);
|
|
|
|
|
} else {
|
|
|
|
|
map = syncTimeMap;
|
|
|
|
|
}
|
|
|
|
|
List<BasicBusTypeChangeEntity> busTypeChangeList = busTypeChangeService.list(Wrappers.lambdaQuery(BasicBusTypeChangeEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(busTypeChangeList)) {
|
|
|
|
|
if(dataResponse==null){
|
|
|
|
|
dataResponse = new SpsSyncBusResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setBusTypeChangeEntities(busTypeChangeList);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//确认有开启第三方单据类型同步
|
|
|
|
|
if (needExec(info.getTypeThird())) {
|
|
|
|
|
Map<String, Object> map;
|
|
|
|
|
if (syncTime == null) {
|
|
|
|
|
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_BUSTYPE_ORIGIN);
|
|
|
|
|
} else {
|
|
|
|
|
map = syncTimeMap;
|
|
|
|
|
}
|
|
|
|
|
List<ThrBusTypeOriginEntity> thrBusTypeOriginEntities = thrBusTypeOriginService.list(Wrappers.lambdaQuery(ThrBusTypeOriginEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), ThrBusTypeOriginEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), ThrBusTypeOriginEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(thrBusTypeOriginEntities)) {
|
|
|
|
|
if(dataResponse==null){
|
|
|
|
|
dataResponse = new SpsSyncBusResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setThrBusTypeOriginEntities(thrBusTypeOriginEntities);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (dataResponse != null) {
|
|
|
|
|
dataResponse.setTaskId(taskId);
|
|
|
|
|
}
|
|
|
|
|
return dataResponse;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 判断是否需要执行 由内向外
|
|
|
|
|
*
|
|
|
|
|
* @param set 需要判断的数据
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
private boolean needExec(int... set) {
|
|
|
|
|
return CollectionUtil.contains(Collections.singleton(set), 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void uploadData(BasicExportTypeEnum exportType, String taskId, Function<HeartService, Object> dataMethod) {
|
|
|
|
|
Integer status = BasicExportStatusEnum.SUCCESS.getCode();
|
|
|
|
|
Object data = dataMethod.apply(this);
|
|
|
|
|
if (data == null) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
BaseResponse<String> baseResponse = spGetHttp.postData(exportType, data);
|
|
|
|
|
if (baseResponse.getCode() != 20000) {
|
|
|
|
|
status = BasicExportStatusEnum.FAILED.getCode();
|
|
|
|
|
}
|
|
|
|
|
BasicExportStatusEntity exportStatus = BasicExportStatusEntity.builder()
|
|
|
|
|
.id(taskId)
|
|
|
|
|
.status(status)
|
|
|
|
|
.idDatas(exportType.getKey())
|
|
|
|
|
.type(exportType.getRemark())
|
|
|
|
|
.startTime(new Date())
|
|
|
|
|
.endTime(new Date())
|
|
|
|
|
.updateTime(new Date())
|
|
|
|
|
.receiveStatus(status)
|
|
|
|
|
.scheduleType(BasicProcessStatus.SCHEDULE_NORMAL)
|
|
|
|
|
.build();
|
|
|
|
|
this.insertExportStatus(exportStatus);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Transactional(propagation = Propagation.REQUIRES_NEW)
|
|
|
|
|
public void insertExportStatus(BasicExportStatusEntity exportStatus) {
|
|
|
|
|
basicExportService.insertExportStatus(exportStatus);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 插入 basicExportStatusTime表
|
|
|
|
|
*
|
|
|
|
|
* @param date 当前时间
|
|
|
|
|
* @param exportStatusTimeEnum key枚举
|
|
|
|
|
* @return 最后一次同步时间 返回值需与参数 date 比较，判断是否相等
|
|
|
|
|
* @throws Exception
|
|
|
|
|
*/
|
|
|
|
|
public Map<String, Object> basicExportStatusTimeInfo(Date date, BasicExportStatusTimeEnum exportStatusTimeEnum) {
|
|
|
|
|
//防止出现同时调用问题
|
|
|
|
|
String redisKey = String.format("spsm-sync-task:%s", exportStatusTimeEnum.getKey());
|
|
|
|
|
boolean result = redisUtil.setIfAbsent(redisKey, 1, 10);
|
|
|
|
|
if (!result) {
|
|
|
|
|
String errorMsg = String.format("syncIdcSps----process------------同步[%s]重复进入", exportStatusTimeEnum.getRemark());
|
|
|
|
|
// logger.info(errorMsg);
|
|
|
|
|
throw new RuntimeException(errorMsg);
|
|
|
|
|
}
|
|
|
|
|
boolean isNew = true;
|
|
|
|
|
BasicExportStatusTimeEntity timeInfo = basicExportTimeService.getOne(Wrappers.lambdaQuery(BasicExportStatusTimeEntity.class)
|
|
|
|
|
.eq(BasicExportStatusTimeEntity::getKey, exportStatusTimeEnum.getKey()));
|
|
|
|
|
if (timeInfo == null) {
|
|
|
|
|
timeInfo = BasicExportStatusTimeEntity.builder()
|
|
|
|
|
.key(exportStatusTimeEnum.getKey())
|
|
|
|
|
.lastUpdateTime(DateUtil.formatDateTime(date))
|
|
|
|
|
.remark(exportStatusTimeEnum.getRemark())
|
|
|
|
|
.build();
|
|
|
|
|
basicExportTimeService.save(timeInfo);
|
|
|
|
|
} else {
|
|
|
|
|
if (StrUtil.isNotEmpty(timeInfo.getLastUpdateTime())) {
|
|
|
|
|
isNew = false;
|
|
|
|
|
}
|
|
|
|
|
basicExportTimeService.update(Wrappers.lambdaUpdate(BasicExportStatusTimeEntity.class)
|
|
|
|
|
.set(BasicExportStatusTimeEntity::getLastUpdateTime, DateUtil.formatDateTime(date))
|
|
|
|
|
.eq(BasicExportStatusTimeEntity::getKey, exportStatusTimeEnum.getKey())
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
redisUtil.del(redisKey);
|
|
|
|
|
WeakHashMap<String, Object> returnMap = new WeakHashMap<>(10);
|
|
|
|
|
returnMap.put("isNew", isNew);
|
|
|
|
|
returnMap.put("oldDate", isNew ? null : timeInfo.getLastUpdateTime());
|
|
|
|
|
returnMap.put("id", timeInfo.getId());
|
|
|
|
|
|
|
|
|
|
return returnMap;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//上传最近更新单据类型
|
|
|
|
|
public BaseResponse uploadAllBus(String syncTime) {
|
|
|
|
|
SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest();
|
|
|
|
|
|
wj
2 years ago