数据总览修正学科信息

common/src/main/java/com/sdm/common/entity/req/project/GetTaskDetailReq.java

@@ -1,4 +1,4 @@
-package com.sdm.project.model.req;
+package com.sdm.common.entity.req.project;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;

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

@@ -137,7 +137,7 @@ public class FileMetadataInfoResp extends BaseResp implements Serializable  {
     private String tag9;
     private String tag10;
 
-    // 算列信息，前端搞了个框架，无法从第二层对象中获取，只能将索引属性放到这
+    // 算列信息，前端搞了个框架，无法从第二层对象中获取，只能将算列属性放到这
     private Integer type;
 
     private String taskId;

common/src/main/java/com/sdm/common/entity/resp/project/SpdmTaskVo.java

@@ -1,11 +1,9 @@
-package com.sdm.project.model.vo;
+package com.sdm.common.entity.resp.project;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sdm.common.entity.pojo.BaseEntity;
 import com.sdm.common.entity.resp.system.CIDUserResp;
-import com.sdm.project.model.po.TaskNodeExtraPo;
-import com.sdm.project.model.vo.SpdmTaskMemberVo;
 import lombok.Data;
 
 import java.util.List;

common/src/main/java/com/sdm/common/entity/resp/project/TaskNodeExtraPo.java

@@ -1,4 +1,4 @@
-package com.sdm.project.model.po;
+package com.sdm.common.entity.resp.project;
 
 import com.sdm.common.entity.pojo.BaseEntity;
 import lombok.Data;

common/src/main/java/com/sdm/common/feign/impl/project/SimulationTaskFeignClientImpl.java

@@ -2,8 +2,11 @@ package com.sdm.common.feign.impl.project;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.sdm.common.common.SdmResponse;
+import com.sdm.common.entity.req.project.GetTaskDetailReq;
+import com.sdm.common.entity.resp.project.SpdmTaskVo;
 import com.sdm.common.feign.inter.project.ISimulationTaskFeignClient;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -37,4 +40,18 @@ public class SimulationTaskFeignClientImpl implements ISimulationTaskFeignClient
             return SdmResponse.failed("内部调用仿真任务难度系数统计统计失败");
         }
     }
+
+    @Override
+    public SdmResponse<SpdmTaskVo> getTaskDetail(GetTaskDetailReq req) {
+        try {
+            SdmResponse<SpdmTaskVo> response = simulationTaskFeignClient.getTaskDetail(req);
+            if(!response.isSuccess() || ObjectUtils.isEmpty(response.getData())){
+                return SdmResponse.failed("内部调用获取任务详情失败");
+            }
+            return response;
+        } catch (Exception e) {
+            log.error("内部调用获取任务详情失败", e);
+            return SdmResponse.failed("内部调用获取任务详情失败");
+        }
+    }
 }

common/src/main/java/com/sdm/common/feign/inter/project/ISimulationTaskFeignClient.java

@@ -2,9 +2,13 @@ package com.sdm.common.feign.inter.project;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.sdm.common.common.SdmResponse;
+import com.sdm.common.entity.req.project.GetTaskDetailReq;
 import com.sdm.common.entity.req.project.SpdmReportReq;
 import com.sdm.common.entity.req.system.LaunchApproveReq;
+import com.sdm.common.entity.resp.project.SpdmTaskVo;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,4 +33,6 @@ public interface ISimulationTaskFeignClient {
     @GetMapping(value = "/task/getTaskDifficultStatistics")
     SdmResponse<List<JSONObject>> getTaskDifficultStatistics(@RequestParam(value = "nodeType", required = true) String nodeType);
 
+    @PostMapping("/getTaskDetail")
+    SdmResponse<SpdmTaskVo> getTaskDetail(@RequestBody GetTaskDetailReq req);
 }

data/src/main/java/com/sdm/data/service/impl/DimensionTemplateServiceImpl.java

