文件下载、上传调整

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

@@ -0,0 +1,91 @@
+package com.njcn.csdevice.controller.equipment;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.enums.AlgorithmResponseEnum;
+import com.njcn.csdevice.service.DeviceFtpService;
+import com.njcn.csharmonic.pojo.vo.MakeUpVo;
+import com.njcn.redis.utils.RedisUtil;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author xy
+ */
+@RestController
+@Slf4j
+@Api(tags = "装置文件管理")
+@AllArgsConstructor
+@RequestMapping("/deviceFile")
+public class DeviceFtpController extends BaseController {
+
+    private final DeviceFtpService deviceFtpService;
+    private final RedisUtil redisUtil;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/askDeviceRootPath")
+    @ApiOperation("设备根目录询问")
+    @ApiImplicitParam(name = "nDid", value = "nDid", required = true)
+    public HttpResult<MakeUpVo> askDeviceRootPath(@RequestParam("nDid") String nDid){
+        String methodDescribe = getMethodDescribe("askDeviceRootPath");
+        MakeUpVo vo = deviceFtpService.askDeviceRootPath(nDid);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
+    }
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/askDeviceFileOrDir")
+    @ApiOperation("设备文件/目录信息询问")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "nDid", value = "nDid", required = true),
+        @ApiImplicitParam(name = "name", value = "文件路径名", required = true),
+        @ApiImplicitParam(name = "type", value = "文件类型", required = true)
+    })
+    public HttpResult<List<MakeUpVo>> askDeviceFileOrDir(@RequestParam("nDid") String nDid, @RequestParam("name") String name, @RequestParam("type") String type){
+        String methodDescribe = getMethodDescribe("askDeviceFileOrDir");
+        List<MakeUpVo> list = deviceFtpService.askDeviceFileOrDir(nDid,name,type);
+        if (CollectionUtil.isEmpty(list) && Objects.equals(type,"file")) {
+            throw new BusinessException(AlgorithmResponseEnum.ASK_DEVICE_DIR_ERROR);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/downloadFile")
+    @ApiOperation("设备文件下载")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "nDid", value = "nDid", required = true),
+            @ApiImplicitParam(name = "name", value = "文件路径名", required = true),
+            @ApiImplicitParam(name = "size", value = "文件大小(单位byte)", required = true),
+            @ApiImplicitParam(name = "fileCheck", value = "文件校验码", required = true)
+    })
+    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 result = deviceFtpService.downloadFile(nDid,name,size,fileCheck);
+        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);
+        }
+    }
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java

@@ -23,7 +23,6 @@ import com.njcn.csdevice.service.IMqttUserService;
 import com.njcn.csdevice.utils.ExcelStyleUtil;
 import com.njcn.poi.excel.ExcelUtil;
 import com.njcn.poi.util.PoiUtil;
-import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.web.advice.DeviceLog;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.*;
@@ -284,4 +283,18 @@ public class EquipmentDeliveryController extends BaseController {
     }
 
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/rebootDevice")
+    @ApiOperation("重启设备")
+    @ApiImplicitParam(name = "nDid", value = "nDid", required = true)
+    public HttpResult<String> rebootDevice(@RequestParam("nDid") String nDid){
+        String methodDescribe = getMethodDescribe("rebootDevice");
+        boolean result = csEquipmentDeliveryService.rebootDevice(nDid);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java

@@ -9,6 +9,7 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.csdevice.param.WlRecordPageParam;
 import com.njcn.csdevice.pojo.param.WlRecordParam;
+import com.njcn.csdevice.pojo.po.WlRecord;
 import com.njcn.csdevice.pojo.vo.RecordTreeVo;
 import com.njcn.csdevice.pojo.vo.RecordVo;
 import com.njcn.csdevice.service.IWlRecordService;
@@ -83,6 +84,20 @@ public class WlRecordController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    /**
+     * 新增原始数据
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
+    @PostMapping("/addBaseData")
+    @ApiOperation("新增原始数据")
+    @ApiImplicitParam(name = "wlRecord", value = "装置原始数据", required = true)
+    public HttpResult<Boolean> addBaseData(@RequestBody @Validated WlRecord wlRecord) {
+        String methodDescribe = getMethodDescribe("addBaseData");
+        LogUtil.njcnDebug(log, "{}，装置原始数据为：{}", methodDescribe, wlRecord);
+        wlRecordService.addBaseData(wlRecord);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
     /**
      * 修改测试项
      */