修改company/jobNumber

This commit is contained in:
2025-11-07 09:08:53 +08:00
parent 28d08e2114
commit fcc5116ade
30 changed files with 215 additions and 218 deletions

View File

@@ -10,13 +10,13 @@ import java.util.List;
@Mapper
public interface SimulationDemandMapper {
int addDemand(@Param("req") SpdmAddDemandReq req,@Param("tenantId") String tenantId,@Param("jobNumber") String jobNumber);
int addDemand(@Param("req") SpdmAddDemandReq req,@Param("tenantId") Long tenantId,@Param("jobNumber") Long jobNumber);
int addDemandMember(@Param("memberList") List<SpdmDemandRelateMemberReq> memberList);
int addDemandExtra(@Param("demandExtraList") List<SpdmDemandExtraReq> demandExtraList);
int editDemand(@Param("req") SpdmEditDemandReq req, @Param("jobNumber") String jobNumber);
int editDemand(@Param("req") SpdmEditDemandReq req, @Param("jobNumber") Long jobNumber);
void deleteDemandMember(@Param("demandIdList") List<String> demandIdList);
@@ -24,13 +24,13 @@ public interface SimulationDemandMapper {
void deleteDemand(@Param("deleteNodeIdList") List<String> deleteNodeIdList);
List<SpdmDemandVo> getDemandList(@Param("tenantId") String tenantId,@Param("req") SpdmDemandListReq req);
List<SpdmDemandVo> getDemandList(@Param("tenantId") Long tenantId,@Param("req") SpdmDemandListReq req);
List<SpdmDemandMemberVo> getMemberList(@Param("demandIdList") List<String> demandIdList, @Param("memberType") Integer memberType);
// List<SpdmUserVo> getUserList(@Param("userIdList") List<Long> userIdList);
SpdmUserVo getUserByJobNumber(@Param("jobNumber") String jobNumber);
SpdmUserVo getUserByJobNumber(@Param("jobNumber") Long jobNumber);
SpdmDemandVo getDemandByName(@Param("tenantId") String tenantId,@Param("demandName") String demandName);
SpdmDemandVo getDemandByName(@Param("tenantId") Long tenantId,@Param("demandName") String demandName);
}

View File

@@ -36,10 +36,10 @@ public interface SimulationNodeMapper extends BaseMapper<SimulationNode> {
List<SpdmNodeVo> getNodeList(@Param("nodeType") String nodeType, @Param("nodeSubType") String nodeSubType, @Param("progressStatus") Integer progressStatus, @Param("nodeCode") String nodeCode,
@Param("manager") String manager, @Param("nodeName") String nodeName, @Param("tenantId") String tenantId, @Param("pos") int pos, @Param("limit") int limit);
@Param("manager") String manager, @Param("nodeName") String nodeName, @Param("tenantId") Long tenantId, @Param("pos") int pos, @Param("limit") int limit);
int getNodeListCount(@Param("nodeType") String nodeType, @Param("nodeSubType") String nodeSubType, @Param("progressStatus") Integer progressStatus, @Param("nodeCode") String nodeCode,
@Param("manager") String manager, @Param("nodeName") String nodeName, @Param("tenantId") String tenantId);
@Param("manager") String manager, @Param("nodeName") String nodeName, @Param("tenantId") Long tenantId);
List<SpdmNodeExtraVo> getNodeExtraListByNodeIdList(@Param("nodeIdList") List<String> nodeIdList);

View File

