From d0aac0886aac990539d334a181c049c7807a5361 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Wed, 11 Sep 2024 20:40:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E7=BD=AE=E6=96=87=E4=BB=B6=E5=A4=B9?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/DeviceFtpController.java | 34 ++++++++++++++++++ .../csdevice/service/DeviceFtpService.java | 5 +++ .../service/impl/DeviceFtpServiceImpl.java | 36 ++++++++++++++++++- 3 files changed, 74 insertions(+), 1 deletion(-) 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 aca7ab2..67165ff 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 @@ -88,4 +88,38 @@ public class DeviceFtpController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/createFolder") + @ApiOperation("创建文件") + @ApiImplicitParams({ + @ApiImplicitParam(name = "nDid", value = "nDid", required = true), + @ApiImplicitParam(name = "path", value = "文件路径", required = true) + }) + public HttpResult createFolder(@RequestParam("nDid") String nDid, @RequestParam("path") String path){ + String methodDescribe = getMethodDescribe("createFolder"); + boolean result = deviceFtpService.createFile(nDid,path); + if (result) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/deleteFolder") + @ApiOperation("删除文件") + @ApiImplicitParams({ + @ApiImplicitParam(name = "nDid", value = "nDid", required = true), + @ApiImplicitParam(name = "path", value = "文件路径", required = true) + }) + public HttpResult deleteFolder(@RequestParam("nDid") String nDid, @RequestParam("path") String path){ + String methodDescribe = getMethodDescribe("deleteFolder"); + boolean result = deviceFtpService.deleteFile(nDid,path); + if (result) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + } } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/DeviceFtpService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/DeviceFtpService.java index fe9b0b3..f3656f0 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/DeviceFtpService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/DeviceFtpService.java @@ -11,4 +11,9 @@ public interface DeviceFtpService { List askDeviceFileOrDir(String nDid, String name, String type); String downloadFile(String nDid, String name, Integer size, String fileCheck); + + boolean createFile(String nDid, String path); + + boolean deleteFile(String nDid, String path); + } 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 7ed0eb0..67ba226 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 @@ -108,7 +108,7 @@ public class DeviceFtpServiceImpl implements DeviceFtpService { } Object object = redisUtil.getObjectByKey("downloadFilePath:"+name); if (Objects.nonNull(object)) { - result = fileStorageUtil.getFileUrl((String) object); + result = (String) object; redisUtil.delete("downloadFilePath:"+name); redisUtil.delete("fileCheck"+name); redisUtil.delete("fileDowning"); @@ -121,6 +121,40 @@ public class DeviceFtpServiceImpl implements DeviceFtpService { return result; } + @Override + public boolean createFile(String nDid, String path) { + boolean result = false; + try { + askDeviceDataFeignClient.createFolder(nDid,path); + Thread.sleep(3000); + String key = "createDir"+ nDid; + Integer value = Integer.parseInt(redisUtil.getObjectByKey(key).toString()); + if (Objects.equals(value,200)) { + result = true; + } + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + return result; + } + + @Override + public boolean deleteFile(String nDid, String path) { + boolean result = false; + try { + askDeviceDataFeignClient.deleteFolder(nDid,path); + Thread.sleep(3000); + String key = "deleteDir"+ nDid; + Integer value = Integer.parseInt(redisUtil.getObjectByKey(key).toString()); + if (Objects.equals(value,200)) { + result = true; + } + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + return result; + } + private void processObject(List result, Object object, String type) { if ("dir".equals(type)) { List projectInfoList = channelObjectUtil.objectToList(object, FileDto.DirInfo.class);