toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据总览修正学科信息

Browse Source
This commit is contained in:
gulongcheng
2026-01-19 17:27:43 +08:00
parent 85ecca8365
commit ce742d0d4b
24 changed files with 84 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
project/repomix-output.xml
View File

@@ -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;

4
project/src/main/java/com/sdm/project/controller/SimulationTaskController.java
View File

@@ -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);
}

1
project/src/main/java/com/sdm/project/dao/SimulationProjectMapper.java
View File

@@ -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;

5
project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java
View File

@@ -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;

2
project/src/main/java/com/sdm/project/model/bo/TaskNode.java
View File

@@ -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;

41
project/src/main/java/com/sdm/project/model/po/TaskNodeExtraPo.java
View File

@@ -1,41 +0,0 @@
package com.sdm.project.model.po;
import com.sdm.common.entity.pojo.BaseEntity;
import lombok.Data;
@Data
public class TaskNodeExtraPo extends BaseEntity {
private String uuid;
/**
* 所属节点id
*/
private String nodeId;
private String taskId;
/**
* 属性名
*/
private String propertyName;
/**
* 属性值
*/
private String propertyValue;
/**
* 值类型
*/
private String valueType;
/**
* 属性
*/
private String propertyClass;
}

2
project/src/main/java/com/sdm/project/model/po/TaskNodePo.java
View File

@@ -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;

12
project/src/main/java/com/sdm/project/model/req/GetTaskDetailReq.java
View File

@@ -1,12 +0,0 @@
package com.sdm.project.model.req;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@Data
public class GetTaskDetailReq {
@NotNull(message = "relatedResourceUuid不能为空")
private String relatedResourceUuid;
}

1
project/src/main/java/com/sdm/project/model/req/SpdmTaskOprReq.java
View File

@@ -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;

2
project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java
View File

@@ -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;

196
project/src/main/java/com/sdm/project/model/vo/SpdmTaskVo.java
View File

@@ -1,196 +0,0 @@
package com.sdm.project.model.vo;
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;
@JsonIgnoreProperties(ignoreUnknown = true)
@Data
public class SpdmTaskVo extends BaseEntity {
/**
* 父节点id，第一级节点的pid为0
*/
private String pid;
private String pUuid;
/**
* 当前节点id
*/
private String uuid;
/**
* 任务名称
*/
private String taskName;
/**
* 当前节点名称（=任务名称）
*/
private String nodeName;
/**
* 当前节点类型
*/
private String nodeType;
/**
* 任务编码
*/
private String taskCode;
private String nodeId;
/**
* 标准工时
*/
private Integer days;
/**
* 实际工时
*/
private Integer realDays;
private String standard;
private String folderId;
private Integer status;
private String achieveStatus;
/**
* 计划开始（精确到秒）
*/
private String beginTime;
/**
* 计划结束（精确到秒）项目详情图片
*/
private String endTime;
/**
* 实际完成时间（精确到秒）
*/
private String finishTime;
/**
* 项目进度状态
*/
private Integer progress;
/**
* 项目进度状态（未开始、进行中、已完成）
*/
private String exeStatus;
private String confidence;
private String analyseTarget;
private String analyseSoftware;
private String approvalStatus;
private String comfirmStatus;
private String description;
/**
* 难度系数
*/
private Float difficult;
private String department;
@JsonProperty(value = "section")
private String sectionName;
@JsonProperty(value = "group")
private String groupName;
@JsonProperty(value = "bCapacity")
private String bCapacity;
private String flowTemplate;
private String englishName;
/**
* 关联的需求id
*/
private String demandId;
/**
* 仿真负责人
*/
@JsonProperty(value = "pMemberList")
private List<CIDUserResp> pMemberList;
/**
* 仿真执行人
*/
@JsonProperty(value = "eMemberList")
private List<CIDUserResp> eMemberList;
/**
* 0：未关注 1：已关注
*/
private Integer attentionFlag;
/**
* 关联cid交付物审批流程id
*/
private String cidFlowId;
private String tag1;
private String tag2;
private String tag3;
private String tag4;
private String tag5;
private String tag6;
private String tag7;
private String tag8;
private String tag9;
private String tag10;
private List<TaskNodeExtraPo> extras;
/**
* 关联的需求名称
*/
private String demandName;
/**
* 3D图片文件id
*/
private Long imageFileId;
/**
* 军令状时间
*/
private String commitmentDeadline;
private String newTag1;
private String newTag2;
private String newTag3;
private String newTag4;
private String newTag5;
private String newTag6;
private String newTag7;
private String newTag8;
private String newTag9;
private String newTag10;
private Integer expStatus;
private String discipline;
private String projectName;
private String phaseName;
private String disciplineName;
private String pMembers;
}

4
project/src/main/java/com/sdm/project/service/ITaskService.java
View File

@@ -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);

2
project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java
View File

@@ -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;

1
project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
View File

@@ -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;

4
project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
View File

@@ -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;

2
project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java
View File

@@ -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;

6
project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
View File

@@ -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)) {

4
project/src/main/resources/mapper/SimulationProjectMapper.xml
View File

@@ -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}

16
project/src/main/resources/mapper/SimulationTaskMapper.xml
View File

@@ -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=','>