@@ -13,6 +13,7 @@ import com.sdm.common.entity.req.data.DelDirReq;
 import com.sdm.common.entity.req.data.DelFileReq;
 import com.sdm.common.entity.req.data.UploadFilesReq;
 import com.sdm.common.entity.req.project.DelNodeReq;
+import com.sdm.common.entity.req.project.GetTaskDetailReq;
 import com.sdm.common.entity.req.project.SpdmQueryRunInfoListReq;
 import com.sdm.common.entity.req.project.SpdmQueryRunListReq;
 import com.sdm.common.entity.req.system.UserQueryReq;
@@ -20,9 +21,11 @@ import com.sdm.common.entity.resp.AllNodeByProjectIdAndTypeResp;
 import com.sdm.common.entity.resp.PageDataResp;
 import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
 import com.sdm.common.entity.resp.project.SimulationRunResp;
+import com.sdm.common.entity.resp.project.SpdmTaskVo;
 import com.sdm.common.entity.resp.system.CIDUserResp;
 import com.sdm.common.feign.impl.project.SimulationNodeFeignClientImpl;
 import com.sdm.common.feign.impl.system.SysUserFeignClientImpl;
+import com.sdm.common.feign.inter.project.ISimulationTaskFeignClient;
 import com.sdm.common.utils.CidSysUserUtil;
 import com.sdm.common.utils.PageUtils;
 import com.sdm.data.convert.FileMetadataConvert;
@@ -81,6 +84,9 @@ public class DimensionTemplateServiceImpl extends ServiceImpl<DimensionTemplateM
     @Autowired
     private FileMetadataHierarchyHelper hierarchyHelper;
 
+    @Autowired
+    private ISimulationTaskFeignClient simulationTaskFeignClient;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public SdmResponse saveDimensionTemplateWithHierarchies(TemplateCreationRequest request) {
@@ -321,10 +327,28 @@ public class DimensionTemplateServiceImpl extends ServiceImpl<DimensionTemplateM
                         String totalName = objectKey.substring(baseDirPath.length());
                         childDto.setTotalName(totalName);
                     }
+                    if(ObjectUtils.isNotEmpty(childDto.getOwntaskId()) &&
+                            ObjectUtils.isEmpty(childDto.getOwnDisciplineName())){
+                        GetTaskDetailReq getTaskDetailReq = new GetTaskDetailReq();
+                        getTaskDetailReq.setRelatedResourceUuid(childDto.getOwntaskId());
+                        SdmResponse<SpdmTaskVo> taskDetail = simulationTaskFeignClient.getTaskDetail(getTaskDetailReq);
+                        if(taskDetail.isSuccess()){
+                            childDto.setOwnDisciplineName(taskDetail.getData().getDisciplineName());
+                        }
+                    }
                     childDto.setPermissionValue(fileUserPermissionService.getMergedPermission(fileInfo.getId(), ThreadLocalContext.getUserId()));
                     children.add(childDto);
                 }
 
+                if(ObjectUtils.isNotEmpty(dto.getOwntaskId()) &&
+                        ObjectUtils.isEmpty(dto.getOwnDisciplineName())){
+                    GetTaskDetailReq getTaskDetailReq = new GetTaskDetailReq();
+                    getTaskDetailReq.setRelatedResourceUuid(dto.getOwntaskId());
+                    SdmResponse<SpdmTaskVo> taskDetail = simulationTaskFeignClient.getTaskDetail(getTaskDetailReq);
+                    if(taskDetail.isSuccess()){
+                        dto.setOwnDisciplineName(taskDetail.getData().getDisciplineName());
+                    }
+                }
                 dto.setPermissionValue(fileUserPermissionService.getMergedPermission(baseInfo.getId(), ThreadLocalContext.getUserId()));
                 dto.setMergeSameNameChildren(children);
                 dto.setFileIds(children.stream().map(FileMetadataInfoResp::getId).toList());

data/src/main/java/com/sdm/data/service/impl/FileMetadataHierarchyHelper.java

