From b7c9cd2ee0c19058f398cbad521ac5ade95fca70 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Mon, 21 Oct 2024 19:59:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=8F=AC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OfflineDataUploadServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java index 78d64eb..55f985a 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java @@ -267,7 +267,7 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService { } } if (CollectionUtil.isNotEmpty(map)) { - System.out.println("map==:" + map); + List keyList = new ArrayList<>(); //获取装置信息 CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(param.getNDid()).getData(); map.forEach((k,v)->{ @@ -281,7 +281,7 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService { } askFileInfo(param.getNDid(),mid,item); try { - Thread.sleep(100000); + Thread.sleep(10000); FileDto.FileInfo info = channelObjectUtil.objectToSingleObject(redisUtil.getObjectByKey(key),FileDto.FileInfo.class); 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]; @@ -293,6 +293,11 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService { } //删除下载文件 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) { throw new BusinessException(CsHarmonicResponseEnum.MAKE_UP_ERROR); }