1、1、创建项目、阶段、机台、工位、任务、指标、需求时,同步tag1-tag10给到文件数据标签
This commit is contained in:
@@ -226,6 +226,17 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
|
|||||||
FolderItemReq demandAttachFolderItemReq = new FolderItemReq();
|
FolderItemReq demandAttachFolderItemReq = new FolderItemReq();
|
||||||
demandAttachFolderItemReq.setFolderName(AttachFileTypeEnum.DEMAND_FILE.getValue());
|
demandAttachFolderItemReq.setFolderName(AttachFileTypeEnum.DEMAND_FILE.getValue());
|
||||||
demandAttachFolderItemReq.setFolderUuid(RandomUtil.generateString(32));
|
demandAttachFolderItemReq.setFolderUuid(RandomUtil.generateString(32));
|
||||||
|
// 利元亨定制
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
String projectId = req.getProjectId();
|
||||||
|
String phaseId = req.getPhaseId();
|
||||||
|
String machineId = req.getMachineId();
|
||||||
|
String workspaceId = req.getWorkspaceId();
|
||||||
|
tagReq.setTag1(projectId);
|
||||||
|
tagReq.setTag2(phaseId);
|
||||||
|
tagReq.setTag4(machineId);
|
||||||
|
tagReq.setTag5(workspaceId);
|
||||||
|
demandAttachFolderItemReq.setTagReq(tagReq);
|
||||||
demandAttachFolderItemReqList.add(demandAttachFolderItemReq);
|
demandAttachFolderItemReqList.add(demandAttachFolderItemReq);
|
||||||
demandAttachBatchCreateNormalDirReq.setFolderItems(demandAttachFolderItemReqList);
|
demandAttachBatchCreateNormalDirReq.setFolderItems(demandAttachFolderItemReqList);
|
||||||
log.info("创建需求附件文件夹请求参数:{}", demandAttachBatchCreateNormalDirReq);
|
log.info("创建需求附件文件夹请求参数:{}", demandAttachBatchCreateNormalDirReq);
|
||||||
@@ -261,6 +272,17 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
|
|||||||
FolderItemReq folderItemReq = new FolderItemReq();
|
FolderItemReq folderItemReq = new FolderItemReq();
|
||||||
folderItemReq.setFolderName(req.getDemandName());
|
folderItemReq.setFolderName(req.getDemandName());
|
||||||
folderItemReq.setFolderUuid(req.getUuid());
|
folderItemReq.setFolderUuid(req.getUuid());
|
||||||
|
// 利元亨定制
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
String projectId = req.getProjectId();
|
||||||
|
String phaseId = req.getPhaseId();
|
||||||
|
String machineId = req.getMachineId();
|
||||||
|
String workspaceId = req.getWorkspaceId();
|
||||||
|
tagReq.setTag1(projectId);
|
||||||
|
tagReq.setTag2(phaseId);
|
||||||
|
tagReq.setTag4(machineId);
|
||||||
|
tagReq.setTag5(workspaceId);
|
||||||
|
folderItemReq.setTagReq(tagReq);
|
||||||
batchCreateNormalDirReq.setFolderItems(Collections.singletonList(folderItemReq));
|
batchCreateNormalDirReq.setFolderItems(Collections.singletonList(folderItemReq));
|
||||||
log.info("手动同步待办创建文件夹参数: {}", batchCreateNormalDirReq);
|
log.info("手动同步待办创建文件夹参数: {}", batchCreateNormalDirReq);
|
||||||
SdmResponse dirCreateResp = dataFeignClient.batchCreateNormalDirs(batchCreateNormalDirReq);
|
SdmResponse dirCreateResp = dataFeignClient.batchCreateNormalDirs(batchCreateNormalDirReq);
|
||||||
@@ -1426,6 +1448,17 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
|
|||||||
FolderItemReq demandAttachFolderItemReq = new FolderItemReq();
|
FolderItemReq demandAttachFolderItemReq = new FolderItemReq();
|
||||||
demandAttachFolderItemReq.setFolderName(AttachFileTypeEnum.DEMAND_FILE.getValue());
|
demandAttachFolderItemReq.setFolderName(AttachFileTypeEnum.DEMAND_FILE.getValue());
|
||||||
demandAttachFolderItemReq.setFolderUuid(RandomUtil.generateString(32));
|
demandAttachFolderItemReq.setFolderUuid(RandomUtil.generateString(32));
|
||||||
|
// 利元亨定制
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
String projectId = req.getProjectId();
|
||||||
|
String phaseId = req.getPhaseId();
|
||||||
|
String machineId = req.getMachineId();
|
||||||
|
String workspaceId = req.getWorkspaceId();
|
||||||
|
tagReq.setTag1(projectId);
|
||||||
|
tagReq.setTag2(phaseId);
|
||||||
|
tagReq.setTag4(machineId);
|
||||||
|
tagReq.setTag5(workspaceId);
|
||||||
|
demandAttachFolderItemReq.setTagReq(tagReq);
|
||||||
demandAttachFolderItemReqList.add(demandAttachFolderItemReq);
|
demandAttachFolderItemReqList.add(demandAttachFolderItemReq);
|
||||||
demandAttachBatchCreateNormalDirReq.setFolderItems(demandAttachFolderItemReqList);
|
demandAttachBatchCreateNormalDirReq.setFolderItems(demandAttachFolderItemReqList);
|
||||||
demandAttachBatchCreateNormalDirReq.setSkipPermissionCheck(true);
|
demandAttachBatchCreateNormalDirReq.setSkipPermissionCheck(true);
|
||||||
@@ -1462,6 +1495,17 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
|
|||||||
FolderItemReq folderItemReq = new FolderItemReq();
|
FolderItemReq folderItemReq = new FolderItemReq();
|
||||||
folderItemReq.setFolderName(req.getDemandName());
|
folderItemReq.setFolderName(req.getDemandName());
|
||||||
folderItemReq.setFolderUuid(req.getUuid());
|
folderItemReq.setFolderUuid(req.getUuid());
|
||||||
|
// 利元亨定制
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
String projectId = req.getProjectId();
|
||||||
|
String phaseId = req.getPhaseId();
|
||||||
|
String machineId = req.getMachineId();
|
||||||
|
String workspaceId = req.getWorkspaceId();
|
||||||
|
tagReq.setTag1(projectId);
|
||||||
|
tagReq.setTag2(phaseId);
|
||||||
|
tagReq.setTag4(machineId);
|
||||||
|
tagReq.setTag5(workspaceId);
|
||||||
|
folderItemReq.setTagReq(tagReq);
|
||||||
batchCreateNormalDirReq.setFolderItems(Collections.singletonList(folderItemReq));
|
batchCreateNormalDirReq.setFolderItems(Collections.singletonList(folderItemReq));
|
||||||
batchCreateNormalDirReq.setSkipPermissionCheck(true);
|
batchCreateNormalDirReq.setSkipPermissionCheck(true);
|
||||||
log.info("创建需求文件夹参数(无权限校验): {}", batchCreateNormalDirReq);
|
log.info("创建需求文件夹参数(无权限校验): {}", batchCreateNormalDirReq);
|
||||||
|
|||||||
@@ -429,7 +429,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
|||||||
// 2. 构建权限更新参数
|
// 2. 构建权限更新参数
|
||||||
buildPermissionReqList(demandUuid, userId, todo, updatePermissionList, usernameToUserIdMap);
|
buildPermissionReqList(demandUuid, userId, todo, updatePermissionList, usernameToUserIdMap);
|
||||||
// 3. 构建需求文件夹节点
|
// 3. 构建需求文件夹节点
|
||||||
demandDirNodeList.add(buildDemandDirNode(demandUuid, projectNode, demandReq.getDemandName()));
|
demandDirNodeList.add(buildDemandDirNode(demandUuid, projectNode,demandReq));
|
||||||
// 4. 异步保存需求数据
|
// 4. 异步保存需求数据
|
||||||
asyncSaveDemandData(demandReq, memberList, tenantId, userId, usernameToUserIdMap, demandExtraList);
|
asyncSaveDemandData(demandReq, memberList, tenantId, userId, usernameToUserIdMap, demandExtraList);
|
||||||
|
|
||||||
@@ -708,12 +708,23 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
|||||||
*/
|
*/
|
||||||
private DirNodeInfo buildDemandDirNode(String demandUuid,
|
private DirNodeInfo buildDemandDirNode(String demandUuid,
|
||||||
SimulationNode projectNode,
|
SimulationNode projectNode,
|
||||||
String demandName) {
|
SpdmAddDemandReq req) {
|
||||||
DirNodeInfo dirNode = new DirNodeInfo();
|
DirNodeInfo dirNode = new DirNodeInfo();
|
||||||
dirNode.setUuId(demandUuid);
|
dirNode.setUuId(demandUuid);
|
||||||
dirNode.setParentUuId(projectNode.getUuid());
|
dirNode.setParentUuId(projectNode.getUuid());
|
||||||
dirNode.setUuIdOwnType(NodeTypeEnum.DEMAND.getValue());
|
dirNode.setUuIdOwnType(NodeTypeEnum.DEMAND.getValue());
|
||||||
dirNode.setDirName(demandName);
|
dirNode.setDirName(req.getDemandName());
|
||||||
|
// 利元亨定制
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
String projectId = req.getProjectId();
|
||||||
|
String phaseId = req.getPhaseId();
|
||||||
|
String machineId = req.getMachineId();
|
||||||
|
String workspaceId = req.getWorkspaceId();
|
||||||
|
tagReq.setTag1(projectId);
|
||||||
|
tagReq.setTag2(phaseId);
|
||||||
|
tagReq.setTag4(machineId);
|
||||||
|
tagReq.setTag5(workspaceId);
|
||||||
|
dirNode.setTagReq(tagReq);
|
||||||
return dirNode;
|
return dirNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -789,6 +800,10 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
|||||||
FolderItemReq demandAttachFolderItemReq = new FolderItemReq();
|
FolderItemReq demandAttachFolderItemReq = new FolderItemReq();
|
||||||
demandAttachFolderItemReq.setFolderName(AttachFileTypeEnum.DEMAND_FILE.getValue());
|
demandAttachFolderItemReq.setFolderName(AttachFileTypeEnum.DEMAND_FILE.getValue());
|
||||||
demandAttachFolderItemReq.setFolderUuid(RandomUtil.generateString(32));
|
demandAttachFolderItemReq.setFolderUuid(RandomUtil.generateString(32));
|
||||||
|
// 利元亨定制
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
tagReq.setTag1(projectNodeId);
|
||||||
|
demandAttachFolderItemReq.setTagReq(tagReq);
|
||||||
demandAttachFolderItemReqList.add(demandAttachFolderItemReq);
|
demandAttachFolderItemReqList.add(demandAttachFolderItemReq);
|
||||||
demandAttachBatchCreateNormalDirReq.setFolderItems(demandAttachFolderItemReqList);
|
demandAttachBatchCreateNormalDirReq.setFolderItems(demandAttachFolderItemReqList);
|
||||||
demandAttachBatchCreateNormalDirReq.setSkipPermissionCheck(true);
|
demandAttachBatchCreateNormalDirReq.setSkipPermissionCheck(true);
|
||||||
@@ -829,6 +844,9 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
|||||||
FolderItemReq folderItemReq = new FolderItemReq();
|
FolderItemReq folderItemReq = new FolderItemReq();
|
||||||
folderItemReq.setFolderName(dirNodeInfo.getDirName());
|
folderItemReq.setFolderName(dirNodeInfo.getDirName());
|
||||||
folderItemReq.setFolderUuid(dirNodeInfo.getUuId());
|
folderItemReq.setFolderUuid(dirNodeInfo.getUuId());
|
||||||
|
// 利元亨定制
|
||||||
|
TagReq tagReq = dirNodeInfo.getTagReq();
|
||||||
|
folderItemReq.setTagReq(tagReq);
|
||||||
folderItemReqList.add(folderItemReq);
|
folderItemReqList.add(folderItemReq);
|
||||||
}
|
}
|
||||||
batchCreateNormalDirReq.setFolderItems(folderItemReqList);
|
batchCreateNormalDirReq.setFolderItems(folderItemReqList);
|
||||||
@@ -2627,12 +2645,13 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
|||||||
/**
|
/**
|
||||||
* 通用方法:构建单个DirNodeInfo
|
* 通用方法:构建单个DirNodeInfo
|
||||||
*/
|
*/
|
||||||
private DirNodeInfo buildDirNodeInfo(String uuid, String parentUuid, String nodeType, String dirName) {
|
private DirNodeInfo buildDirNodeInfo(String uuid, String parentUuid, String nodeType, String dirName,TagReq tagReq) {
|
||||||
DirNodeInfo dirNodeInfo = new DirNodeInfo();
|
DirNodeInfo dirNodeInfo = new DirNodeInfo();
|
||||||
dirNodeInfo.setUuId(uuid);
|
dirNodeInfo.setUuId(uuid);
|
||||||
dirNodeInfo.setParentUuId(parentUuid);
|
dirNodeInfo.setParentUuId(parentUuid);
|
||||||
dirNodeInfo.setUuIdOwnType(nodeType);
|
dirNodeInfo.setUuIdOwnType(nodeType);
|
||||||
dirNodeInfo.setDirName(dirName);
|
dirNodeInfo.setDirName(dirName);
|
||||||
|
dirNodeInfo.setTagReq(tagReq);
|
||||||
return dirNodeInfo;
|
return dirNodeInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2643,9 +2662,13 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
|||||||
if (CollectionUtils.isEmpty(nodeList)) {
|
if (CollectionUtils.isEmpty(nodeList)) {
|
||||||
return new ArrayList<>();
|
return new ArrayList<>();
|
||||||
}
|
}
|
||||||
return nodeList.stream()
|
List<DirNodeInfo> dirNodeInfoList = new ArrayList<>();
|
||||||
.map(node -> buildDirNodeInfo(node.getUuid(), parentUuid, nodeType, node.getNodeName()))
|
for (SpdmProjectNodeEditReq node : nodeList) {
|
||||||
.collect(Collectors.toList());
|
TagReq tagReq = new TagReq();
|
||||||
|
BeanUtils.copyProperties(node,tagReq);
|
||||||
|
dirNodeInfoList.add(buildDirNodeInfo(node.getUuid(), parentUuid, nodeType, node.getNodeName(),tagReq));
|
||||||
|
}
|
||||||
|
return dirNodeInfoList;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -2655,9 +2678,11 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
|||||||
SpdmProjectNodeEditReq projectNode = filterResult.getProjectNode();
|
SpdmProjectNodeEditReq projectNode = filterResult.getProjectNode();
|
||||||
List<SpdmProjectNodeEditReq> phaseNodes = filterResult.getAddPhaseNodeList();
|
List<SpdmProjectNodeEditReq> phaseNodes = filterResult.getAddPhaseNodeList();
|
||||||
BatchCreateDirItem projectCreateDirItem = new BatchCreateDirItem();
|
BatchCreateDirItem projectCreateDirItem = new BatchCreateDirItem();
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
BeanUtils.copyProperties(projectNode,tagReq);
|
||||||
DirNodeInfo projectDirNodeInfo = buildDirNodeInfo(
|
DirNodeInfo projectDirNodeInfo = buildDirNodeInfo(
|
||||||
projectNode.getUuid(), null,
|
projectNode.getUuid(), null,
|
||||||
NodeTypeEnum.PROJECT.getValue(), projectNode.getNodeName()
|
NodeTypeEnum.PROJECT.getValue(), projectNode.getNodeName(),tagReq
|
||||||
);
|
);
|
||||||
projectCreateDirItem.setParentDirNodeInfo(projectDirNodeInfo);
|
projectCreateDirItem.setParentDirNodeInfo(projectDirNodeInfo);
|
||||||
// 构建项目下的阶段子节点
|
// 构建项目下的阶段子节点
|
||||||
@@ -2673,9 +2698,11 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
|||||||
*/
|
*/
|
||||||
private BatchCreateDirItem buildPhaseDirItem(SpdmProjectNodeEditReq phaseNode, String projectUuid, List<SpdmProjectNodeEditReq> machineNodes) {
|
private BatchCreateDirItem buildPhaseDirItem(SpdmProjectNodeEditReq phaseNode, String projectUuid, List<SpdmProjectNodeEditReq> machineNodes) {
|
||||||
BatchCreateDirItem phaseCreateDirItem = new BatchCreateDirItem();
|
BatchCreateDirItem phaseCreateDirItem = new BatchCreateDirItem();
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
BeanUtils.copyProperties(phaseNode,tagReq);
|
||||||
DirNodeInfo phaseDirNodeInfo = buildDirNodeInfo(
|
DirNodeInfo phaseDirNodeInfo = buildDirNodeInfo(
|
||||||
phaseNode.getUuid(), projectUuid,
|
phaseNode.getUuid(), projectUuid,
|
||||||
NodeTypeEnum.PHASE.getValue(), phaseNode.getNodeName()
|
NodeTypeEnum.PHASE.getValue(), phaseNode.getNodeName(),tagReq
|
||||||
);
|
);
|
||||||
phaseCreateDirItem.setParentDirNodeInfo(phaseDirNodeInfo);
|
phaseCreateDirItem.setParentDirNodeInfo(phaseDirNodeInfo);
|
||||||
// 若无机台节点,子节点为空
|
// 若无机台节点,子节点为空
|
||||||
@@ -2698,9 +2725,11 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
|||||||
String phaseUuid,
|
String phaseUuid,
|
||||||
List<SpdmProjectNodeEditReq> workspaceNodes) {
|
List<SpdmProjectNodeEditReq> workspaceNodes) {
|
||||||
BatchCreateDirItem machineCreateDirItem = new BatchCreateDirItem();
|
BatchCreateDirItem machineCreateDirItem = new BatchCreateDirItem();
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
BeanUtils.copyProperties(machineNode,tagReq);
|
||||||
DirNodeInfo machineDirNodeInfo = buildDirNodeInfo(
|
DirNodeInfo machineDirNodeInfo = buildDirNodeInfo(
|
||||||
machineNode.getUuid(), phaseUuid,
|
machineNode.getUuid(), phaseUuid,
|
||||||
NodeTypeEnum.MACHINE.getValue(), machineNode.getNodeName()
|
NodeTypeEnum.MACHINE.getValue(), machineNode.getNodeName(),tagReq
|
||||||
);
|
);
|
||||||
machineCreateDirItem.setParentDirNodeInfo(machineDirNodeInfo);
|
machineCreateDirItem.setParentDirNodeInfo(machineDirNodeInfo);
|
||||||
|
|
||||||
@@ -2727,9 +2756,11 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
|||||||
}
|
}
|
||||||
for (SpdmProjectNodeEditReq workspaceNode : currentWorkspaceNodes) {
|
for (SpdmProjectNodeEditReq workspaceNode : currentWorkspaceNodes) {
|
||||||
BatchCreateDirItem workspaceCreateDirItem = new BatchCreateDirItem();
|
BatchCreateDirItem workspaceCreateDirItem = new BatchCreateDirItem();
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
BeanUtils.copyProperties(workspaceNode,tagReq);
|
||||||
DirNodeInfo workspaceDirNodeInfo = buildDirNodeInfo(
|
DirNodeInfo workspaceDirNodeInfo = buildDirNodeInfo(
|
||||||
workspaceNode.getUuid(), machineNode.getUuid(),
|
workspaceNode.getUuid(), machineNode.getUuid(),
|
||||||
NodeTypeEnum.WORKSPACE.getValue(), workspaceNode.getNodeName()
|
NodeTypeEnum.WORKSPACE.getValue(), workspaceNode.getNodeName(),tagReq
|
||||||
);
|
);
|
||||||
workspaceCreateDirItem.setParentDirNodeInfo(workspaceDirNodeInfo);
|
workspaceCreateDirItem.setParentDirNodeInfo(workspaceDirNodeInfo);
|
||||||
workspaceCreateDirItem.setChildDirNodeInfos(new ArrayList<>());
|
workspaceCreateDirItem.setChildDirNodeInfos(new ArrayList<>());
|
||||||
@@ -2825,6 +2856,11 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
|||||||
FolderItemReq folderItemReq = new FolderItemReq();
|
FolderItemReq folderItemReq = new FolderItemReq();
|
||||||
folderItemReq.setFolderName(AttachFileTypeEnum.PROJECT_FILE.getValue());
|
folderItemReq.setFolderName(AttachFileTypeEnum.PROJECT_FILE.getValue());
|
||||||
folderItemReq.setFolderUuid(RandomUtil.generateString(32));
|
folderItemReq.setFolderUuid(RandomUtil.generateString(32));
|
||||||
|
// 利元亨定制
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
String projectId = projectNode.getUuid();
|
||||||
|
tagReq.setTag1(projectId);
|
||||||
|
folderItemReq.setTagReq(tagReq);
|
||||||
folderItemReqList.add(folderItemReq);
|
folderItemReqList.add(folderItemReq);
|
||||||
batchCreateNormalDirReq.setFolderItems(folderItemReqList);
|
batchCreateNormalDirReq.setFolderItems(folderItemReqList);
|
||||||
batchCreateNormalDirReq.setSkipPermissionCheck(true);
|
batchCreateNormalDirReq.setSkipPermissionCheck(true);
|
||||||
@@ -3891,6 +3927,11 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
|||||||
FolderItemReq demandAttachFolderItemReq = new FolderItemReq();
|
FolderItemReq demandAttachFolderItemReq = new FolderItemReq();
|
||||||
demandAttachFolderItemReq.setFolderName(AttachFileTypeEnum.DEMAND_FILE.getValue());
|
demandAttachFolderItemReq.setFolderName(AttachFileTypeEnum.DEMAND_FILE.getValue());
|
||||||
demandAttachFolderItemReq.setFolderUuid(RandomUtil.generateString(32));
|
demandAttachFolderItemReq.setFolderUuid(RandomUtil.generateString(32));
|
||||||
|
// 利元亨定制
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
String projectId = req.getProjectId();
|
||||||
|
tagReq.setTag1(projectId);
|
||||||
|
demandAttachFolderItemReq.setTagReq(tagReq);
|
||||||
demandAttachFolderItemReqList.add(demandAttachFolderItemReq);
|
demandAttachFolderItemReqList.add(demandAttachFolderItemReq);
|
||||||
demandAttachBatchCreateNormalDirReq.setFolderItems(demandAttachFolderItemReqList);
|
demandAttachBatchCreateNormalDirReq.setFolderItems(demandAttachFolderItemReqList);
|
||||||
log.info("acceptTodoInfo 创建需求附件文件夹请求参数:{}", demandAttachBatchCreateNormalDirReq);
|
log.info("acceptTodoInfo 创建需求附件文件夹请求参数:{}", demandAttachBatchCreateNormalDirReq);
|
||||||
@@ -3926,6 +3967,17 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
|||||||
FolderItemReq folderItemReq = new FolderItemReq();
|
FolderItemReq folderItemReq = new FolderItemReq();
|
||||||
folderItemReq.setFolderName(req.getDemandName());
|
folderItemReq.setFolderName(req.getDemandName());
|
||||||
folderItemReq.setFolderUuid(req.getUuid());
|
folderItemReq.setFolderUuid(req.getUuid());
|
||||||
|
// 利元亨定制
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
String projectId = req.getProjectId();
|
||||||
|
String phaseId = req.getPhaseId();
|
||||||
|
String machineId = req.getMachineId();
|
||||||
|
String workspaceId = req.getWorkspaceId();
|
||||||
|
tagReq.setTag1(projectId);
|
||||||
|
tagReq.setTag2(phaseId);
|
||||||
|
tagReq.setTag4(machineId);
|
||||||
|
tagReq.setTag5(workspaceId);
|
||||||
|
folderItemReq.setTagReq(tagReq);
|
||||||
batchCreateNormalDirReq.setFolderItems(Collections.singletonList(folderItemReq));
|
batchCreateNormalDirReq.setFolderItems(Collections.singletonList(folderItemReq));
|
||||||
log.info("acceptTodoInfo 创建文件夹参数: {}", batchCreateNormalDirReq);
|
log.info("acceptTodoInfo 创建文件夹参数: {}", batchCreateNormalDirReq);
|
||||||
SdmResponse dirCreateResp = dataFeignClient.batchCreateNormalDirs(batchCreateNormalDirReq);
|
SdmResponse dirCreateResp = dataFeignClient.batchCreateNormalDirs(batchCreateNormalDirReq);
|
||||||
|
|||||||
@@ -1112,9 +1112,11 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
|||||||
SpdmProjectNodeEditReq projectNode = filterResult.getProjectNode();
|
SpdmProjectNodeEditReq projectNode = filterResult.getProjectNode();
|
||||||
List<SpdmProjectNodeEditReq> phaseNodes = filterResult.getAddPhaseNodeList();
|
List<SpdmProjectNodeEditReq> phaseNodes = filterResult.getAddPhaseNodeList();
|
||||||
BatchCreateDirItem projectCreateDirItem = new BatchCreateDirItem();
|
BatchCreateDirItem projectCreateDirItem = new BatchCreateDirItem();
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
BeanUtils.copyProperties(projectNode,tagReq);
|
||||||
DirNodeInfo projectDirNodeInfo = buildDirNodeInfo(
|
DirNodeInfo projectDirNodeInfo = buildDirNodeInfo(
|
||||||
projectNode.getUuid(), null,
|
projectNode.getUuid(), null,
|
||||||
NodeTypeEnum.PROJECT.getValue(), projectNode.getNodeName()
|
NodeTypeEnum.PROJECT.getValue(), projectNode.getNodeName(),tagReq
|
||||||
);
|
);
|
||||||
projectCreateDirItem.setParentDirNodeInfo(projectDirNodeInfo);
|
projectCreateDirItem.setParentDirNodeInfo(projectDirNodeInfo);
|
||||||
// 构建项目下的阶段子节点
|
// 构建项目下的阶段子节点
|
||||||
@@ -1154,9 +1156,11 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
|||||||
*/
|
*/
|
||||||
private BatchCreateDirItem buildPhaseDirItem(SpdmProjectNodeEditReq phaseNode, String projectUuid, List<SpdmProjectNodeEditReq> machineNodes) {
|
private BatchCreateDirItem buildPhaseDirItem(SpdmProjectNodeEditReq phaseNode, String projectUuid, List<SpdmProjectNodeEditReq> machineNodes) {
|
||||||
BatchCreateDirItem phaseCreateDirItem = new BatchCreateDirItem();
|
BatchCreateDirItem phaseCreateDirItem = new BatchCreateDirItem();
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
BeanUtils.copyProperties(phaseNode,tagReq);
|
||||||
DirNodeInfo phaseDirNodeInfo = buildDirNodeInfo(
|
DirNodeInfo phaseDirNodeInfo = buildDirNodeInfo(
|
||||||
phaseNode.getUuid(), projectUuid,
|
phaseNode.getUuid(), projectUuid,
|
||||||
NodeTypeEnum.PHASE.getValue(), phaseNode.getNodeName()
|
NodeTypeEnum.PHASE.getValue(), phaseNode.getNodeName(),tagReq
|
||||||
);
|
);
|
||||||
phaseCreateDirItem.setParentDirNodeInfo(phaseDirNodeInfo);
|
phaseCreateDirItem.setParentDirNodeInfo(phaseDirNodeInfo);
|
||||||
// 若无机台节点,子节点为空
|
// 若无机台节点,子节点为空
|
||||||
@@ -1202,9 +1206,11 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
|||||||
String phaseUuid,
|
String phaseUuid,
|
||||||
List<SpdmProjectNodeEditReq> workspaceNodes) {
|
List<SpdmProjectNodeEditReq> workspaceNodes) {
|
||||||
BatchCreateDirItem machineCreateDirItem = new BatchCreateDirItem();
|
BatchCreateDirItem machineCreateDirItem = new BatchCreateDirItem();
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
BeanUtils.copyProperties(machineNode,tagReq);
|
||||||
DirNodeInfo machineDirNodeInfo = buildDirNodeInfo(
|
DirNodeInfo machineDirNodeInfo = buildDirNodeInfo(
|
||||||
machineNode.getUuid(), phaseUuid,
|
machineNode.getUuid(), phaseUuid,
|
||||||
NodeTypeEnum.MACHINE.getValue(), machineNode.getNodeName()
|
NodeTypeEnum.MACHINE.getValue(), machineNode.getNodeName(),tagReq
|
||||||
);
|
);
|
||||||
machineCreateDirItem.setParentDirNodeInfo(machineDirNodeInfo);
|
machineCreateDirItem.setParentDirNodeInfo(machineDirNodeInfo);
|
||||||
|
|
||||||
@@ -1231,9 +1237,11 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
|||||||
}
|
}
|
||||||
for (SpdmProjectNodeEditReq workspaceNode : currentWorkspaceNodes) {
|
for (SpdmProjectNodeEditReq workspaceNode : currentWorkspaceNodes) {
|
||||||
BatchCreateDirItem workspaceCreateDirItem = new BatchCreateDirItem();
|
BatchCreateDirItem workspaceCreateDirItem = new BatchCreateDirItem();
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
BeanUtils.copyProperties(workspaceNode,tagReq);
|
||||||
DirNodeInfo workspaceDirNodeInfo = buildDirNodeInfo(
|
DirNodeInfo workspaceDirNodeInfo = buildDirNodeInfo(
|
||||||
workspaceNode.getUuid(), machineNode.getUuid(),
|
workspaceNode.getUuid(), machineNode.getUuid(),
|
||||||
NodeTypeEnum.WORKSPACE.getValue(), workspaceNode.getNodeName()
|
NodeTypeEnum.WORKSPACE.getValue(), workspaceNode.getNodeName(),tagReq
|
||||||
);
|
);
|
||||||
workspaceCreateDirItem.setParentDirNodeInfo(workspaceDirNodeInfo);
|
workspaceCreateDirItem.setParentDirNodeInfo(workspaceDirNodeInfo);
|
||||||
workspaceCreateDirItem.setChildDirNodeInfos(new ArrayList<>());
|
workspaceCreateDirItem.setChildDirNodeInfos(new ArrayList<>());
|
||||||
@@ -1244,12 +1252,13 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
|||||||
/**
|
/**
|
||||||
* 通用方法:构建单个DirNodeInfo
|
* 通用方法:构建单个DirNodeInfo
|
||||||
*/
|
*/
|
||||||
private DirNodeInfo buildDirNodeInfo(String uuid, String parentUuid, String nodeType, String dirName) {
|
private DirNodeInfo buildDirNodeInfo(String uuid, String parentUuid, String nodeType, String dirName,TagReq tagReq) {
|
||||||
DirNodeInfo dirNodeInfo = new DirNodeInfo();
|
DirNodeInfo dirNodeInfo = new DirNodeInfo();
|
||||||
dirNodeInfo.setUuId(uuid);
|
dirNodeInfo.setUuId(uuid);
|
||||||
dirNodeInfo.setParentUuId(parentUuid);
|
dirNodeInfo.setParentUuId(parentUuid);
|
||||||
dirNodeInfo.setUuIdOwnType(nodeType);
|
dirNodeInfo.setUuIdOwnType(nodeType);
|
||||||
dirNodeInfo.setDirName(dirName);
|
dirNodeInfo.setDirName(dirName);
|
||||||
|
dirNodeInfo.setTagReq(tagReq);
|
||||||
return dirNodeInfo;
|
return dirNodeInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1260,9 +1269,13 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
|||||||
if (CollectionUtils.isEmpty(nodeList)) {
|
if (CollectionUtils.isEmpty(nodeList)) {
|
||||||
return new ArrayList<>();
|
return new ArrayList<>();
|
||||||
}
|
}
|
||||||
return nodeList.stream()
|
List<DirNodeInfo> dirNodeInfoList = new ArrayList<>();
|
||||||
.map(node -> buildDirNodeInfo(node.getUuid(), parentUuid, nodeType, node.getNodeName()))
|
for (SpdmProjectNodeEditReq node : nodeList) {
|
||||||
.collect(Collectors.toList());
|
TagReq tagReq = new TagReq();
|
||||||
|
BeanUtils.copyProperties(node,tagReq);
|
||||||
|
dirNodeInfoList.add(buildDirNodeInfo(node.getUuid(), parentUuid, nodeType, node.getNodeName(),tagReq));
|
||||||
|
}
|
||||||
|
return dirNodeInfoList;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1323,6 +1336,11 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
|||||||
FolderItemReq folderItemReq = new FolderItemReq();
|
FolderItemReq folderItemReq = new FolderItemReq();
|
||||||
folderItemReq.setFolderName(AttachFileTypeEnum.PROJECT_FILE.getValue());
|
folderItemReq.setFolderName(AttachFileTypeEnum.PROJECT_FILE.getValue());
|
||||||
folderItemReq.setFolderUuid(RandomUtil.generateString(32));
|
folderItemReq.setFolderUuid(RandomUtil.generateString(32));
|
||||||
|
// 利元亨定制
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
String projectId = projectNode.getUuid();
|
||||||
|
tagReq.setTag1(projectId);
|
||||||
|
folderItemReq.setTagReq(tagReq);
|
||||||
folderItemReqList.add(folderItemReq);
|
folderItemReqList.add(folderItemReq);
|
||||||
batchCreateNormalDirReq.setFolderItems(folderItemReqList);
|
batchCreateNormalDirReq.setFolderItems(folderItemReqList);
|
||||||
log.info("创建【项目文件】文件夹请求参数:{}", batchCreateNormalDirReq);
|
log.info("创建【项目文件】文件夹请求参数:{}", batchCreateNormalDirReq);
|
||||||
@@ -3560,7 +3578,16 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
|||||||
todoItem, demandUuid, currentUserId, currentTimeStr, permissionReqList,usernameToUserIdMap);
|
todoItem, demandUuid, currentUserId, currentTimeStr, permissionReqList,usernameToUserIdMap);
|
||||||
|
|
||||||
// 3. 构建文件夹节点信息
|
// 3. 构建文件夹节点信息
|
||||||
DirNodeInfo demandDirNode = buildDemandDirNode(demandUuid, todoItem.getSubject(), projectNodeMap.get(NodeTypeEnum.PROJECT.getValue() + "_" + todoItem.getProject()).getUuid());
|
TagReq tagReq = new TagReq();
|
||||||
|
String projectId = demandAddReq.getProjectId();
|
||||||
|
String phaseId = demandAddReq.getPhaseId();
|
||||||
|
String machineId = demandAddReq.getMachineId();
|
||||||
|
String workspaceId = demandAddReq.getWorkspaceId();
|
||||||
|
tagReq.setTag1(projectId);
|
||||||
|
tagReq.setTag2(phaseId);
|
||||||
|
tagReq.setTag4(machineId);
|
||||||
|
tagReq.setTag5(workspaceId);
|
||||||
|
DirNodeInfo demandDirNode = buildDemandDirNode(demandUuid, todoItem.getSubject(), projectNodeMap.get(NodeTypeEnum.PROJECT.getValue() + "_" + todoItem.getProject()).getUuid(),tagReq);
|
||||||
demandDirNodeList.add(demandDirNode);
|
demandDirNodeList.add(demandDirNode);
|
||||||
|
|
||||||
// 4. 异步保存需求和成员信息
|
// 4. 异步保存需求和成员信息
|
||||||
@@ -3792,12 +3819,13 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
|||||||
/**
|
/**
|
||||||
* 构建需求文件夹节点信息
|
* 构建需求文件夹节点信息
|
||||||
*/
|
*/
|
||||||
private DirNodeInfo buildDemandDirNode(String demandUuid, String demandName, String parentNodeId) {
|
private DirNodeInfo buildDemandDirNode(String demandUuid, String demandName, String parentNodeId,TagReq tagReq) {
|
||||||
DirNodeInfo dirNodeInfo = new DirNodeInfo();
|
DirNodeInfo dirNodeInfo = new DirNodeInfo();
|
||||||
dirNodeInfo.setUuId(demandUuid);
|
dirNodeInfo.setUuId(demandUuid);
|
||||||
dirNodeInfo.setParentUuId(parentNodeId);
|
dirNodeInfo.setParentUuId(parentNodeId);
|
||||||
dirNodeInfo.setUuIdOwnType(NodeTypeEnum.DEMAND.getValue());
|
dirNodeInfo.setUuIdOwnType(NodeTypeEnum.DEMAND.getValue());
|
||||||
dirNodeInfo.setDirName(demandName);
|
dirNodeInfo.setDirName(demandName);
|
||||||
|
dirNodeInfo.setTagReq(tagReq);
|
||||||
return dirNodeInfo;
|
return dirNodeInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3855,6 +3883,10 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
|||||||
FolderItemReq demandAttachFolderItemReq = new FolderItemReq();
|
FolderItemReq demandAttachFolderItemReq = new FolderItemReq();
|
||||||
demandAttachFolderItemReq.setFolderName(AttachFileTypeEnum.DEMAND_FILE.getValue());
|
demandAttachFolderItemReq.setFolderName(AttachFileTypeEnum.DEMAND_FILE.getValue());
|
||||||
demandAttachFolderItemReq.setFolderUuid(RandomUtil.generateString(32));
|
demandAttachFolderItemReq.setFolderUuid(RandomUtil.generateString(32));
|
||||||
|
// 利元亨定制
|
||||||
|
TagReq tagReq = new TagReq();
|
||||||
|
tagReq.setTag1(projectNodeId);
|
||||||
|
demandAttachFolderItemReq.setTagReq(tagReq);
|
||||||
demandAttachFolderItemReqList.add(demandAttachFolderItemReq);
|
demandAttachFolderItemReqList.add(demandAttachFolderItemReq);
|
||||||
demandAttachBatchCreateNormalDirReq.setFolderItems(demandAttachFolderItemReqList);
|
demandAttachBatchCreateNormalDirReq.setFolderItems(demandAttachFolderItemReqList);
|
||||||
log.info("批量创建需求附件文件夹请求参数:{}", demandAttachBatchCreateNormalDirReq);
|
log.info("批量创建需求附件文件夹请求参数:{}", demandAttachBatchCreateNormalDirReq);
|
||||||
@@ -3890,6 +3922,8 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
|||||||
FolderItemReq folderItemReq = new FolderItemReq();
|
FolderItemReq folderItemReq = new FolderItemReq();
|
||||||
folderItemReq.setFolderName(dirNodeInfo.getDirName());
|
folderItemReq.setFolderName(dirNodeInfo.getDirName());
|
||||||
folderItemReq.setFolderUuid(dirNodeInfo.getUuId());
|
folderItemReq.setFolderUuid(dirNodeInfo.getUuId());
|
||||||
|
// 利元亨定制
|
||||||
|
folderItemReq.setTagReq(dirNodeInfo.getTagReq());
|
||||||
folderItemReqList.add(folderItemReq);
|
folderItemReqList.add(folderItemReq);
|
||||||
}
|
}
|
||||||
batchCreateNormalDirReq.setFolderItems(folderItemReqList);
|
batchCreateNormalDirReq.setFolderItems(folderItemReqList);
|
||||||
|
|||||||
@@ -4513,6 +4513,11 @@ public class TaskServiceImpl implements ITaskService {
|
|||||||
if (CollectionUtils.isEmpty(performanceList)) {
|
if (CollectionUtils.isEmpty(performanceList)) {
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
List<SpdmTaskVo> taskList = mapper.getTaskListByIdList(Collections.singletonList(taskId));
|
||||||
|
if (CollectionUtils.isEmpty(taskList)) {
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
SpdmTaskVo spdmTaskVo = taskList.get(0);
|
||||||
// 创建指标
|
// 创建指标
|
||||||
LocalDateTime createTime = LocalDateTime.now();
|
LocalDateTime createTime = LocalDateTime.now();
|
||||||
BatchCreateDirItem batchCreateDirItem = new BatchCreateDirItem();
|
BatchCreateDirItem batchCreateDirItem = new BatchCreateDirItem();
|
||||||
@@ -4520,6 +4525,9 @@ public class TaskServiceImpl implements ITaskService {
|
|||||||
taskDirNodeInfo.setUuId(taskId);
|
taskDirNodeInfo.setUuId(taskId);
|
||||||
taskDirNodeInfo.setUuIdOwnType(NodeTypeEnum.TASK.getValue());
|
taskDirNodeInfo.setUuIdOwnType(NodeTypeEnum.TASK.getValue());
|
||||||
taskDirNodeInfo.setDirName(taskName);
|
taskDirNodeInfo.setDirName(taskName);
|
||||||
|
TagReq taskTagReq = new TagReq();
|
||||||
|
BeanUtils.copyProperties(spdmTaskVo,taskTagReq);
|
||||||
|
taskDirNodeInfo.setTagReq(taskTagReq);
|
||||||
batchCreateDirItem.setParentDirNodeInfo(taskDirNodeInfo);
|
batchCreateDirItem.setParentDirNodeInfo(taskDirNodeInfo);
|
||||||
List<DirNodeInfo> childDirNodeInfos = new ArrayList<>();
|
List<DirNodeInfo> childDirNodeInfos = new ArrayList<>();
|
||||||
for (SimulationPerformance performance : performanceList) {
|
for (SimulationPerformance performance : performanceList) {
|
||||||
@@ -4537,6 +4545,9 @@ public class TaskServiceImpl implements ITaskService {
|
|||||||
performanceDirNodeInfo.setUuIdOwnType(NodeTypeEnum.PERFORMANCE.getValue());
|
performanceDirNodeInfo.setUuIdOwnType(NodeTypeEnum.PERFORMANCE.getValue());
|
||||||
performanceDirNodeInfo.setParentUuId(taskId);
|
performanceDirNodeInfo.setParentUuId(taskId);
|
||||||
performanceDirNodeInfo.setDirName(StringUtils.isNotBlank(performance.getNodeName()) ? performance.getNodeName() : performance.getPerformanceName());
|
performanceDirNodeInfo.setDirName(StringUtils.isNotBlank(performance.getNodeName()) ? performance.getNodeName() : performance.getPerformanceName());
|
||||||
|
TagReq performancTtagReq = new TagReq();
|
||||||
|
BeanUtils.copyProperties(spdmTaskVo,performancTtagReq);
|
||||||
|
performanceDirNodeInfo.setTagReq(performancTtagReq);
|
||||||
childDirNodeInfos.add(performanceDirNodeInfo);
|
childDirNodeInfos.add(performanceDirNodeInfo);
|
||||||
}
|
}
|
||||||
simulationPerformanceService.saveBatch(performanceList);
|
simulationPerformanceService.saveBatch(performanceList);
|
||||||
|
|||||||
Reference in New Issue
Block a user