Merge branch 'main' of http://192.168.65.198:3000/toolchaintechnologycenter/spdm-backend

2025-11-19 17:38:14 +08:00
parent 4c83457b8b 262403210b
commit f8dab615ff
27 changed files with 262 additions and 54 deletions
--- a/common/src/main/java/com/sdm/common/entity/req/data/BaseReq.java
+++ b/common/src/main/java/com/sdm/common/entity/req/data/BaseReq.java
@@ -1,4 +1,4 @@
-package com.sdm.data.model.req;
+package com.sdm.common.entity.req.data;

 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
--- a/common/src/main/java/com/sdm/common/entity/req/data/QueryDirReq.java
+++ b/common/src/main/java/com/sdm/common/entity/req/data/QueryDirReq.java
@@ -1,11 +1,11 @@
-package com.sdm.data.model.req;
+package com.sdm.common.entity.req.data;

 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

@Data
@Schema(description = "查询文件夹内容请求参数")
-public class QueryDirReq extends BaseReq{
+public class QueryDirReq extends BaseReq {
    //	@NotBlank(message = "parentPath不能为空")
    @Schema(description = "父路径")
    private String parentPath;
--- a/common/src/main/java/com/sdm/common/feign/impl/data/DataClientFeignClientImpl.java
+++ b/common/src/main/java/com/sdm/common/feign/impl/data/DataClientFeignClientImpl.java
@@ -1,10 +1,7 @@
 package com.sdm.common.feign.impl.data;

 import com.sdm.common.common.SdmResponse;
-import com.sdm.common.entity.req.data.CreateDirReq;
-import com.sdm.common.entity.req.data.DelDirReq;
-import com.sdm.common.entity.req.data.RenameDirReq;
-import com.sdm.common.entity.req.data.UploadFilesReq;
+import com.sdm.common.entity.req.data.*;
 import com.sdm.common.entity.req.system.LaunchApproveReq;
 import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
 import com.sdm.common.feign.inter.data.IDataFeignClient;
@@ -44,6 +41,19 @@ public class DataClientFeignClientImpl implements IDataFeignClient {
        }
    }

+    @Override
+    public SdmResponse queryDir(QueryDirReq req) {
+        SdmResponse response;
+        try {
+            response = dataClient.queryDir(req);
+            log.info("创建文响应件夹："+ response);
+            return response;
+        } catch (Exception e) {
+            log.error("创建文件夹失败", e);
+            return SdmResponse.failed("创建文件夹失败");
+        }
+    }
+
    @Override
    public SdmResponse renameDirNew(RenameDirReq req) {
        SdmResponse response;
--- a/common/src/main/java/com/sdm/common/feign/inter/data/IDataFeignClient.java
+++ b/common/src/main/java/com/sdm/common/feign/inter/data/IDataFeignClient.java
@@ -1,10 +1,7 @@
 package com.sdm.common.feign.inter.data;

 import com.sdm.common.common.SdmResponse;
-import com.sdm.common.entity.req.data.CreateDirReq;
-import com.sdm.common.entity.req.data.DelDirReq;
-import com.sdm.common.entity.req.data.RenameDirReq;
-import com.sdm.common.entity.req.data.UploadFilesReq;
+import com.sdm.common.entity.req.data.*;
 import com.sdm.common.entity.req.system.LaunchApproveReq;
 import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
 import io.swagger.v3.oas.annotations.Operation;
@@ -27,6 +24,9 @@ public interface IDataFeignClient {
    @PostMapping("/data/createDir")
    SdmResponse createDir(@RequestBody @Validated CreateDirReq req);

+    @PostMapping("/data/queryDir")
+    SdmResponse queryDir(@RequestBody @Validated QueryDirReq req);
+
    @PostMapping("/data/renameDirNew")
     SdmResponse renameDirNew(@RequestBody @Validated RenameDirReq req);

--- a/data/src/main/java/com/sdm/data/controller/DataFileController.java
+++ b/data/src/main/java/com/sdm/data/controller/DataFileController.java
@@ -1,10 +1,7 @@
 package com.sdm.data.controller;

 import com.sdm.common.common.SdmResponse;
-import com.sdm.common.entity.req.data.CreateDirReq;
-import com.sdm.common.entity.req.data.DelDirReq;
-import com.sdm.common.entity.req.data.RenameDirReq;
-import com.sdm.common.entity.req.data.UploadFilesReq;
+import com.sdm.common.entity.req.data.*;
 import com.sdm.common.entity.resp.PageDataResp;
 import com.sdm.data.model.req.RenameFileReq;
 import com.sdm.common.entity.req.system.LaunchApproveReq;
--- a/data/src/main/java/com/sdm/data/controller/ModelTraningController.java
+++ b/data/src/main/java/com/sdm/data/controller/ModelTraningController.java
@@ -1,6 +1,7 @@
 package com.sdm.data.controller;

 import com.sdm.common.common.SdmResponse;
+import com.sdm.common.entity.req.data.BaseReq;
 import com.sdm.data.model.req.*;
 import com.sdm.data.service.IModelService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -9,8 +10,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

-import java.io.IOException;
-
 /**
 * 模型训练控制器
 */
--- a/data/src/main/java/com/sdm/data/model/req/FileSearchReq.java
+++ b/data/src/main/java/com/sdm/data/model/req/FileSearchReq.java
@@ -1,6 +1,6 @@
 package com.sdm.data.model.req;

-import com.sdm.common.entity.enums.FileBizTypeEnum;
+import com.sdm.common.entity.req.data.BaseReq;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

--- a/data/src/main/java/com/sdm/data/model/req/GetSimulationTaskFileReq.java
+++ b/data/src/main/java/com/sdm/data/model/req/GetSimulationTaskFileReq.java
@@ -2,6 +2,7 @@ package com.sdm.data.model.req;

 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sdm.common.entity.enums.FileBizTypeEnum;
+import com.sdm.common.entity.req.data.BaseReq;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

--- a/data/src/main/java/com/sdm/data/model/req/ListSimulationNodeTreeReq.java
+++ b/data/src/main/java/com/sdm/data/model/req/ListSimulationNodeTreeReq.java
@@ -1,5 +1,6 @@
 package com.sdm.data.model.req;

+import com.sdm.common.entity.req.data.BaseReq;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
--- a/data/src/main/java/com/sdm/data/model/req/ListUserQuotaReq.java
+++ b/data/src/main/java/com/sdm/data/model/req/ListUserQuotaReq.java
@@ -1,8 +1,9 @@
 package com.sdm.data.model.req;

+import com.sdm.common.entity.req.data.BaseReq;
 import lombok.Data;

@Data
-public class ListUserQuotaReq extends BaseReq{
+public class ListUserQuotaReq extends BaseReq {
    private String userName;
 }
--- a/data/src/main/java/com/sdm/data/model/req/QueryBigFileReq.java
+++ b/data/src/main/java/com/sdm/data/model/req/QueryBigFileReq.java
@@ -1,12 +1,13 @@
 package com.sdm.data.model.req;

+import com.sdm.common.entity.req.data.BaseReq;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 import java.time.LocalDateTime;

@Data
-public class QueryBigFileReq extends BaseReq{
+public class QueryBigFileReq extends BaseReq {
    /**
     * 目录ID或项目节点id
     */
--- a/data/src/main/java/com/sdm/data/model/req/QueryPermissionReq.java
+++ b/data/src/main/java/com/sdm/data/model/req/QueryPermissionReq.java
@@ -1,11 +1,12 @@
 package com.sdm.data.model.req;

+import com.sdm.common.entity.req.data.BaseReq;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

@Data
@Schema(description = "查询权限请求参数")
-public class QueryPermissionReq extends BaseReq{
+public class QueryPermissionReq extends BaseReq {

    //	@NotBlank(message = "parentPath不能为空")
    @Schema(description = "父路径")
--- a/data/src/main/java/com/sdm/data/model/req/QueryUserFilePermissionReq.java
+++ b/data/src/main/java/com/sdm/data/model/req/QueryUserFilePermissionReq.java
@@ -1,12 +1,13 @@
 package com.sdm.data.model.req;

+import com.sdm.common.entity.req.data.BaseReq;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;

@Data
@Schema(description = "查询用户文件权限请求参数")
-public class QueryUserFilePermissionReq  extends  BaseReq{
+public class QueryUserFilePermissionReq  extends BaseReq {

    //	@NotBlank(message = "parentPath不能为空")
    @Schema(description = "父路径")
--- a/data/src/main/java/com/sdm/data/service/DataStorageAnalysis.java
+++ b/data/src/main/java/com/sdm/data/service/DataStorageAnalysis.java
@@ -43,4 +43,6 @@ public interface DataStorageAnalysis {

    SdmResponse batchUpdateUserQuota(List<AddUserQuotaEntity> addUserQuota);

+    List<Long> getListBigFileId(QueryBigFileReq queryBigFileReq);
+
 }
--- a/data/src/main/java/com/sdm/data/service/IDataFileService.java
+++ b/data/src/main/java/com/sdm/data/service/IDataFileService.java
@@ -1,10 +1,7 @@
 package com.sdm.data.service;

 import com.sdm.common.common.SdmResponse;
-import com.sdm.common.entity.req.data.CreateDirReq;
-import com.sdm.common.entity.req.data.DelDirReq;
-import com.sdm.common.entity.req.data.RenameDirReq;
-import com.sdm.common.entity.req.data.UploadFilesReq;
+import com.sdm.common.entity.req.data.*;
 import com.sdm.common.entity.resp.PageDataResp;
 import com.sdm.data.model.entity.FileMetadataInfo;
 import com.sdm.data.model.req.RenameFileReq;
@@ -12,11 +9,8 @@ import com.sdm.common.entity.req.system.LaunchApproveReq;
 import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
 import com.sdm.data.model.req.*;
 import com.sdm.data.model.resp.KKFileViewURLFromMinioResp;
-import io.swagger.v3.oas.annotations.Operation;
 import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.multipart.MultipartFile;

 import java.io.File;
--- a/data/src/main/java/com/sdm/data/service/IModelService.java
+++ b/data/src/main/java/com/sdm/data/service/IModelService.java
@@ -1,6 +1,7 @@
 package com.sdm.data.service;

 import com.sdm.common.common.SdmResponse;
+import com.sdm.common.entity.req.data.BaseReq;
 import com.sdm.data.model.req.*;

 /**
--- a/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java
+++ b/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java
@@ -10,9 +10,9 @@ import com.sdm.common.entity.req.system.UserQueryReq;
 import com.sdm.common.entity.resp.AllNodeByProjectIdAndTypeResp;
 import com.sdm.common.entity.resp.PageDataResp;
 import com.sdm.common.entity.resp.system.CIDUserResp;
-import com.sdm.common.utils.FileSizeUtils;
 import com.sdm.common.feign.impl.project.SimulationNodeFeignClientImpl;
 import com.sdm.common.feign.impl.system.SysUserFeignClientImpl;
+import com.sdm.common.utils.FileSizeUtils;
 import com.sdm.common.utils.PageUtils;
 import com.sdm.data.model.dto.NodeSizeDTO;
 import com.sdm.data.model.dto.UserTotalFileSizeDTO;
@@ -272,4 +272,31 @@ public class DataStorageAnalysisImpl implements DataStorageAnalysis {
        fileStorageQuotaService.saveBatch(fileStorageQuotas);
        return SdmResponse.success();
    }
+
+    /*
+    * 根据条件查询文件存储表的文件id
+    * */
+    @Override
+    public List<Long> getListBigFileId(QueryBigFileReq queryBigFileReq) {
+        // 将前端传入的 fileSize 和 fileSizeUnit 转换为字节(B)
+        Long fileSizeInBytes = null;
+        if (queryBigFileReq.getFileSize() != null && queryBigFileReq.getFileSizeUnit() != null) {
+            fileSizeInBytes = convertToBytes(queryBigFileReq.getFileSize(), queryBigFileReq.getFileSizeUnit());
+        }
+        List<Long> fileIds = fileStorageService.lambdaQuery()
+                .select(FileStorage::getFileId)
+                .eq(ObjectUtils.isNotEmpty(queryBigFileReq.getDirId()), FileStorage::getDirId, queryBigFileReq.getDirId())
+                .eq(ObjectUtils.isNotEmpty(queryBigFileReq.getFileSuffix()), FileStorage::getFileSuffix, queryBigFileReq.getFileSuffix())
+                .eq(ObjectUtils.isNotEmpty(queryBigFileReq.getFileBizType()), FileStorage::getFileBizType, queryBigFileReq.getFileBizType())
+                .like(ObjectUtils.isNotEmpty(queryBigFileReq.getFileName()), FileStorage::getFileName, queryBigFileReq.getFileName())
+                .gt(ObjectUtils.isNotEmpty(queryBigFileReq.getStartTime()), FileStorage::getCreateTime, queryBigFileReq.getStartTime())
+                .lt(ObjectUtils.isNotEmpty(queryBigFileReq.getEndTime()), FileStorage::getCreateTime, queryBigFileReq.getEndTime())
+                .gt(ObjectUtils.isNotEmpty(fileSizeInBytes), FileStorage::getFileSize, fileSizeInBytes)
+                .list().stream()
+                .map(FileStorage::getFileId)
+                .collect(Collectors.toList());
+        return fileIds ;
+    }
+
+
 }
--- a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
+++ b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
@@ -9,10 +9,7 @@ import com.sdm.common.common.SdmResponse;
 import com.sdm.common.common.ThreadLocalContext;
 import com.sdm.common.entity.constants.NumberConstants;
 import com.sdm.common.entity.enums.*;
-import com.sdm.common.entity.req.data.CreateDirReq;
-import com.sdm.common.entity.req.data.DelDirReq;
-import com.sdm.common.entity.req.data.RenameDirReq;
-import com.sdm.common.entity.req.data.UploadFilesReq;
+import com.sdm.common.entity.req.data.*;
 import com.sdm.common.entity.req.project.SpdmNodeListReq;
 import com.sdm.common.entity.req.system.LaunchApproveReq;
 import com.sdm.common.entity.req.system.UserListReq;
@@ -638,33 +635,23 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
        }

        BeanUtils.copyProperties(minioFileSearchReq, queryBigFileReq);
-
-        SdmResponse<PageDataResp<List<FileStorage>>> searchResult = dataStorageAnalysis.listBigFile(queryBigFileReq);
-        PageDataResp<List<FileStorage>> pageDataResp = searchResult.getData();
-        List<FileStorage> data = pageDataResp.getData();
-        if(CollectionUtils.isEmpty(data)) {
+        List<Long> fileIdList =dataStorageAnalysis.getListBigFileId(queryBigFileReq);
+        if(CollectionUtils.isEmpty(fileIdList)){
            return SdmResponse.success();
        }
-        List<Long> fileIdList = data.stream().map(FileStorage::getFileId).toList();
-
-
+        PageHelper.startPage(minioFileSearchReq.getCurrent(), minioFileSearchReq.getSize());
        List<FileMetadataInfo> files = fileMetadataInfoService
                .lambdaQuery()
                .in(FileMetadataInfo::getId, fileIdList)
                .eq(FileMetadataInfo::getIsLatest, FileIsLastEnum.YES.getValue())
-                // 这里是知识库文件只展示已经审批通过的文件
+                // 这里是知识库文件：排除新增在审批的文件
                .in(FileMetadataInfo::getApproveType,fileDatdList)
                .list();
        setCreatorNames(files);
        setCidInfos(files);
        setProjectName(files);
        setAnalysisDirectionName(files);
-        PageDataResp<List<FileMetadataInfo>> page = new PageDataResp<>();
-        page.setData(files);
-        page.setTotal(pageDataResp.getTotal());
-        page.setCurrentPage(pageDataResp.getCurrentPage());
-        page.setPageSize(pageDataResp.getPageSize());
-        // 使用分页查询
+        PageInfo<FileMetadataInfo> page = new PageInfo<>(files);
        return SdmResponse.success(page);
    }

--- a/data/src/main/java/com/sdm/data/service/impl/ModelServiceImpl.java
+++ b/data/src/main/java/com/sdm/data/service/impl/ModelServiceImpl.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sdm.common.common.SdmResponse;
+import com.sdm.common.entity.req.data.BaseReq;
 import com.sdm.common.utils.PageUtils;
 import com.sdm.data.model.entity.FileMetadataInfo;
 import com.sdm.data.model.entity.TrainingModel;
--- a/data/src/main/java/com/sdm/data/service/impl/SystemFileIDataFileServiceImpl.java
+++ b/data/src/main/java/com/sdm/data/service/impl/SystemFileIDataFileServiceImpl.java
@@ -12,6 +12,7 @@ import com.sdm.common.entity.pojo.system.SysCompany;
 import com.sdm.common.entity.pojo.system.SysUserInfo;
 import com.sdm.common.entity.req.data.CreateDirReq;
 import com.sdm.common.entity.req.data.DelDirReq;
+import com.sdm.common.entity.req.data.QueryDirReq;
 import com.sdm.common.entity.req.data.UploadFilesReq;
 import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
 import com.sdm.data.model.req.RenameFileReq;
--- a/project/src/main/java/com/sdm/project/controller/SimulationRunController.java
+++ b/project/src/main/java/com/sdm/project/controller/SimulationRunController.java
@@ -1,11 +1,17 @@
 package com.sdm.project.controller;

 import com.sdm.common.common.SdmResponse;
+import com.sdm.common.entity.req.data.CreateDirReq;
+import com.sdm.common.entity.req.data.QueryDirReq;
+import com.sdm.common.entity.req.data.UploadFilesReq;
+import com.sdm.project.model.entity.SimulationRun;
 import com.sdm.project.model.req.ProjectTreeTagReq;
 import com.sdm.project.model.req.SpdmAddTaskRunReq;
+import com.sdm.project.model.req.SpdmTaskRunReq;
 import com.sdm.project.service.ISimulationRunService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

 import javax.annotation.Resource;
+import java.util.List;

@RestController
@RequestMapping(value = "/run")
@@ -43,4 +50,44 @@ public class SimulationRunController {
        return runService.addTaskRun(req);
    }

+    /**
+     * 任务执行 删除算例
+     */
+    @PostMapping("/deleteTaskRun")
+    public SdmResponse deleteTaskRun(@RequestBody SpdmTaskRunReq req) {
+        return runService.deleteTaskRun(req);
+    }
+
+    /**
+     * 查询算例详情
+     */
+    @PostMapping("/queryTaskRun")
+    public SdmResponse<List<SimulationRun>> queryRunInfo(@RequestBody SpdmTaskRunReq req) {
+        return runService.queryTaskRun(req);
+    }
+
+    /**
+     * 创建算例文件夹
+     */
+    @PostMapping(value = "/createRunDir")
+    public SdmResponse createRunDir(@RequestBody CreateDirReq req) {
+        return runService.createRunDir(req);
+    }
+
+    /**
+     * 创建算例文件夹
+     */
+    @PostMapping(value = "/queryRunDir")
+    public SdmResponse queryRunDir(@RequestBody QueryDirReq req) {
+        return runService.queryRunDir(req);
+    }
+
+    /**
+     * 上传算例文件
+     */
+    @PostMapping(value = "/uploadRunFiles", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public SdmResponse uploadRunFiles(UploadFilesReq req) {
+        return runService.uploadRunFiles(req);
+    }
+
 }
--- a/project/src/main/java/com/sdm/project/model/entity/SimulationRun.java
+++ b/project/src/main/java/com/sdm/project/model/entity/SimulationRun.java
@@ -76,7 +76,7 @@ public class SimulationRun implements Serializable {

    @ApiModelProperty(value = "Run对应在文件系统中的路径")
    @TableField("folderId")
-    private String folderId;
+    private Long folderId;

    @ApiModelProperty(value = "计算父版本Id")
    @TableField("parentId")
--- a/project/src/main/java/com/sdm/project/model/req/SpdmTaskRunReq.java
+++ b/project/src/main/java/com/sdm/project/model/req/SpdmTaskRunReq.java
@@ -0,0 +1,21 @@
+package com.sdm.project.model.req;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class SpdmTaskRunReq {
+
+    @Schema(description = "算例名称")
+    private String runName;
+
+    @Schema(description = "算例id")
+    private String runId;
+
+    @Schema(description = "任务uuid")
+    private String taskId;
+
+
+}
--- a/project/src/main/java/com/sdm/project/service/ISimulationRunService.java
+++ b/project/src/main/java/com/sdm/project/service/ISimulationRunService.java
@@ -1,10 +1,14 @@
 package com.sdm.project.service;

 import com.sdm.common.common.SdmResponse;
+import com.sdm.common.entity.req.data.CreateDirReq;
+import com.sdm.common.entity.req.data.QueryDirReq;
+import com.sdm.common.entity.req.data.UploadFilesReq;
 import com.sdm.project.model.entity.SimulationRun;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sdm.project.model.req.ProjectTreeTagReq;
 import com.sdm.project.model.req.SpdmAddTaskRunReq;
+import com.sdm.project.model.req.SpdmTaskRunReq;

 /**
 * <p>
@@ -20,4 +24,14 @@ public interface ISimulationRunService extends IService<SimulationRun> {

    SdmResponse addTaskRun(SpdmAddTaskRunReq req);

+    SdmResponse deleteTaskRun(SpdmTaskRunReq req);
+
+    SdmResponse queryTaskRun(SpdmTaskRunReq req);
+
+    SdmResponse createRunDir(CreateDirReq req);
+
+    SdmResponse queryRunDir(QueryDirReq req);
+
+    SdmResponse uploadRunFiles(UploadFilesReq req);
+
 }
--- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
@@ -1,11 +1,14 @@
 package com.sdm.project.service.impl;

+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sdm.common.common.SdmResponse;
 import com.sdm.common.common.ThreadLocalContext;
 import com.sdm.common.entity.enums.DirTypeEnum;
 import com.sdm.common.entity.enums.NodeTypeEnum;
 import com.sdm.common.entity.req.data.CreateDirReq;
+import com.sdm.common.entity.req.data.QueryDirReq;
+import com.sdm.common.entity.req.data.UploadFilesReq;
 import com.sdm.common.entity.req.system.UserQueryReq;
 import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
 import com.sdm.common.entity.resp.system.CIDUserResp;
@@ -28,6 +31,7 @@ import com.sdm.project.model.po.TaskNodePo;
 import com.sdm.project.model.req.ProjectTreeReq;
 import com.sdm.project.model.req.ProjectTreeTagReq;
 import com.sdm.project.model.req.SpdmAddTaskRunReq;
+import com.sdm.project.model.req.SpdmTaskRunReq;
 import com.sdm.project.service.ISimulationPerformanceService;
 import com.sdm.project.service.ISimulationRunService;
 import com.sdm.project.service.ISimulationTaskMemberService;
@@ -482,7 +486,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
            // 设置算例的文件夹路径 挂在所属任务下面
            SdmResponse<FileMetadataInfoResp> fileMetadataInfoResp = dataFeignClient.queryFileMetadataInfo(simulationTask.getUuid(), NodeTypeEnum.TASK.getValue());
            if (fileMetadataInfoResp.getData() != null) {
-                simulationRun.setFolderId(fileMetadataInfoResp.getData().getObjectKey()  + req.getRunName());
+                simulationRun.setFolderId(fileMetadataInfoResp.getData().getId());
            }
            simulationRun.setUuid(RandomUtil.generateString(32));
            simulationRun.setRunName(req.getRunName());
@@ -540,4 +544,55 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
        }
    }

+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public SdmResponse deleteTaskRun(SpdmTaskRunReq req) {
+        if (this.removeById(req.getRunId())) {
+            return SdmResponse.success();
+        }
+        return SdmResponse.failed("删除算例失败");
+    }
+
+    @Override
+    public SdmResponse<List<SimulationRun>> queryTaskRun(SpdmTaskRunReq req) {
+        LambdaQueryWrapper<SimulationRun> queryWrapper = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotBlank(req.getRunId())) {
+            queryWrapper.eq(SimulationRun::getUuid, req.getRunId());
+        }
+        if (StringUtils.isNotBlank(req.getRunName())) {
+            queryWrapper.eq(SimulationRun::getRunName, req.getRunName());
+        }
+        if (StringUtils.isNotBlank(req.getTaskId())) {
+            queryWrapper.eq(SimulationRun::getTaskId, req.getTaskId());
+        }
+        List<SimulationRun> simulationRunList = this.list(queryWrapper);
+        return SdmResponse.success(simulationRunList);
+    }
+
+    @Override
+    public SdmResponse createRunDir(CreateDirReq req) {
+        CreateDirReq createDirReq = new CreateDirReq();
+        // 获取算例文件夹id
+        SdmResponse<FileMetadataInfoResp> fileMetadataInfoResp = dataFeignClient.queryFileMetadataInfo(req.getUuId(), NodeTypeEnum.RUN.getValue());
+        if (fileMetadataInfoResp.getData() != null) {
+            createDirReq.setParDirId(fileMetadataInfoResp.getData().getId());
+        }
+        createDirReq.setDirName(req.getDirName());
+        createDirReq.setDirType(DirTypeEnum.PROJECT_NODE_DIR.getValue());
+        log.info("创建算例结果时，调用创建文件夹的参数为：{}", createDirReq);
+        SdmResponse response = dataFeignClient.createDir(createDirReq);
+        log.info("创建算例结果时，调用创建文件夹的返回值为：{}", response);
+        return SdmResponse.success(response);
+    }
+
+    @Override
+    public SdmResponse queryRunDir(QueryDirReq req) {
+        return SdmResponse.success(dataFeignClient.queryDir(req));
+    }
+
+    @Override
+    public SdmResponse uploadRunFiles(UploadFilesReq req) {
+        return dataFeignClient.uploadFiles(req);
+    }
+
 }
--- a/task/src/main/java/com/sdm/task/model/entity/SimulationPerformance.java
+++ b/task/src/main/java/com/sdm/task/model/entity/SimulationPerformance.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -34,11 +35,15 @@ public class SimulationPerformance implements Serializable {
    @TableField("uuid")
    private String uuid;

+    @TableField("nodeId")
+    private String nodeId;
+
    @TableField("taskId")
    private String taskId;

-    @TableField("nodeId")
-    private String nodeId;
+    @ApiModelProperty(value = "算列runId")
+    @TableField("runId")
+    private String runId;

    @TableField("performanceName")
    private String performanceName;
@@ -73,6 +78,14 @@ public class SimulationPerformance implements Serializable {
    @TableField("method")
    private String method;

+    @ApiModelProperty(value = "指标完成情况  未完成 不合格 风险可控 未分析 合格")
+    @TableField("completeStatus")
+    private String completeStatus;
+
+    @ApiModelProperty(value = "计算及结果值")
+    @TableField("resultValue")
+    private String resultValue;
+
    @TableField("description")
    private String description;

@@ -88,8 +101,41 @@ public class SimulationPerformance implements Serializable {
    @TableField("createTime")
    private LocalDateTime createTime;

+    @TableField("creator")
+    private Long creator;
+
    @TableField("pid")
    private Integer pid;

+    @TableField("tag1")
+    private String tag1;
+
+    @TableField("tag2")
+    private String tag2;
+
+    @TableField("tag3")
+    private String tag3;
+
+    @TableField("tag4")
+    private String tag4;
+
+    @TableField("tag5")
+    private String tag5;
+
+    @TableField("tag6")
+    private String tag6;
+
+    @TableField("tag7")
+    private String tag7;
+
+    @TableField("tag8")
+    private String tag8;
+
+    @TableField("tag9")
+    private String tag9;
+
+    @TableField("tag10")
+    private String tag10;
+

 }
--- a/task/src/main/java/com/sdm/task/service/impl/SimulationPerformanceServiceImpl.java
+++ b/task/src/main/java/com/sdm/task/service/impl/SimulationPerformanceServiceImpl.java
@@ -38,7 +38,7 @@ public class SimulationPerformanceServiceImpl extends ServiceImpl<SimulationPerf
        if (simulationTask == null) {
            return SdmResponse.failed("未查询到任务");
        }
-        List<SimulationPerformance> list = this.lambdaQuery().eq(SimulationPerformance::getTaskId, simulationTask.getUuid()).list();
+        List<SimulationPerformance> list = this.lambdaQuery().eq(SimulationPerformance::getTaskId, simulationTask.getUuid()).isNull(SimulationPerformance::getRunId).list();
        return SdmResponse.success(list);
    }