From d54ec83d1c13a113604b6f40327fda53a714dfc5 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Fri, 13 Sep 2024 20:39:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E4=BB=B6=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E5=AE=8C=E5=88=A0=E9=99=A4=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/equipment/DeviceFtpController.java | 6 +++--- .../njcn/csdevice/service/impl/DeviceFtpServiceImpl.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceFtpController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceFtpController.java index 67165ff..dc6213b 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceFtpController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceFtpController.java @@ -79,10 +79,10 @@ public class DeviceFtpController extends BaseController { public HttpResult downloadFile(@RequestParam("nDid") String nDid, @RequestParam("name") String name, @RequestParam("size") Integer size, @RequestParam("fileCheck") String fileCheck){ String methodDescribe = getMethodDescribe("downloadFile"); String result = deviceFtpService.downloadFile(nDid,name,size,fileCheck); + redisUtil.delete("downloadFilePath:"+name); + redisUtil.delete("fileCheck"+name); + redisUtil.delete("fileDowning:"+nDid); if (Objects.isNull(result)) { - redisUtil.delete("downloadFilePath:"+name); - redisUtil.delete("fileCheck"+name); - redisUtil.delete("fileDowning"); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); } else { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceFtpServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceFtpServiceImpl.java index 67ba226..6fc47aa 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceFtpServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceFtpServiceImpl.java @@ -89,7 +89,7 @@ public class DeviceFtpServiceImpl implements DeviceFtpService { public String downloadFile(String nDid, String name, Integer size, String fileCheck) { String result = null; judgeClientOnline(nDid); - Object task = redisUtil.getObjectByKey("fileDowning"); + Object task = redisUtil.getObjectByKey("fileDowning:"+nDid); if (Objects.nonNull(task)) { throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOADING); } @@ -102,7 +102,7 @@ public class DeviceFtpServiceImpl implements DeviceFtpService { boolean file = askDeviceDataFeignClient.downloadFile(nDid,name,size,fileCheck).getData(); Thread.sleep(5000); if (!file) { - redisUtil.delete("fileDowning"); + redisUtil.delete("fileDowning:"+nDid); redisUtil.delete("fileCheck"+name); throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOAD_ERROR); } @@ -111,10 +111,10 @@ public class DeviceFtpServiceImpl implements DeviceFtpService { result = (String) object; redisUtil.delete("downloadFilePath:"+name); redisUtil.delete("fileCheck"+name); - redisUtil.delete("fileDowning"); + redisUtil.delete("fileDowning:"+nDid); } } catch (Exception e) { - redisUtil.delete("fileDowning"); + redisUtil.delete("fileDowning:"+nDid); redisUtil.delete("fileCheck"+name); throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOADING); }