@@ -17,7 +17,7 @@ public interface SimulationTaskMapper extends BaseMapper<SimulationTask> {
SdmResponse list(SpdmTaskListReq req);
List<SpdmTaskVo> getTaskList(@Param("tenantId") String tenantId, @Param("req") SpdmTaskListReq req);
List<SpdmTaskVo> getTaskList(@Param("tenantId") Long tenantId, @Param("req") SpdmTaskListReq req);
List<SpdmTaskMemberVo> getMemberList(@Param("taskIdList") List<String> taskIdList, @Param("memberType") Integer memberType);
@@ -27,7 +27,7 @@ public interface SimulationTaskMapper extends BaseMapper<SimulationTask> {
SpdmTaskVo getTask(@Param("taskId") String taskId);
List<SpdmAnalysisTaskVo> taskList(@Param("req") SpdmAnalysisTaskListReq req, @Param("tenantId") String tenantId, @Param("allNodeIdList") List<String> allNodeIdList, @Param("pos") int pos, @Param("limit") int limit);
List<SpdmAnalysisTaskVo> taskList(@Param("req") SpdmAnalysisTaskListReq req, @Param("tenantId") Long tenantId, @Param("allNodeIdList") List<String> allNodeIdList, @Param("pos") int pos, @Param("limit") int limit);
void deleteAttentionByUserIdList(@Param("taskId") String taskId,@Param("userIdList") List<Long> userIdList);

View File

@@ -1,5 +1,6 @@
package com.sdm.project.model.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.sdm.common.entity.pojo.BaseEntity;
@@ -162,7 +163,7 @@ public class ProjectNode extends BaseEntity {
private String nodeVersion;
private String tenantId;
// private String tenantId;

View File

@@ -165,7 +165,7 @@ public class TaskNode extends BaseEntity {
private String nodeVersion;
private String tenantId;
private Long tenantId;
private List<TaskExtraNode> taskExtraNodeList;

View File

@@ -185,7 +185,7 @@ public class NodeAllBase extends BaseEntity {
public String nodeVersion;
public String tenantId;
public Long tenantId;
public String members;

View File

@@ -91,7 +91,7 @@ public class SpdmNodeDetailReq extends BaseEntity {
*/
private List<SpdmNodeExtraReq> extraList;
private String tenantId;
private Long tenantId;
private String standard;
private String analyseTarget;

View File

@@ -95,7 +95,7 @@ public class TaskEditNodeReq extends BaseEntity {
*/
private List<SpdmNodeExtraReq> nodeExtraList;
private String tenantId;
private Long tenantId;
private String nodeId;

View File

@@ -66,8 +66,8 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
@Transactional
@Override
public SdmResponse addDemand(SpdmAddDemandReq req) {
String tenantId = ThreadLocalContext.getCompany();
String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
Long tenantId = ThreadLocalContext.getTenantId();
Long jobNumber = ThreadLocalContext.getUserId();
log.info("新增需求时当前租户id为{},工号为:{}", tenantId, jobNumber);
// 获取仿真负责人
String pMemberList = req.getPMemberList();
@@ -149,8 +149,8 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
@Transactional
@Override
public SdmResponse editDemand(SpdmEditDemandReq req) {
String tenantId = ThreadLocalContext.getCompany();
String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
Long tenantId = ThreadLocalContext.getTenantId();
Long jobNumber = ThreadLocalContext.getUserId();
log.info("修改需求时当前租户id为{},工号为:{}", tenantId, jobNumber);
// 获取仿真负责人
String pMemberList = req.getPMemberList();
@@ -229,9 +229,9 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
@Override
public SdmResponse list(SpdmDemandListReq req) {
String tenantId = ThreadLocalContext.getCompany();
String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
if (StringUtils.isBlank(tenantId) || StringUtils.isBlank(jobNumber)) {
Long tenantId = ThreadLocalContext.getTenantId();
Long jobNumber = ThreadLocalContext.getUserId();
if (ObjectUtils.isEmpty(tenantId) || ObjectUtils.isEmpty(jobNumber)) {
log.error("公司和工号都不能为空");
return SdmResponse.failed("公司和工号都不能为空");
}
@@ -442,7 +442,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
@Override
public SdmResponse issueTask(SpdmTaskIssue req) {
log.info("issueTask参数为{}", req);
String tenantId = ThreadLocalContext.getCompany();
Long tenantId = ThreadLocalContext.getTenantId();
List<TaskNode> taskNodeList = req.getAddNodeList();
if (CollectionUtils.isEmpty(taskNodeList)) {
return SdmResponse.success(new ArrayList<>());
@@ -516,7 +516,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
}
}
String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
Long jobNumber = ThreadLocalContext.getUserId();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String createTime = format.format(new Date());
SdmResponse response = SdmResponse.success();

View File

@@ -84,8 +84,8 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
@Transactional
@Override
public SdmResponse add(SpdmAddNodeReq req) {
String tenantId = ThreadLocalContext.getCompany();
String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
Long tenantId = ThreadLocalContext.getTenantId();
Long jobNumber = ThreadLocalContext.getUserId();
log.info("当前租户id为{},工号为:{}", tenantId, jobNumber);
// 增
List<SpdmProjectNodeEditReq> addNodeList = req.getAddNodeList();
@@ -105,8 +105,8 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
@Transactional
@Override
public SdmResponse edit(SpdmEditNodeReq req) {
String tenantId = ThreadLocalContext.getCompany();
String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
Long tenantId = ThreadLocalContext.getTenantId();
Long jobNumber = ThreadLocalContext.getUserId();
log.info("当前租户id为{},jobNumber{}", tenantId, jobNumber);
// 改
List<SpdmNodeDetailReq> editNodeList = req.getEditNodeList();
@@ -124,7 +124,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
@Override
public SdmResponse delete(SpdmDeleteNodeReq req) {
log.info("node delete参数{}", req);
String tenantId = ThreadLocalContext.getCompany();
Long tenantId = ThreadLocalContext.getTenantId();
log.info("当前租户id为{}", tenantId);
// 删
List<String> deleteNodeIdList = req.getDeleteNodeIdList();
@@ -178,14 +178,14 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
int pos = (req.getCurrent() - 1) * req.getSize();
int limit = req.getSize();
List<SpdmNodeVo> nodeList = nodeMapper.getNodeList(req.getNodeType(), req.getNodeSubType(), req.getProgressStatus(), req.getNodeCode(), req.getManager(), req.getNodeName(),
ThreadLocalContext.getCompany(), pos, limit);
ThreadLocalContext.getTenantId(), pos, limit);
if (CollectionUtils.isEmpty(nodeList)) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("data", nodeList);
jsonObject.put("total", 0);
return SdmResponse.success(jsonObject);
}
int total = nodeMapper.getNodeListCount(req.getNodeType(), req.getNodeSubType(), req.getProgressStatus(), req.getNodeCode(), req.getManager(), req.getNodeName(), ThreadLocalContext.getCompany());
int total = nodeMapper.getNodeListCount(req.getNodeType(), req.getNodeSubType(), req.getProgressStatus(), req.getNodeCode(), req.getManager(), req.getNodeName(), ThreadLocalContext.getTenantId());
log.info("总数为:{}", total);
Integer progressStatus;
Integer achieveStatus;
@@ -283,7 +283,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
}
private List<SpdmProjectNodeEditReq> addNode(List<SpdmProjectNodeEditReq> addNodeList, List<TaskNodeTag> tagMap, String tenantId, String jobNumber) {
private List<SpdmProjectNodeEditReq> addNode(List<SpdmProjectNodeEditReq> addNodeList, List<TaskNodeTag> tagMap, Long tenantId, Long jobNumber) {
log.info("addNode参数为{}", addNodeList);
String curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String nodeManagerList;
@@ -380,7 +380,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
return addNodeList;
}
private boolean editNode(List<SpdmNodeDetailReq> editNodeList, String tenantId, String jobNumber) {
private boolean editNode(List<SpdmNodeDetailReq> editNodeList, Long tenantId, Long jobNumber) {
log.info("editNode参数为{}", editNodeList);
String curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String nodeManagerList;
@@ -515,9 +515,9 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
}
}
// 创建人要返回对象
String creator = projectNode.getCreator();
if (StringUtils.isNotBlank(creator)) {
SdmResponse<CIDUserResp> cidUserRespSdmResponse = sysUserFeignClient.queryUserDetail(UserQueryReq.builder().userId(Long.valueOf(creator)).build());
Long creator = projectNode.getCreator();
if (ObjectUtils.isNotEmpty(creator)) {
SdmResponse<CIDUserResp> cidUserRespSdmResponse = sysUserFeignClient.queryUserDetail(UserQueryReq.builder().userId(creator).build());
if (cidUserRespSdmResponse.isSuccess()) {
projectNode.setCreatorObj(cidUserRespSdmResponse.getData());
}

View File

@@ -79,7 +79,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
@Override
@Transactional
public SdmResponse add(JSONObject jsonObject) {
String tenantId = ThreadLocalContext.getCompany();
Long tenantId = ThreadLocalContext.getTenantId();
TaskNodeTree taskNodeTree = parseTaskTree(jsonObject);
HashMap<String, List<String>> idMap = new HashMap<>();
HashMap<String, List<String>> taskIdMap = new HashMap<>();
@@ -94,8 +94,8 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
@Override
public SdmResponse edit(List<TaskEditNodeReq> taskEditNodeReqList) {
String tenantId = ThreadLocalContext.getCompany();
String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
Long tenantId = ThreadLocalContext.getTenantId();
Long jobNumber = ThreadLocalContext.getUserId();
String nodeType;
Map<String, List<TaskEditNodeReq>> editNodeListMap = taskEditNodeReqList.stream().collect(Collectors.groupingBy(TaskEditNodeReq::getNodeType));
String updateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
@@ -128,7 +128,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
return SdmResponse.success();
}
private boolean editNode(List<SpdmNodeDetailReq> editNodeList, String tenantId, String jobNumber) {
private boolean editNode(List<SpdmNodeDetailReq> editNodeList, Long tenantId, Long jobNumber) {
log.info("editNode参数为{}", editNodeList);
String curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
List<SpdmNodeExtraReq> extraList;
@@ -612,7 +612,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
List<TaskEditNodeReq> editNodeList = req.getEditNodeList();
List<SpdmDeleteProjectDetailReq> deleteNodeList = req.getDeleteNodeList();
if (CollectionUtils.isNotEmpty(addNodeList)) {
String tenantId = ThreadLocalContext.getCompany();
Long tenantId = ThreadLocalContext.getTenantId();
TaskNodeTree taskNodeTree = newParseTaskTree(JSONArray.parseArray(JSONArray.toJSONString(addNodeList)));
HashMap<String, List<String>> idMap = new HashMap<>();
HashMap<String, List<String>> taskIdMap = new HashMap<>();
@@ -1272,8 +1272,8 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}
private SdmResponse newRealAddSimulationTaskItems(TaskNodeTree taskNodeTree, String tenantId, List<TaskNodeTag> tagList) {
String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
private SdmResponse newRealAddSimulationTaskItems(TaskNodeTree taskNodeTree, Long tenantId, List<TaskNodeTag> tagList) {
Long jobNumber = ThreadLocalContext.getUserId();
SdmResponse response = SdmResponse.success();
if (CollectionUtils.isEmpty(taskNodeTree.getNodeList())) {
response = SdmResponse.failed("节点不能为空");
@@ -1466,8 +1466,8 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
return response;
}
private SdmResponse realAddSimulationTaskItems(TaskNodeTree taskNodeTree, String parentId, String tenantId,HashMap<String, List<String>> idMap,HashMap<String, List<String>> taskIdMap) {
String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
private SdmResponse realAddSimulationTaskItems(TaskNodeTree taskNodeTree, String parentId, Long tenantId,HashMap<String, List<String>> idMap,HashMap<String, List<String>> taskIdMap) {
Long jobNumber = ThreadLocalContext.getUserId();
SdmResponse response = SdmResponse.success();
if (CollectionUtils.isEmpty(taskNodeTree.getNodeList())) {
response = SdmResponse.failed("节点不能为空");
@@ -1664,7 +1664,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
// log.info("调用创建文件夹的返回值为:{}", response);
}
private void traverseTaskNode(String parentId, String tenantId, String nodeVersion, TaskNode eachProjectNode, List<TaskNode> projectNodeList, List<TaskMemberNode> projectNodeMemberList, List<TaskExtraNode> projectNodeExtraList, List<TaskNode> taskNodeList, List<TaskMemberNode> taskNodeMemberList, List<TaskExtraNode> taskNodeExtraList, List<TaskNode> taskPerformanceList, List<TaskExtraNode> performanceExtraList, List<TaskNodeTag> tagList,HashMap<String, List<String>> idMap,HashMap<String, List<String>> taskIdMap) {
private void traverseTaskNode(String parentId, Long tenantId, String nodeVersion, TaskNode eachProjectNode, List<TaskNode> projectNodeList, List<TaskMemberNode> projectNodeMemberList, List<TaskExtraNode> projectNodeExtraList, List<TaskNode> taskNodeList, List<TaskMemberNode> taskNodeMemberList, List<TaskExtraNode> taskNodeExtraList, List<TaskNode> taskPerformanceList, List<TaskExtraNode> performanceExtraList, List<TaskNodeTag> tagList,HashMap<String, List<String>> idMap,HashMap<String, List<String>> taskIdMap) {
// if (!bStringNotBlank(projectNode.getUuid())) {//兼容在已有节点下添加分析项情况
// projectNode.setUuid(generateUuid());
// }
@@ -2027,7 +2027,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
@Override
public SdmResponse taskHandle(String taskId, Integer handleType) {
String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
Long jobNumber = ThreadLocalContext.getUserId();
List<TaskNodePo> taskNodePoList = mapper.getTaskListByNodeIdList(Collections.singletonList(taskId));
if (CollectionUtils.isEmpty(taskNodePoList)) {
log.error("根据taskId{},未查询到任务", taskId);
@@ -2053,7 +2053,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
List<TaskEditNodeReq> editNodeList = req.getEditNodeList();
List<SpdmDeleteProjectDetailReq> deleteNodeList = req.getDeleteNodeList();
if (CollectionUtils.isNotEmpty(addNodeList)) {
String tenantId = ThreadLocalContext.getCompany();
Long tenantId = ThreadLocalContext.getTenantId();
TaskNodeTree taskNodeTree = newParseTaskTree(JSONArray.parseArray(JSONArray.toJSONString(addNodeList)));
tagMap = req.getTagMap();
SdmResponse response = newRealAddSimulationTaskItems(taskNodeTree, tenantId, req.getTagMap());

View File

@@ -85,10 +85,9 @@ public class TaskServiceImpl implements ITaskService {
@Override
public SdmResponse list(SpdmTaskListReq req) {
String tenantId = ThreadLocalContext.getCompany();
// String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
Long tenantId = ThreadLocalContext.getTenantId();
Long userId = ThreadLocalContext.getUserId();
if (StringUtils.isBlank(tenantId) || Objects.isNull(userId)) {
if (Objects.isNull(tenantId) || Objects.isNull(userId)) {
log.error("公司和工号都不能为空");
return SdmResponse.failed("公司和工号都不能为空");
}
@@ -482,10 +481,10 @@ public class TaskServiceImpl implements ITaskService {
@Override
public SdmResponse countByStatus(SpdmTaskCountReq req) {
String tenantId = ThreadLocalContext.getCompany();
Long tenantId = ThreadLocalContext.getTenantId();
// String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
Long userId = ThreadLocalContext.getUserId();
if (StringUtils.isBlank(tenantId) || Objects.isNull(userId)) {
if (Objects.isNull(tenantId) || Objects.isNull(userId)) {
log.error("公司和工号都不能为空");
return SdmResponse.failed("公司和工号都不能为空");
}
@@ -709,7 +708,7 @@ public class TaskServiceImpl implements ITaskService {
public SdmResponse analysisTaskList(SpdmAnalysisTaskListReq req) {
int pos = (req.getCurrent() - 1) * req.getSize();
int limit = req.getSize();
String tenantId = ThreadLocalContext.getCompany();
Long tenantId = ThreadLocalContext.getTenantId();
String projectNodeId = req.getProjectNodeId();
String phaseNodeId = req.getPhaseNodeId();
String disciplineNodeId = req.getDisciplineNodeId();
@@ -844,7 +843,7 @@ public class TaskServiceImpl implements ITaskService {
if (CollectionUtils.isNotEmpty(addUserIdList)) {
List<SpdmTaskAttentionReq> attentionList = new ArrayList<>();
String curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
Long jobNumber = ThreadLocalContext.getUserId();
// 关注
for (Long userId : addUserIdList) {
SpdmTaskAttentionReq spdmTaskAttentionReq = new SpdmTaskAttentionReq();
@@ -864,11 +863,8 @@ public class TaskServiceImpl implements ITaskService {
@Override
public SdmResponse edit(ModifyTaskNode req) {
List<TaskEditNodeReq> taskEditNodeReqList = req.getEditNodeList();
String tenantId = ThreadLocalContext.getCompany();
String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
String nodeType;
Map<String, List<TaskEditNodeReq>> editNodeListMap = taskEditNodeReqList.stream().collect(Collectors.groupingBy(TaskEditNodeReq::getNodeType));
String updateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
for (Map.Entry<String, List<TaskEditNodeReq>> taskEntry : editNodeListMap.entrySet()) {
nodeType = taskEntry.getKey();
log.info("nodeType为{}", nodeType);