|
|
|
|
@ -24,15 +24,18 @@ 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.SyncDataSetEntity;
|
|
|
|
|
import com.glxp.api.entity.system.*;
|
|
|
|
|
import com.glxp.api.entity.thrsys.*;
|
|
|
|
|
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.auth.*;
|
|
|
|
|
import com.glxp.api.service.basic.EntrustReceService;
|
|
|
|
|
import com.glxp.api.service.basic.IBasicBusTypeChangeService;
|
|
|
|
|
import com.glxp.api.service.basic.IBasicBusTypePreService;
|
|
|
|
|
import com.glxp.api.service.basic.IBasicBussinessTypeService;
|
|
|
|
|
import com.glxp.api.service.inout.*;
|
|
|
|
|
import com.glxp.api.service.system.*;
|
|
|
|
|
import com.glxp.api.service.thrsys.*;
|
|
|
|
|
import com.glxp.api.util.CustomUtil;
|
|
|
|
|
import com.glxp.api.util.DateUtil;
|
|
|
|
|
@ -232,7 +235,7 @@ public class HeartService {
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case USER_DATA:
|
|
|
|
|
if (needExec(info.getBasicDept(), info.getBasicInv(), info.getSysUser())) {
|
|
|
|
|
if (!needExec(info.getBasicDept(), info.getBasicInv(), info.getSysUser())) {
|
|
|
|
|
uploadData(exportType, taskId, x -> x.getUserData(info, taskId, now, syncTime));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
@ -241,11 +244,15 @@ public class HeartService {
|
|
|
|
|
uploadData(exportType, taskId, x -> x.getThirdData(info, taskId, now, syncTime));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case SYS_SET_DATA:
|
|
|
|
|
if (needExec(info.getSystemConfig(), info.getEntrustAction(), info.getPrintConfig(), info.getScanChangeConfig(), info.getBusChangeConfig())) {
|
|
|
|
|
uploadData(exportType, taskId, x -> x.getSysSettingData(info, taskId, now, syncTime));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case COUNTRY_DI_DATA:
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取基础数据模块数据
|
|
|
|
|
*
|
|
|
|
|
@ -800,6 +807,188 @@ public class HeartService {
|
|
|
|
|
return dataResponse;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private final SystemParamConfigService systemParamConfigService;
|
|
|
|
|
private final EntrustReceService entrustReceService;
|
|
|
|
|
private final SystemPDFModuleService systemPDFModuleService;
|
|
|
|
|
private final SystemPDFTemplateService systemPDFTemplateService;
|
|
|
|
|
private final SystemPDFTemplateRelevanceCodeService systemPDFTemplateRelevanceCodeService;
|
|
|
|
|
private final SystemPDFTemplateRelevanceBizService systemPDFTemplateRelevanceBizService;
|
|
|
|
|
private final SystemPDFTemplateRelevanceLabelService systemPDFTemplateRelevanceLabelService;
|
|
|
|
|
private final SystemPDFTemplateRelevanceStatemenService systemPDFTemplateRelevanceStatemenService;
|
|
|
|
|
private final IBasicBusTypePreService iBasicBusTypePreService;
|
|
|
|
|
private final IBasicBusTypeChangeService iBasicBusTypeChangeService;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取系统设置模块数据
|
|
|
|
|
*
|
|
|
|
|
* @param info 同步设置
|
|
|
|
|
* @param now 当前时间
|
|
|
|
|
* @param syncTime 同步时间 -- 传入时不操作exportTime表
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
private SpsSyncSysSettingResponse getSysSettingData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) {
|
|
|
|
|
SpsSyncSysSettingResponse dataResponse = null;
|
|
|
|
|
Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
|
|
|
|
|
syncTimeMap.put("isNew", true);
|
|
|
|
|
syncTimeMap.put("oldDate", syncTime);
|
|
|
|
|
if (needExec(info.getSystemConfig())) {
|
|
|
|
|
Map<String, Object> map;
|
|
|
|
|
if (syncTime == null) {
|
|
|
|
|
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SYSTEM_PARAM_CONFIG);
|
|
|
|
|
} else {
|
|
|
|
|
map = syncTimeMap;
|
|
|
|
|
}
|
|
|
|
|
List<SystemParamConfigEntity> systemParamConfigEntities = systemParamConfigService.list(Wrappers.lambdaQuery(SystemParamConfigEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(systemParamConfigEntities)) {
|
|
|
|
|
dataResponse = new SpsSyncSysSettingResponse();
|
|
|
|
|
dataResponse.setSystemParamConfigEntities(systemParamConfigEntities);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (needExec(info.getEntrustAction())) {
|
|
|
|
|
Map<String, Object> map;
|
|
|
|
|
if (syncTime == null) {
|
|
|
|
|
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.ENTRUST_ACCEPT);
|
|
|
|
|
} else {
|
|
|
|
|
map = syncTimeMap;
|
|
|
|
|
}
|
|
|
|
|
List<EntrustReceEntity> entrustReceEntities = entrustReceService.list(Wrappers.lambdaQuery(EntrustReceEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(entrustReceEntities)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncSysSettingResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setEntrustReceEntities(entrustReceEntities);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (needExec(info.getPrintConfig())) {
|
|
|
|
|
Map<String, Object> map;
|
|
|
|
|
if (syncTime == null) {
|
|
|
|
|
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.PRINT_CONFIG);
|
|
|
|
|
} else {
|
|
|
|
|
map = syncTimeMap;
|
|
|
|
|
}
|
|
|
|
|
List<SystemPDFModuleEntity> systemPDFModuleEntities = systemPDFModuleService.list(Wrappers.lambdaQuery(SystemPDFModuleEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(systemPDFModuleEntities)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncSysSettingResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setSystemPDFModuleEntities(systemPDFModuleEntities);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<SystemPDFTemplateEntity> systemPDFTemplateEntities = systemPDFTemplateService.list(Wrappers.lambdaQuery(SystemPDFTemplateEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), SystemPDFTemplateEntity::getUpdate_time, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), SystemPDFTemplateEntity::getUpdate_time
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(systemPDFTemplateEntities)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncSysSettingResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setSystemPDFTemplateEntities(systemPDFTemplateEntities);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<SysPdfTemplateRelevanceCodeEntity> sysPdfTemplateRelevanceCodeEntities = systemPDFTemplateRelevanceCodeService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceCodeEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), SysPdfTemplateRelevanceCodeEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceCodeEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceCodeEntities)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncSysSettingResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setSysPdfTemplateRelevanceCodeEntities(sysPdfTemplateRelevanceCodeEntities);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<SysPdfTemplateRelevanceBizEntity> sysPdfTemplateRelevanceBizEntities = systemPDFTemplateRelevanceBizService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceBizEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), SysPdfTemplateRelevanceBizEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceBizEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceBizEntities)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncSysSettingResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setSysPdfTemplateRelevanceBizEntities(sysPdfTemplateRelevanceBizEntities);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<SysPdfTemplateRelevanceLabelEntity> sysPdfTemplateRelevanceLabelEntities = systemPDFTemplateRelevanceLabelService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceLabelEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), SysPdfTemplateRelevanceLabelEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceLabelEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceLabelEntities)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncSysSettingResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setSysPdfTemplateRelevanceLabelEntities(sysPdfTemplateRelevanceLabelEntities);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<SysPdfTemplateRelevanceStatemenEntity> sysPdfTemplateRelevanceStatemenEntities = systemPDFTemplateRelevanceStatemenService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceStatemenEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), SysPdfTemplateRelevanceStatemenEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceStatemenEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceStatemenEntities)) {
|
|
|
|
|
if (dataResponse == null) {
|
|
|
|
|
dataResponse = new SpsSyncSysSettingResponse();
|
|
|
|
|
}
|
|
|
|
|
dataResponse.setSysPdfTemplateRelevanceStatemenEntities(sysPdfTemplateRelevanceStatemenEntities);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (needExec(info.getScanChangeConfig())) {
|
|
|
|
|
Map<String, Object> map;
|
|
|
|
|
if (syncTime == null) {
|
|
|
|
|
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SCAN_CHANGE);
|
|
|
|
|
} else {
|
|
|
|
|
map = syncTimeMap;
|
|
|
|
|
}
|
|
|
|
|
List<BasicBusTypePreEntity> basicBusTypePreEntities = iBasicBusTypePreService.list(Wrappers.lambdaQuery(BasicBusTypePreEntity.class)
|
|
|
|
|
.le((boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime, now)
|
|
|
|
|
.between(!(boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime
|
|
|
|
|
, map.get("oldDate"), now)
|
|
|
|
|
);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(basicBusTypePreEntities)) {
|
|
|
|
|
dataResponse = new SpsSyncSysSettingResponse();
|
|
|
|
|
dataResponse.setBasicBusTypePreEntities(basicBusTypePreEntities);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (needExec(info.getBusChangeConfig())) {
|
|
|
|
|
Map<String, Object> map;
|
|
|
|
|
if (syncTime == null) {
|
|
|
|
|
map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BUS_TYPE_CHANGE);
|
|
|
|
|
} else {
|
|
|
|
|
map = syncTimeMap;
|
|
|
|
|
}
|
|
|
|
|
List<BasicBusTypeChangeEntity> basicBusTypeChangeEntities = iBasicBusTypeChangeService.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(basicBusTypeChangeEntities)) {
|
|
|
|
|
dataResponse = new SpsSyncSysSettingResponse();
|
|
|
|
|
dataResponse.setBasicBusTypeChangeEntities(basicBusTypeChangeEntities);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (dataResponse != null) {
|
|
|
|
|
dataResponse.setTaskId(taskId);
|
|
|
|
|
}
|
|
|
|
|
return dataResponse;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 判断是否需要执行 由内向外
|
|
|
|
|
*
|
|
|
|
|
@ -1230,7 +1419,7 @@ public class HeartService {
|
|
|
|
|
basicDownloadStatusEntity.setEndTime(new Date());
|
|
|
|
|
basicDownloadStatusEntity.setIdDatas(exportType.getKey());
|
|
|
|
|
basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode()); //下载完成
|
|
|
|
|
basicDownloadStatusEntity.setType(BasicProcessStatus.BASIC_DATA);
|
|
|
|
|
basicDownloadStatusEntity.setType(exportType.getRemark());
|
|
|
|
|
basicDownloadStatusEntity.setScheduleType(1);
|
|
|
|
|
basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity);
|
|
|
|
|
//通知自助平台任务已完成
|
|
|
|
|
|
wj
2 years ago