@@ -289,9 +289,6 @@ public class FileMetadataHierarchyHelper {
             } else if (NodeTypeEnum.PHASE.getValue().equals(ownType)) {
                 resp.getClass().getMethod("setPhaseName", String.class).invoke(resp, folder.getOriginalName());
                 resp.getClass().getMethod("setPhaseId", String.class).invoke(resp, folder.getRelatedResourceUuid());
-            } else if (NodeTypeEnum.DISCIPLINE.getValue().equals(ownType)) {
-                resp.getClass().getMethod("setDisciplineName", String.class).invoke(resp, folder.getOriginalName());
-                resp.getClass().getMethod("setDisciplineId", String.class).invoke(resp, folder.getRelatedResourceUuid());
             }
         } catch (Exception e) {
             log.warn("设置SimulationTask层级信息失败", e);
@@ -311,9 +308,6 @@ public class FileMetadataHierarchyHelper {
             } else if (NodeTypeEnum.PHASE.getValue().equals(ownType)) {
                 resp.getClass().getMethod("setOwnPhaseName", String.class).invoke(resp, folder.getOriginalName());
                 resp.getClass().getMethod("setOwnPhaseId", String.class).invoke(resp, folder.getRelatedResourceUuid());
-            } else if (NodeTypeEnum.DISCIPLINE.getValue().equals(ownType)) {
-                resp.getClass().getMethod("setOwnDisciplineName", String.class).invoke(resp, folder.getOriginalName());
-                resp.getClass().getMethod("setOwnDisciplineId", String.class).invoke(resp, folder.getRelatedResourceUuid());
             } else if (NodeTypeEnum.TASK.getValue().equals(ownType)) {
                 resp.getClass().getMethod("setOwntaskName", String.class).invoke(resp, folder.getOriginalName());
                 resp.getClass().getMethod("setOwntaskId", String.class).invoke(resp, folder.getRelatedResourceUuid());
@@ -334,9 +328,6 @@ public class FileMetadataHierarchyHelper {
             } else if (NodeTypeEnum.PHASE.getValue().equals(ownType)) {
                 resp.getClass().getMethod("setOwnPhaseName", String.class).invoke(resp, folder.getOriginalName());
                 resp.getClass().getMethod("setOwnPhaseId", String.class).invoke(resp, folder.getRelatedResourceUuid());
-            } else if (NodeTypeEnum.DISCIPLINE.getValue().equals(ownType)) {
-                resp.getClass().getMethod("setOwnDisciplineName", String.class).invoke(resp, folder.getOriginalName());
-                resp.getClass().getMethod("setOwnDisciplineId", String.class).invoke(resp, folder.getRelatedResourceUuid());
             } else if (NodeTypeEnum.MACHINE.getValue().equals(ownType)) {
                 resp.getClass().getMethod("setOwnMachineName", String.class).invoke(resp, folder.getOriginalName());
                 resp.getClass().getMethod("setOwnMachineId", String.class).invoke(resp, folder.getRelatedResourceUuid());

project/repomix-output.xml

@@ -3128,7 +3128,7 @@ package com.sdm.project.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sdm.common.common.SdmResponse;
 import com.sdm.project.model.entity.SimulationTask;
-import com.sdm.project.model.po.TaskNodeExtraPo;
+import com.sdm.common.entity.resp.project.TaskNodeExtraPo;
 import com.sdm.project.model.req.SpdmAnalysisTaskListReq;
 import com.sdm.project.model.req.*;
 import com.sdm.project.model.vo.*;
@@ -4164,7 +4164,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sdm.common.entity.pojo.BaseEntity;
 import com.sdm.project.model.po.ProjectNodeExtraPo;
-import com.sdm.project.model.po.TaskNodeExtraPo;
+import com.sdm.common.entity.resp.project.TaskNodeExtraPo;
 import com.sdm.project.model.po.TaskNodeMemberPo;
 import lombok.Data;
 
@@ -10821,7 +10821,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sdm.common.entity.pojo.BaseEntity;
 import com.sdm.common.entity.resp.system.CIDUserResp;
-import com.sdm.project.model.po.TaskNodeExtraPo;
+import com.sdm.common.entity.resp.project.TaskNodeExtraPo;
 import lombok.Data;
 
 import java.util.List;
@@ -11586,7 +11586,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sdm.common.entity.pojo.BaseEntity;
 import com.sdm.common.entity.resp.system.CIDUserResp;
-import com.sdm.project.model.po.TaskNodeExtraPo;
+import com.sdm.common.entity.resp.project.TaskNodeExtraPo;
 import com.sdm.project.model.vo.SpdmTaskMemberVo;
 import lombok.Data;
 

project/src/main/java/com/sdm/project/controller/SimulationTaskController.java

@@ -2,6 +2,7 @@ package com.sdm.project.controller;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.sdm.common.common.SdmResponse;
+import com.sdm.common.entity.req.project.GetTaskDetailReq;
 import com.sdm.common.entity.req.task.TaskExportExcelFormat;
 import com.sdm.common.feign.inter.project.ISimulationTaskFeignClient;
 import com.sdm.common.log.annotation.SysLog;
@@ -11,6 +12,7 @@ import com.sdm.project.model.resp.ProjectDifficultStatisticsResp;
 import com.sdm.project.model.resp.TaskCountResp;
 import com.sdm.project.model.resp.TaskWorkDaysResp;
 import com.sdm.project.model.resp.UserWorkloadResp;
+import com.sdm.common.entity.resp.project.SpdmTaskVo;
 import com.sdm.project.service.ISimulationTaskService;
 import com.sdm.project.service.ITaskService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -145,7 +147,7 @@ public class SimulationTaskController implements ISimulationTaskFeignClient {
      */
     @PostMapping("/getTaskDetail")
     @Operation(summary = "获取任务详情", description = "获取任务详情")
-    public SdmResponse getTaskDetail(@RequestBody @Validated GetTaskDetailReq req) {
+    public SdmResponse<SpdmTaskVo> getTaskDetail(@RequestBody @Validated GetTaskDetailReq req) {
         return taskService.getTaskDetail(req);
     }
 

project/src/main/java/com/sdm/project/dao/SimulationProjectMapper.java

@@ -2,6 +2,7 @@ package com.sdm.project.dao;
 
 
 import com.sdm.common.entity.resp.project.SimulationNodeResp;
+import com.sdm.common.entity.resp.project.TaskNodeExtraPo;
 import com.sdm.project.model.bo.*;
 import com.sdm.project.model.po.*;
 import com.sdm.project.model.req.ProjectTreeReq;

project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java

@@ -1,13 +1,12 @@
 package com.sdm.project.dao;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sdm.common.common.SdmResponse;
+import com.sdm.common.entity.resp.project.SpdmTaskVo;
 import com.sdm.project.model.entity.SimulationTask;
-import com.sdm.project.model.po.TaskNodeExtraPo;
+import com.sdm.common.entity.resp.project.TaskNodeExtraPo;
 import com.sdm.project.model.req.SpdmAnalysisTaskListReq;
 import com.sdm.project.model.req.*;
-import com.sdm.project.model.resp.ProjectDifficultStatisticsResp;
 import com.sdm.project.model.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

project/src/main/java/com/sdm/project/model/bo/TaskNode.java

@@ -3,9 +3,7 @@ package com.sdm.project.model.bo;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sdm.common.entity.pojo.BaseEntity;
-import com.sdm.common.entity.resp.system.CIDUserResp;
 import com.sdm.project.model.po.ProjectNodeExtraPo;
-import com.sdm.project.model.po.TaskNodeExtraPo;
 import com.sdm.project.model.po.TaskNodeMemberPo;
 import lombok.Data;
 

project/src/main/java/com/sdm/project/model/po/TaskNodePo.java

@@ -2,7 +2,7 @@ package com.sdm.project.model.po;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.sdm.common.entity.pojo.BaseEntity;
+import com.sdm.common.entity.resp.project.TaskNodeExtraPo;
 import com.sdm.common.entity.resp.system.CIDUserResp;
 import lombok.Data;
 

project/src/main/java/com/sdm/project/model/req/SpdmTaskOprReq.java

@@ -3,7 +3,6 @@ package com.sdm.project.model.req;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sdm.project.model.entity.SimulationTaskExtra;
-import com.sdm.project.model.po.TaskNodeExtraPo;
 import lombok.Data;
 
 import java.util.List;

project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sdm.common.entity.pojo.BaseEntity;
 import com.sdm.common.entity.resp.system.CIDUserResp;
-import com.sdm.project.model.po.TaskNodeExtraPo;
+import com.sdm.common.entity.resp.project.TaskNodeExtraPo;
 import lombok.Data;
 
 import java.util.List;

project/src/main/java/com/sdm/project/service/ITaskService.java

@@ -5,6 +5,7 @@ import com.sdm.common.common.SdmResponse;
 import com.sdm.common.entity.req.export.PerformanceAnalysisExportExcelFormat;
 import com.sdm.common.entity.req.export.RunAnalysisExportExcelFormat;
 import com.sdm.common.entity.req.export.TaskAnalysisExportExcelFormat;
+import com.sdm.common.entity.req.project.GetTaskDetailReq;
 import com.sdm.common.entity.req.task.TaskExportExcelFormat;
 import com.sdm.common.entity.req.task.TaskTreeExportExcelFormat;
 import com.sdm.project.model.bo.ModifyTaskNode;
@@ -12,6 +13,7 @@ import com.sdm.project.model.req.*;
 import com.sdm.project.model.req.YA.SyncCidTaskReq;
 import com.sdm.project.model.resp.*;
 import com.sdm.project.model.resp.YA.BosimSaveProjectTaskRsp;
+import com.sdm.common.entity.resp.project.SpdmTaskVo;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Service;
 
@@ -57,7 +59,7 @@ public interface ITaskService {
 
 //    SdmResponse synchronizeCidTask(SpdmSyncCidTaskReq req);
 
-    SdmResponse getTaskDetail(GetTaskDetailReq req);
+    SdmResponse<SpdmTaskVo> getTaskDetail(GetTaskDetailReq req);
 
     BosimSaveProjectTaskRsp syncCidTask(SyncCidTaskReq req);
 

project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java

@@ -18,11 +18,11 @@ import com.sdm.common.entity.req.system.SendMsgReq;
 import com.sdm.common.entity.req.system.UserQueryReq;
 import com.sdm.common.entity.req.task.DemandExportExcelFormat;
 import com.sdm.common.entity.req.task.DemandExportExcelParam;
+import com.sdm.common.entity.resp.project.SpdmTaskVo;
 import com.sdm.common.entity.resp.system.CIDUserResp;
 import com.sdm.common.feign.impl.data.DataClientFeignClientImpl;
 import com.sdm.common.feign.impl.system.MessageFeignClientImpl;
 import com.sdm.common.feign.impl.system.SysUserFeignClientImpl;
-import com.sdm.common.feign.inter.data.IDataFeignClient;
 import com.sdm.common.service.BaseService;
 import com.sdm.common.utils.RandomUtil;
 import com.sdm.common.utils.excel.ExcelUtil;

project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java

@@ -15,6 +15,7 @@ import com.sdm.common.entity.req.system.UserQueryReq;
 import com.sdm.common.entity.req.task.TaskTreeExportExcelFormat;
 import com.sdm.common.entity.req.task.TaskTreeExportExcelParam;
 import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
+import com.sdm.common.entity.resp.project.TaskNodeExtraPo;
 import com.sdm.common.entity.resp.system.CIDUserResp;
 import com.sdm.common.feign.impl.data.DataClientFeignClientImpl;
 import com.sdm.common.feign.impl.system.MessageFeignClientImpl;

project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java

@@ -13,7 +13,6 @@ import com.sdm.common.config.FlowableConfig;
 import com.sdm.common.entity.constants.NumberConstants;
 import com.sdm.common.entity.enums.ApproveTypeEnum;
 import com.sdm.common.entity.enums.DirTypeEnum;
-import com.sdm.common.entity.enums.FileBizTypeEnum;
 import com.sdm.common.entity.enums.NodeTypeEnum;
 import com.sdm.common.entity.flowable.dto.FlowElementDTO;
 import com.sdm.common.entity.flowable.dto.ProcessDefinitionDTO;
@@ -56,7 +55,7 @@ import com.sdm.project.model.resp.FlowInfoDto;
 import com.sdm.project.model.resp.KeyResultAndTaskInfoResp;
 import com.sdm.project.model.resp.RunVersionInfoResp;
 import com.sdm.project.model.vo.SpdmNodeVo;
-import com.sdm.project.model.vo.SpdmTaskVo;
+import com.sdm.common.entity.resp.project.SpdmTaskVo;
 import com.sdm.project.service.*;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -65,7 +64,6 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;

project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java

@@ -16,7 +16,7 @@ import com.sdm.project.model.entity.SimulationWork;
 import com.sdm.project.model.req.SpdmWorkListReq;
 import com.sdm.project.model.req.SpdmWorkReq;
 import com.sdm.project.model.vo.SpdmTaskMemberVo;
-import com.sdm.project.model.vo.SpdmTaskVo;
+import com.sdm.common.entity.resp.project.SpdmTaskVo;
 import com.sdm.project.service.ISimulationWorkService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java

@@ -17,6 +17,7 @@ import com.sdm.common.entity.req.data.DelDirReq;
 import com.sdm.common.entity.req.data.QueryFileReq;
 import com.sdm.common.entity.req.data.UpdatePermissionReq;
 import com.sdm.common.entity.req.export.*;
+import com.sdm.common.entity.req.project.GetTaskDetailReq;
 import com.sdm.common.entity.req.project.SimulationPerformance;
 import com.sdm.common.entity.req.system.QueryGroupDetailReq;
 import com.sdm.common.entity.req.system.SendMsgReq;
@@ -29,13 +30,14 @@ import com.sdm.common.entity.req.task.TaskTreeExportExcelParam;
 import com.sdm.common.entity.resp.PageDataResp;
 import com.sdm.common.entity.resp.capability.FlowTemplateResp;
 import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
+import com.sdm.common.entity.resp.project.SpdmTaskVo;
+import com.sdm.common.entity.resp.project.TaskNodeExtraPo;
 import com.sdm.common.entity.resp.system.CIDUserResp;
 import com.sdm.common.entity.resp.system.SysUserGroupDetailResp;
 import com.sdm.common.feign.impl.capability.SimulationFlowFeignClientImpl;
 import com.sdm.common.feign.impl.data.DataClientFeignClientImpl;
 import com.sdm.common.feign.impl.system.MessageFeignClientImpl;
 import com.sdm.common.feign.impl.system.SysUserFeignClientImpl;
-import com.sdm.common.utils.RandomUtil;
 import com.sdm.common.utils.SystemOperate;
 import com.sdm.common.utils.excel.ExcelUtil;
 import com.sdm.project.bo.ExportOperate;
@@ -1696,7 +1698,7 @@ public class TaskServiceImpl implements ITaskService {
 //    }
 
     @Override
-    public SdmResponse getTaskDetail(GetTaskDetailReq req) {
+    public SdmResponse<SpdmTaskVo> getTaskDetail(GetTaskDetailReq req) {
         log.info("getTaskDetail参数为：{}", req);
         SpdmTaskVo taskVo = mapper.getTask(req.getRelatedResourceUuid());
         if (ObjectUtils.isEmpty(taskVo)) {

project/src/main/resources/mapper/SimulationProjectMapper.xml

@@ -338,7 +338,7 @@
         SELECT * FROM simulation_node_extra WHERE nodeId=#{projectNodeId}
     </select>
 
-    <select id="queryProjectNodeItemExtraList" resultType="com.sdm.project.model.po.TaskNodeExtraPo">
+    <select id="queryProjectNodeItemExtraList" resultType="com.sdm.common.entity.resp.project.TaskNodeExtraPo">
         SELECT * FROM simulation_task_extra WHERE nodeId=#{projectNodeId}
     </select>
 
@@ -546,7 +546,7 @@
         )
     </select>
 
-    <select id="queryTaskNodeExtrasByNodeIdList" resultType="com.sdm.project.model.po.TaskNodeExtraPo">
+    <select id="queryTaskNodeExtrasByNodeIdList" resultType="com.sdm.common.entity.resp.project.TaskNodeExtraPo">
         select * from simulation_task_extra where task_id in (
         <foreach collection='taskIdList' item='taskId' index='index' separator=','>
             #{taskId}

project/src/main/resources/mapper/SimulationTaskMapper.xml

@@ -50,7 +50,7 @@
 
     <select id="list" resultType="com.sdm.common.common.SdmResponse"></select>
 
-    <select id="getTaskList" resultType="com.sdm.project.model.vo.SpdmTaskVo">
+    <select id="getTaskList" resultType="com.sdm.common.entity.resp.project.SpdmTaskVo">
         select * from simulation_task where tenant_id = #{tenantId}
         <if test="req.demandId != null and req.demandId != ''">
             and demand_id = #{req.demandId}
@@ -172,7 +172,7 @@
         )
     </select>
 
-    <select id="getTaskListByDemandIdList" resultType="com.sdm.project.model.vo.SpdmTaskVo">
+    <select id="getTaskListByDemandIdList" resultType="com.sdm.common.entity.resp.project.SpdmTaskVo">
         select * from simulation_task where demand_id in (
         <foreach collection='demandIdList' item='demandId' index='index' separator=','>
             #{demandId}
@@ -180,7 +180,7 @@
         )
     </select>
 
-    <select id="getTask" resultType="com.sdm.project.model.vo.SpdmTaskVo">
+    <select id="getTask" resultType="com.sdm.common.entity.resp.project.SpdmTaskVo">
         select * from simulation_task where uuid = #{taskId} limit 1;
     </select>
 
@@ -234,7 +234,7 @@
         </if>
     </select>
 
-    <select id="getTaskById" resultType="com.sdm.project.model.vo.SpdmTaskVo">
+    <select id="getTaskById" resultType="com.sdm.common.entity.resp.project.SpdmTaskVo">
         select * from simulation_task where id = #{id}
     </select>
 
@@ -362,7 +362,7 @@
         </where>
     </select>
 
-    <select id="getTaskExtraList" resultType="com.sdm.project.model.po.TaskNodeExtraPo">
+    <select id="getTaskExtraList" resultType="com.sdm.common.entity.resp.project.TaskNodeExtraPo">
         select * from simulation_task_extra where task_id  in
         (
         <foreach collection='taskIdList' item='taskId' index='index' separator=','>
@@ -371,11 +371,11 @@
         )
     </select>
 
-    <select id="getTaskListByDemandId" resultType="com.sdm.project.model.vo.SpdmTaskVo">
+    <select id="getTaskListByDemandId" resultType="com.sdm.common.entity.resp.project.SpdmTaskVo">
         select * from simulation_task where demand_id = #{demandId}
     </select>
 
-    <select id="getTaskListByTag" resultType="com.sdm.project.model.vo.SpdmTaskVo">
+    <select id="getTaskListByTag" resultType="com.sdm.common.entity.resp.project.SpdmTaskVo">
         select * from simulation_task task
         <where>
             task.exe_status is not null
@@ -412,7 +412,7 @@
         </where>
     </select>
 
-    <select id="getTaskListByName" resultType="com.sdm.project.model.vo.SpdmTaskVo">
+    <select id="getTaskListByName" resultType="com.sdm.common.entity.resp.project.SpdmTaskVo">
         select * from simulation_task where task_name in
         (
         <foreach collection='taskNameList' item='taskName' index='index' separator=','>