Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

补召优化

Browse Source
This commit is contained in:
xy
2024-10-21 19:59:13 +08:00
parent 6cca1cc74d
commit b7c9cd2ee0
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java
View File

@@ -267,7 +267,7 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService {
} }
} }
if (CollectionUtil.isNotEmpty(map)) { if (CollectionUtil.isNotEmpty(map)) {
System.out.println("map==:" + map); List<String> keyList = new ArrayList<>();
//获取装置信息 //获取装置信息
CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(param.getNDid()).getData(); CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(param.getNDid()).getData();
map.forEach((k,v)->{ map.forEach((k,v)->{
@@ -281,7 +281,7 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService {
} }
askFileInfo(param.getNDid(),mid,item); askFileInfo(param.getNDid(),mid,item);
try { try {
Thread.sleep(100000); Thread.sleep(10000);
FileDto.FileInfo info = channelObjectUtil.objectToSingleObject(redisUtil.getObjectByKey(key),FileDto.FileInfo.class); FileDto.FileInfo info = channelObjectUtil.objectToSingleObject(redisUtil.getObjectByKey(key),FileDto.FileInfo.class);
String path = deviceFtpFeignClient.downloadFile(param.getNDid(),item,info.getFileSize(),info.getFileCheck()).getData(); String path = deviceFtpFeignClient.downloadFile(param.getNDid(),item,info.getFileSize(),info.getFileCheck()).getData();
String lsFile = generalInfo.getBusinessTempPath() + File.separator + item.split(StrUtil.SLASH)[item.split(StrUtil.SLASH).length - 1]; String lsFile = generalInfo.getBusinessTempPath() + File.separator + item.split(StrUtil.SLASH)[item.split(StrUtil.SLASH).length - 1];
@@ -293,6 +293,11 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService {
} }
//删除下载文件 //删除下载文件
fileStorageUtil.deleteFile(path); fileStorageUtil.deleteFile(path);
//存储下载
keyList.add(item);
//推送下载进度
String json = "{allStep:" + fileList.size() * 2 + ",nowStep:" + keyList.size() + "}";
publisher.send("/dataOnlineRecruitment/Progress/" + param.getLineId(), new Gson().toJson(json), 1, false);
} catch (Exception e) { } catch (Exception e) {
throw new BusinessException(CsHarmonicResponseEnum.MAKE_UP_ERROR); throw new BusinessException(CsHarmonicResponseEnum.MAKE_UP_ERROR);
} }