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

1、查询EP内网视图逻辑，兼容公司测试环境

Browse Source
This commit is contained in:
lidongyang
2026-01-28 10:30:33 +08:00
parent d3e9daacf5
commit 8804eabc5e
2 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java
View File

@@ -40,6 +40,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.mybatis.spring.MyBatisSystemException;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -1230,7 +1231,15 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
log.error("queryProjectInfo中syncProjectId为空");
return SdmResponse.success();
}
LyricVProjectToDM projectNode = lyricVProjectToDmService.lambdaQuery().eq(LyricVProjectToDM::getId, syncProjectId).one();
LyricVProjectToDM projectNode = null;
try {
// 根据projectId查询EP项目信息
projectNode = lyricVProjectToDmService.lambdaQuery().eq(LyricVProjectToDM::getId, syncProjectId).one();
} catch (MyBatisSystemException ex) {
// 查询发生异常，记录异常日志（可能是测试环境预期异常）
log.warn("查询项目信息时发生异常（可能是测试环境预期异常），项目id：{}，异常信息：{}",
syncProjectId, ex.getMessage());
}
log.info("根据syncProjectId：{}，查询到的项目信息为：{}", syncProjectId, projectNode);
return SdmResponse.success(projectNode);
}
@@ -1238,11 +1247,19 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
@Override
public SdmResponse queryProjectInfoList(EpProjectQueryReq req) {
PageHelper.startPage(req.getCurrent(), req.getSize());
List<LyricVProjectToDM> projectList = lyricVProjectToDmService.lambdaQuery()
.like(StringUtils.isNotBlank(req.getProjectNum()), LyricVProjectToDM::getProjectNum, req.getProjectNum())
.like(StringUtils.isNotBlank(req.getProjectName()), LyricVProjectToDM::getProjectName, req.getProjectName())
.like(StringUtils.isNotBlank(req.getDifficultyType()), LyricVProjectToDM::getDifficultyType, req.getDifficultyType())
.list();
List<LyricVProjectToDM> projectList = new ArrayList<>();
try {
// 拉取EP项目列表信息
projectList = lyricVProjectToDmService.lambdaQuery()
.like(StringUtils.isNotBlank(req.getProjectNum()), LyricVProjectToDM::getProjectNum, req.getProjectNum())
.like(StringUtils.isNotBlank(req.getProjectName()), LyricVProjectToDM::getProjectName, req.getProjectName())
.like(StringUtils.isNotBlank(req.getDifficultyType()), LyricVProjectToDM::getDifficultyType, req.getDifficultyType())
.list();
} catch (MyBatisSystemException ex) {
// 查询发生异常，记录异常日志（可能是测试环境预期异常）
log.warn("查询EP项目列表时发生异常（可能是测试环境预期异常），项目编号：{}，项目名称：{}，项目类型：{}，异常信息：{}",
req.getProjectNum(),req.getProjectName(),req.getDifficultyType(), ex.getMessage());
}
PageInfo<LyricVProjectToDM> page = new PageInfo<>(projectList);
return PageUtils.getJsonObjectSdmResponse(projectList, page);
}

15
project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
View File

@@ -57,6 +57,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.mybatis.spring.MyBatisSystemException;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -1102,9 +1103,17 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
BeanUtils.copyProperties(projectNode, spdmNodeDetailVo);
if (SYNC_PROJECT_SOURCE.equals(projectNode.getProjectSource())) {
// EP类型项目直接从视图拉取当前阶段的信息
LyricVProjectToDM lyricVProject = lyricVProjectToDmService.lambdaQuery()
.eq(StringUtils.isNotBlank(projectNode.getNodeCode()), LyricVProjectToDM::getProjectNum, projectNode.getNodeCode())
.one();
LyricVProjectToDM lyricVProject = null;
try {
// EP类型项目直接从视图拉取当前阶段的信息
lyricVProject = lyricVProjectToDmService.lambdaQuery()
.eq(StringUtils.isNotBlank(projectNode.getNodeCode()), LyricVProjectToDM::getProjectNum, projectNode.getNodeCode())
.one();
} catch (MyBatisSystemException ex) {
// 查询发生异常，记录异常日志（可能是测试环境预期异常）
log.warn("查询EP项目信息并设置当前阶段时发生异常（可能是测试环境预期异常），项目编号：{}，异常信息：{}",
projectNode.getNodeCode(), ex.getMessage());
}
if (ObjectUtils.isNotEmpty(lyricVProject)) {
spdmNodeDetailVo.setCurrentPhase(lyricVProject.getStage());
return SdmResponse.success(spdmNodeDetailVo);