文件下载、上传调整

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/WlRecordFeignClient.java

@@ -0,0 +1,24 @@
+package com.njcn.csdevice.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.csdevice.api.fallback.WlRecordClientFallbackFactory;
+import com.njcn.csdevice.pojo.po.WlRecord;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/wlRecord", fallbackFactory = WlRecordClientFallbackFactory.class,contextId = "wlRecord")
+
+public interface WlRecordFeignClient {
+
+    /**
+     * 新增原始数据
+     */
+    @PostMapping("/addBaseData")
+    HttpResult<Boolean> addBaseData(@RequestBody @Validated WlRecord wlRecord);
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/WlRecordClientFallbackFactory.java

@@ -0,0 +1,35 @@
+package com.njcn.csdevice.api.fallback;
+
+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.csdevice.api.WlRecordFeignClient;
+import com.njcn.csdevice.pojo.po.WlRecord;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class WlRecordClientFallbackFactory implements FallbackFactory<WlRecordFeignClient> {
+    @Override
+    public WlRecordFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new WlRecordFeignClient() {
+
+            @Override
+            public HttpResult<Boolean> addBaseData(WlRecord wlRecord) {
+                log.error("{}异常，降级处理，异常为：{}","新增原始数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java

@@ -38,7 +38,13 @@ public enum AlgorithmResponseEnum {
 
     DATA_ARRAY_MISSING("A00515","详细数据为空"),
     UNKNOW_ROLE("A00515","角色无权限操作"),
-    DATA_MISSING("A00516","数据缺失")
+    DATA_MISSING("A00516","数据缺失"),
+    ASK_DEVICE_DIR_ROOT_ERROR("A00516","读取装置根目录异常"),
+    ASK_DEVICE_DIR_ERROR("A00516","读取装置文件异常,请重试"),
+    FILE_DOWNLOAD_ERROR("A00516","下载失败"),
+    FILE_DOWNLOADING("A00516","下载失败,系统正在响应其他下载任务,请稍后重试"),
+    FILE_UPLOADING("A00516","上传失败,系统正在响应其他上传任务,请稍后重试"),
+    FILE_BUSY("A00516","正在进行其他文件操作,请稍后重试"),
     ;
 
 

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/WlRecord.java

@@ -145,4 +145,9 @@ public class WlRecord extends BaseEntity {
     @TableField(value = "`describe`")
     private String describe;
 
+    /**
+     * 工程路径
+     */
+    private String gcDataPath;
+
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsLedgerVO.java

@@ -42,6 +42,9 @@ public class CsLedgerVO implements Serializable {
     @ApiModelProperty(name = "comFlag",value = "设备状态")
     private Integer comFlag;
 
+    @ApiModelProperty(name = "nDid",value = "nDid")
+    private String nDId;
+
     @ApiModelProperty(name = "children",value = "子节点")
     private List<CsLedgerVO> children = new ArrayList<>();
 

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerVO.java

@@ -42,6 +42,16 @@ public class DeviceManagerVO {
     @ApiModelProperty(value = "装置数据标识")
     private String dataLevel;
 
+    @ApiModelProperty(value = "应用程序版本号")
+    private String appVersion;
+
+    @ApiModelProperty(value = "应用程序发布日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime appDate;
+
+    @ApiModelProperty(value = "应用程序校验码")
+    private String appCheck;
+
     @Data
     public static class DataSetVO {
         @ApiModelProperty(value = "数据集Id")