|  |  | @ -1127,6 +1127,7 @@ public class HeartService { | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     @Transactional(rollbackFor = Exception.class) |  |  |  |     @Transactional(rollbackFor = Exception.class) | 
			
		
	
		
		
			
				
					
					|  |  |  |     public void uploadData(BasicExportTypeEnum exportType, String taskId, Function<HeartService, Object> dataMethod) { |  |  |  |     public void uploadData(BasicExportTypeEnum exportType, String taskId, Function<HeartService, Object> dataMethod) { | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         Date startTime = new Date(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         Integer status = StatusEnum.SUCCESS.getCode(); |  |  |  |         Integer status = StatusEnum.SUCCESS.getCode(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         Object data = dataMethod.apply(this); |  |  |  |         Object data = dataMethod.apply(this); | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (data == null) { |  |  |  |         if (data == null) { | 
			
		
	
	
		
		
			
				
					|  |  | @ -1144,7 +1145,7 @@ public class HeartService { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 .status(status) |  |  |  |                 .status(status) | 
			
		
	
		
		
			
				
					
					|  |  |  |                 .idDatas(exportType.getKey()) |  |  |  |                 .idDatas(exportType.getKey()) | 
			
		
	
		
		
			
				
					
					|  |  |  |                 .type(exportType.getRemark()) |  |  |  |                 .type(exportType.getRemark()) | 
			
		
	
		
		
			
				
					
					|  |  |  |                 .startTime(new Date()) |  |  |  |                 .startTime(startTime) | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |                 .endTime(new Date()) |  |  |  |                 .endTime(new Date()) | 
			
		
	
		
		
			
				
					
					|  |  |  |                 .updateTime(new Date()) |  |  |  |                 .updateTime(new Date()) | 
			
		
	
		
		
			
				
					
					|  |  |  |                 .receiveStatus(String.valueOf(status)) |  |  |  |                 .receiveStatus(String.valueOf(status)) | 
			
		
	
	
		
		
			
				
					|  |  | @ -1217,6 +1218,7 @@ public class HeartService { | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     //上传最近更新单据类型
 |  |  |  |     //上传最近更新单据类型
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     public BaseResponse uploadAllBus(String syncTime) { |  |  |  |     public BaseResponse uploadAllBus(String syncTime) { | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         Date startTime = new Date(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); |  |  |  |         SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (syncTime == null) { |  |  |  |         if (syncTime == null) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_BUS_TYPE); |  |  |  |             BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_BUS_TYPE); | 
			
		
	
	
		
		
			
				
					|  |  | @ -1238,7 +1240,7 @@ public class HeartService { | 
			
		
	
		
		
			
				
					
					|  |  |  |             busTypetatusEntity.setId(CustomUtil.getId()); |  |  |  |             busTypetatusEntity.setId(CustomUtil.getId()); | 
			
		
	
		
		
			
				
					
					|  |  |  |             busTypetatusEntity.setIdDatas(ConstantStatus.SYNC_BUS_TYPE); |  |  |  |             busTypetatusEntity.setIdDatas(ConstantStatus.SYNC_BUS_TYPE); | 
			
		
	
		
		
			
				
					
					|  |  |  |             busTypetatusEntity.setType(BasicProcessStatus.NEW_ALL_BUS); |  |  |  |             busTypetatusEntity.setType(BasicProcessStatus.NEW_ALL_BUS); | 
			
		
	
		
		
			
				
					
					|  |  |  |             busTypetatusEntity.setUpdateTime(new Date()); |  |  |  |             busTypetatusEntity.setUpdateTime(startTime); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |             busTypetatusEntity.setStartTime(new Date()); |  |  |  |             busTypetatusEntity.setStartTime(new Date()); | 
			
		
	
		
		
			
				
					
					|  |  |  |             busTypetatusEntity.setStatus(0); |  |  |  |             busTypetatusEntity.setStatus(0); | 
			
		
	
		
		
			
				
					
					|  |  |  |             busTypetatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); |  |  |  |             busTypetatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); | 
			
		
	
	
		
		
			
				
					|  |  | @ -1355,6 +1357,7 @@ public class HeartService { | 
			
		
	
		
		
			
				
					
					|  |  |  |     //下载最近更新扫码单据--上级服务
 |  |  |  |     //下载最近更新扫码单据--上级服务
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     @Transactional(propagation = Propagation.NESTED) |  |  |  |     @Transactional(propagation = Propagation.NESTED) | 
			
		
	
		
		
			
				
					
					|  |  |  |     public void dlAllOrder() { |  |  |  |     public void dlAllOrder() { | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         Date startTime = new Date(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(NEW_ALL_ORDER + "", "3"); |  |  |  |         BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(NEW_ALL_ORDER + "", "3"); | 
			
		
	
		
		
			
				
					
					|  |  |  |         List<BasicExportStatusEntity> pageSimpleResponse = baseResponse != null ? baseResponse.getData() : new ArrayList<>(); |  |  |  |         List<BasicExportStatusEntity> pageSimpleResponse = baseResponse != null ? baseResponse.getData() : new ArrayList<>(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (pageSimpleResponse != null) { |  |  |  |         if (pageSimpleResponse != null) { | 
			
		
	
	
		
		
			
				
					|  |  | @ -1371,7 +1374,7 @@ public class HeartService { | 
			
		
	
		
		
			
				
					
					|  |  |  |                         BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); |  |  |  |                         BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); | 
			
		
	
		
		
			
				
					
					|  |  |  |                         basicDownloadStatusEntity.setId(CustomUtil.getId()); |  |  |  |                         basicDownloadStatusEntity.setId(CustomUtil.getId()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                         basicDownloadStatusEntity.setTaskId(syncDataResponse.getTaskId()); |  |  |  |                         basicDownloadStatusEntity.setTaskId(syncDataResponse.getTaskId()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                         basicDownloadStatusEntity.setStartTime(new Date()); |  |  |  |                         basicDownloadStatusEntity.setStartTime(startTime); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |                         basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_SCAN_ORDER); |  |  |  |                         basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_SCAN_ORDER); | 
			
		
	
		
		
			
				
					
					|  |  |  |                         basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); //下载中
 |  |  |  |                         basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); //下载中
 | 
			
		
	
		
		
			
				
					
					|  |  |  |                         basicDownloadStatusEntity.setType(NEW_ALL_ORDER); |  |  |  |                         basicDownloadStatusEntity.setType(NEW_ALL_ORDER); | 
			
		
	
	
		
		
			
				
					|  |  | @ -1423,6 +1426,7 @@ public class HeartService { | 
			
		
	
		
		
			
				
					
					|  |  |  |     //    下载最近更新国家库数据-上级服务
 |  |  |  |     //    下载最近更新国家库数据-上级服务
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     @Transactional(propagation = Propagation.NESTED) |  |  |  |     @Transactional(propagation = Propagation.NESTED) | 
			
		
	
		
		
			
				
					
					|  |  |  |     public void dlAllDiProducts() { |  |  |  |     public void dlAllDiProducts() { | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         Date startTime = new Date(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(NEW_ALL_UDIS, "3"); |  |  |  |         BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(NEW_ALL_UDIS, "3"); | 
			
		
	
		
		
			
				
					
					|  |  |  |         List<BasicExportStatusEntity> pageSimpleResponse = baseResponse.getData(); |  |  |  |         List<BasicExportStatusEntity> pageSimpleResponse = baseResponse.getData(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (pageSimpleResponse != null) { |  |  |  |         if (pageSimpleResponse != null) { | 
			
		
	
	
		
		
			
				
					|  |  | @ -1442,7 +1446,7 @@ public class HeartService { | 
			
		
	
		
		
			
				
					
					|  |  |  |                         BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); |  |  |  |                         BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); | 
			
		
	
		
		
			
				
					
					|  |  |  |                         basicDownloadStatusEntity.setId(CustomUtil.getId()); |  |  |  |                         basicDownloadStatusEntity.setId(CustomUtil.getId()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                         basicDownloadStatusEntity.setTaskId(spSyncUdiResponse.getTaskId()); |  |  |  |                         basicDownloadStatusEntity.setTaskId(spSyncUdiResponse.getTaskId()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                         basicDownloadStatusEntity.setStartTime(new Date()); |  |  |  |                         basicDownloadStatusEntity.setStartTime(startTime); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |                         basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_DI_PRODUCTS); |  |  |  |                         basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_DI_PRODUCTS); | 
			
		
	
		
		
			
				
					
					|  |  |  |                         basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); //下载中
 |  |  |  |                         basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); //下载中
 | 
			
		
	
		
		
			
				
					
					|  |  |  |                         basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_UDIS); |  |  |  |                         basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_UDIS); | 
			
		
	
	
		
		
			
				
					|  |  | @ -1514,6 +1518,7 @@ public class HeartService { | 
			
		
	
		
		
			
				
					
					|  |  |  |      */ |  |  |  |      */ | 
			
		
	
		
		
			
				
					
					|  |  |  |     @Transactional(rollbackFor = Exception.class) |  |  |  |     @Transactional(rollbackFor = Exception.class) | 
			
		
	
		
		
			
				
					
					|  |  |  |     public void pullData(BasicExportTypeEnum exportType) { |  |  |  |     public void pullData(BasicExportTypeEnum exportType) { | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         Date startTime = new Date(); | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         String data = spGetHttp.pullData(exportType); |  |  |  |         String data = spGetHttp.pullData(exportType); | 
			
		
	
		
		
			
				
					
					|  |  |  |         cn.hutool.json.JSONObject obj = JSONUtil.parseObj(data); |  |  |  |         cn.hutool.json.JSONObject obj = JSONUtil.parseObj(data); | 
			
		
	
	
		
		
			
				
					|  |  | @ -1545,7 +1550,7 @@ public class HeartService { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); |  |  |  |                 BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 basicDownloadStatusEntity.setId(CustomUtil.getId()); |  |  |  |                 basicDownloadStatusEntity.setId(CustomUtil.getId()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 basicDownloadStatusEntity.setTaskId(taskId); |  |  |  |                 basicDownloadStatusEntity.setTaskId(taskId); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 basicDownloadStatusEntity.setStartTime(new Date()); |  |  |  |                 basicDownloadStatusEntity.setStartTime(startTime); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |                 basicDownloadStatusEntity.setUpdateTime(new Date()); |  |  |  |                 basicDownloadStatusEntity.setUpdateTime(new Date()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 basicDownloadStatusEntity.setEndTime(new Date()); |  |  |  |                 basicDownloadStatusEntity.setEndTime(new Date()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 basicDownloadStatusEntity.setIdDatas(exportType.getKey()); |  |  |  |                 basicDownloadStatusEntity.setIdDatas(exportType.getKey()); | 
			
		
	
	
		
		
			
				
					|  |  | 
 |