数据总览 数据检索报错 优化

数据总览、数据查询、数据存储 全量展示文件所属项目节点信息

common/src/main/java/com/sdm/common/entity/resp/BaseResp.java

@@ -0,0 +1,54 @@
+package com.sdm.common.entity.resp;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BaseResp {
+
+    //格式化后的文件大小
+    @Schema(description = "格式化后的文件大小")
+    private String formatFileSize;
+
+    @Schema(description = "所属项目")
+    String ownProjectName;
+
+    @Schema(description = "所属项目id")
+    private String ownProjectId;
+
+    @Schema(description = "所属阶段")
+    String ownPhaseName;
+
+    @Schema(description = "所属阶段id")
+    private String ownPhaseId;
+
+    @Schema(description = "所属学科")
+    String ownDisciplineName;
+
+    @Schema(description = "所属学科id")
+    private String ownDisciplineId;
+
+    @Schema(description = "所属机器")
+    private String ownMachineName;
+
+    @Schema(description = "所属机器id")
+    private String ownMachineId;
+
+    @Schema(description = "所属工作空间")
+    private String ownWorkspaceName;
+
+    @Schema(description = "所属工作空间id")
+    private String ownWorkspaceId;
+
+    @Schema(description = "所属工况任务")
+    String owntaskName;
+
+    @Schema(description = "所属工况任务id")
+    private String owntaskId;
+
+    @Schema(description = "所属算列")
+    String ownRunName;
+
+    @Schema(description = "所属算列id")
+    private String ownRunId;
+}

common/src/main/java/com/sdm/common/entity/resp/data/FileMetadataInfoResp.java

@@ -3,6 +3,7 @@ package com.sdm.common.entity.resp.data;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.sdm.common.entity.resp.BaseResp;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -16,7 +17,7 @@ import java.util.List;
 @Data
 @Schema(name = "FileMetadataDTO", description = "文件元数据传输对象")
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class FileMetadataInfoResp implements Serializable {
+public class FileMetadataInfoResp extends BaseResp implements Serializable  {
 
     private static final long serialVersionUID = 1L;
 

common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java

@@ -1,6 +1,7 @@
 package com.sdm.common.entity.resp.data;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sdm.common.entity.resp.BaseResp;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -11,7 +12,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @Schema(description = "任务结果曲线响应对象")
-public class SimulationTaskResultCurveResp {
+public class SimulationTaskResultCurveResp extends BaseResp {
     @Schema(description = "文件id")
     private Long id;
 
@@ -34,26 +35,4 @@ public class SimulationTaskResultCurveResp {
     @Schema(description = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
-
-    //格式化后的文件大小
-    @Schema(description = "格式化后的文件大小")
-    private String formatFileSize;
-
-    @Schema(description = "所属项目")
-    private String projectName;
-
-    @Schema(description = "所属项目id")
-    private String projectId;
-
-    @Schema(description = "所属阶段")
-    private String phaseName;
-
-    @Schema(description = "所属阶段id")
-    private String phaseId;
-
-    @Schema(description = "所属学科")
-    private String disciplineName;
-
-    @Schema(description = "所属学科id")
-    private String disciplineId;
 }