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

修改：所有任务增加工号bug修改

Browse Source
This commit is contained in:
15195
2026-01-27 17:46:50 +08:00
parent 5f2997c2c9
commit e4c8a2c16b
1 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -257,6 +257,15 @@ public class TaskServiceImpl implements ITaskService {
memberMap = taskMemberVoList.stream().collect(Collectors.groupingBy(SpdmTaskMemberVo::getTaskId));
}
// yangyang
// 处理工位号,所有的tag标签
List<TaskNodeTag> nodeTypes = req.getNodeTypeMap();
log.info("查询任务列表 nodeTypeMap:{}",JSONObject.toJSONString(nodeTypes));
// 工位对应的对象， value就是哪一个标签
TaskNodeTag taskNodeTag = TaskNodeTagUtils.getTaskNodeTagByKey(nodeTypes, "workspace");
List<String> allWorkSpaceUuid = new ArrayList<>();
// yangyang
List<SpdmTaskMemberVo> eachMemberList;
List<String> tagList = idMapList.stream().map(TaskNodeTag::getValue).toList();
List<String> nodeIdList = new ArrayList<>();
@@ -307,6 +316,21 @@ public class TaskServiceImpl implements ITaskService {
}
String newTag;
for (SpdmTaskVo task : taskList) {
// 汇总工位信息 yangyang
if(taskNodeTag!=null&&StringUtils.isNotBlank(taskNodeTag.getValue())){
String workSpaceUuid = "";
try {
workSpaceUuid = getTagProperty(task, taskNodeTag.getValue());
} catch (Exception e) {
log.warn("get workspace uuid error:{}",e.getMessage());
}
if(StringUtils.isNotBlank(workSpaceUuid)){
allWorkSpaceUuid.add(workSpaceUuid);
}
}
// yangyang
for (String tag : tagList) {
newTag = "new" + tag.replace("t", "T");
tag = tag.replace("T", "t");
@@ -397,6 +421,14 @@ public class TaskServiceImpl implements ITaskService {
task.setAttentionFlag(CollectionUtils.isEmpty(eachAttentionMemberList) ? 0 :
(eachAttentionMemberList.stream().map(SpdmTaskAttentionMemberVo::getUserId).toList().contains(userId) ? 1 : 0));
}
// 查询工位信息，然后封装返回 yangyang
Map<String, SimulationNode> allNodeMap=new HashMap<>();
if(CollectionUtils.isNotEmpty(allWorkSpaceUuid)){
List<SimulationNode> listSimulationNodes = nodeService.lambdaQuery().in(SimulationNode::getUuid, allWorkSpaceUuid).list();
allNodeMap = convertToUuidMapByStream(listSimulationNodes);
}
// yangyang
jsonObject.put("total", taskList.size());
taskList = taskList.stream().skip((long) (req.getCurrent() - 1) * req.getSize()).limit(req.getSize()).toList();
List<SpdmNewTaskVo> newTaskList = new ArrayList<>();
@@ -437,6 +469,9 @@ public class TaskServiceImpl implements ITaskService {
spdmNewTaskVo.setSubmitterName(cidUserResp.getData().getNickname());
}
}
// 设置工位号 yangyang
setWorkSpaceNodeCode(spdmNewTaskVo,taskVo,allNodeMap,taskNodeTag);
// yangyang
newTaskList.add(spdmNewTaskVo);
}
}
@@ -597,12 +632,6 @@ public class TaskServiceImpl implements ITaskService {
}
List<SpdmTaskMemberVo> eachTaskMemberList;
String newTag;
// 处理工位号,所有的tag标签
List<TaskNodeTag> nodeTypes = req.getNodeTypeMap();
log.info("查询任务列表 nodeTypeMap:{}",JSONObject.toJSONString(nodeTypes));
// 工位对应的对象， value就是哪一个标签
TaskNodeTag taskNodeTag = TaskNodeTagUtils.getTaskNodeTagByKey(nodeTypes, "workspace");
List<String> allWorkSpaceUuid = new ArrayList<>();
for (SpdmTaskVo task : taskList) {
for (String tag : tagList) {
@@ -648,7 +677,12 @@ public class TaskServiceImpl implements ITaskService {
if(taskNodeTag!=null&&StringUtils.isNotBlank(taskNodeTag.getValue())){
String workSpaceUuid = "";
try {
workSpaceUuid = getTagProperty(task, taskNodeTag.getValue());
// yangyang
String value = taskNodeTag.getValue();
// tag5---> newTag5
String newValue = "new"+StringUtils.capitalize(value);
workSpaceUuid = getTagProperty(task, newValue);
// yangyang
} catch (Exception e) {
log.warn("get workspace uuid error:{}",e.getMessage());
}
@@ -708,7 +742,11 @@ public class TaskServiceImpl implements ITaskService {
String workSpaceUuid = "";
try {
// 获取工位UUID（假设getTagProperty是当前类的方法或已导入的工具方法）
workSpaceUuid = getTagProperty(taskVo, taskNodeTag.getValue());
// yangyang
String value = taskNodeTag.getValue();
// tag5---> newTag5
String newValue = "new"+StringUtils.capitalize(value);
workSpaceUuid = getTagProperty(taskVo, newValue);
} catch (Exception e) {
log.warn("get taskVo uuid error:{}", e.getMessage());
}