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-09-13 20:39:59 +08:00
parent d0aac0886a
commit d54ec83d1c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceFtpController.java
View File

@@ -79,10 +79,10 @@ public class DeviceFtpController extends BaseController {
public HttpResult<String> downloadFile(@RequestParam("nDid") String nDid, @RequestParam("name") String name, @RequestParam("size") Integer size, @RequestParam("fileCheck") String fileCheck){ public HttpResult<String> downloadFile(@RequestParam("nDid") String nDid, @RequestParam("name") String name, @RequestParam("size") Integer size, @RequestParam("fileCheck") String fileCheck){
String methodDescribe = getMethodDescribe("downloadFile"); String methodDescribe = getMethodDescribe("downloadFile");
String result = deviceFtpService.downloadFile(nDid,name,size,fileCheck); String result = deviceFtpService.downloadFile(nDid,name,size,fileCheck);
if (Objects.isNull(result)) {
redisUtil.delete("downloadFilePath:"+name); redisUtil.delete("downloadFilePath:"+name);
redisUtil.delete("fileCheck"+name); redisUtil.delete("fileCheck"+name);
redisUtil.delete("fileDowning"); redisUtil.delete("fileDowning:"+nDid);
if (Objects.isNull(result)) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
} else { } else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);

8
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceFtpServiceImpl.java
View File

@@ -89,7 +89,7 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
public String downloadFile(String nDid, String name, Integer size, String fileCheck) { public String downloadFile(String nDid, String name, Integer size, String fileCheck) {
String result = null; String result = null;
judgeClientOnline(nDid); judgeClientOnline(nDid);
Object task = redisUtil.getObjectByKey("fileDowning"); Object task = redisUtil.getObjectByKey("fileDowning:"+nDid);
if (Objects.nonNull(task)) { if (Objects.nonNull(task)) {
throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOADING); throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOADING);
} }
@@ -102,7 +102,7 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
boolean file = askDeviceDataFeignClient.downloadFile(nDid,name,size,fileCheck).getData(); boolean file = askDeviceDataFeignClient.downloadFile(nDid,name,size,fileCheck).getData();
Thread.sleep(5000); Thread.sleep(5000);
if (!file) { if (!file) {
redisUtil.delete("fileDowning"); redisUtil.delete("fileDowning:"+nDid);
redisUtil.delete("fileCheck"+name); redisUtil.delete("fileCheck"+name);
throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOAD_ERROR); throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOAD_ERROR);
} }
@@ -111,10 +111,10 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
result = (String) object; result = (String) object;
redisUtil.delete("downloadFilePath:"+name); redisUtil.delete("downloadFilePath:"+name);
redisUtil.delete("fileCheck"+name); redisUtil.delete("fileCheck"+name);
redisUtil.delete("fileDowning"); redisUtil.delete("fileDowning:"+nDid);
} }
} catch (Exception e) { } catch (Exception e) {
redisUtil.delete("fileDowning"); redisUtil.delete("fileDowning:"+nDid);
redisUtil.delete("fileCheck"+name); redisUtil.delete("fileCheck"+name);
throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOADING); throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOADING);
} }