lidongyang/tvs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
zhuxinru
2025-10-31 11:20:37 +08:00
parent 06730e5d57 c9a325fdd6
commit 89bb4d7a11
2 changed files with 0 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/PbsServiceImpl.java
View File

@@ -99,16 +99,6 @@ public class PbsServiceImpl implements PbsService {
@Override
public SdmResponse<JSONObject> queryLoadcaseAllRun(QueryLoadcaseAllRunReq req) {
// String company = ThreadLocalContext.getUserContext().getUser().getTenantId();
// List<ProjectRunBean> projectRunBeans = projectMapper.getProjectLoadcaseAllRuns(req.getLoadcaseId(), company);
// for (ProjectRunBean runBean : projectRunBeans) {
// List<ProjectRunResultBean> runResultBeans = projectMapper.getRunAllResults(runBean.getId(), company);
// if (!CollectionUtils.isEmpty(runResultBeans)) {
//// runResultBeans.forEach(runResultBean -> runResultBean.setLoadcasePerformanceBean(projectMapper.getPerformanceById(runResultBean.getPerformanceId(), company)));
// runBean.setRunResults(runResultBeans);
// }
// runBean.setRunResults(runResultBeans);
// }
return SdmResponse.success();
}

119
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/ProjectServiceImpl.java
View File

@@ -110,7 +110,6 @@ public class ProjectServiceImpl implements ProjectService {
@Resource
private TenantProperties tenantProperties;
;
@Value("${file.rootPath}")
private String rootPath;
@@ -364,14 +363,6 @@ public class ProjectServiceImpl implements ProjectService {
} else {
if (projectMapper.delProjectPhase(phaseName, projectName) <= 0) {
result = Constant.PROJECT_PHASE_DEL_FAIL;
} else {
// String phasePath = Tools.getRootPath(rootPath, ThreadLocalContext.getUserContext().getUser().getTenantId()) + File.separator + phaseBean.getPhasePath();
// File phaseDir = new File(phasePath);
// if (phaseDir.exists()) {
// if (!dataService.reverseDeleteDataFiles(phaseDir)) {
// result = Constant.PROJECT_PHASEDIR_DEL_FAIL;
// }
// }
}
}
return result;
@@ -420,24 +411,6 @@ public class ProjectServiceImpl implements ProjectService {
req.setTenantId(ThreadLocalContext.getUserContext().getUser().getTenantId());
req.setOperation("M");
svsService.pushProjectPhase(req);
// if (!phaseBean.getBeginTime().equals(beginTime)) {
// JSONObject jsonObject = new JSONObject();
// jsonObject.put("project", projectName);
// jsonObject.put("phase", phaseName);
// String content = jsonObject.toString();
// List<User> projectRelateMembers = getProjectRelateMember(projectName);
// List<String> idCodes = new ArrayList<>();
// for (User user : projectRelateMembers) {
// String idCode = user.getJobNumber();
// if (idCodes.contains(idCode)) {
// continue;
// } else {
// idCodes.add(idCode);
// }
// systemService.sendNotice((byte) 11, idCode, user.getName(), ThreadLocalContext.getIdCode(),
// ThreadLocalContext.getUserContext().getUser().getName(), content, String.valueOf(phaseBean.getId()));
// }
// }
}
}
return result;
@@ -543,23 +516,15 @@ public class ProjectServiceImpl implements ProjectService {
try {
log.info("开始同步执行脚本");
Process process = Runtime.getRuntime().exec(commands);
// log.info("开始获取脚本错误日志");
// new RunThread(process.getErrorStream(), "executePython", true).run();
log.info("准备获取脚本输出");
if (req.getHasReturn() != null && req.getHasReturn() == 1) {
log.info("开始获取脚本输出");
// BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
BufferedInputStream reader = new BufferedInputStream(process.getInputStream());
byte[] line = new byte[1024];
while (reader.read(line) > 0) {
log.info("executePython：" + line);
result.add(Arrays.toString(line));
}
// String line;
// while ((line = reader.readLine()) != null) {
// log.info("executePython：" + line);
// result.add(line);
// }
}
log.info("脚本执行完成");
runningStatus = process.waitFor();
@@ -574,7 +539,6 @@ public class ProjectServiceImpl implements ProjectService {
} else {
log.info(commands + "执行脚本完成！");
}
// log.info("返回结果：" + result);
return SdmResponse.success(result);
}
@@ -1433,34 +1397,6 @@ public class ProjectServiceImpl implements ProjectService {
projectMapper.addLoadcaseBatch(req.getLoadcases());
String company = ThreadLocalContext.getUserContext().getUser().getTenantId();
if (!CollectionUtils.isEmpty(loadcaseUserList)) {
// TODO 消息2.1
// List<CommonNewMsgInfoVo> commonNewMsgInfoVoList = new ArrayList<>();
// for (LoadcaseMemberBean loadcaseMemberBean : loadcaseUserList) {
// CommonNewMsgInfoVo commonNewMsgInfoVo = new CommonNewMsgInfoVo();
// commonNewMsgInfoVo.setGroupTitle("分析项3天内预计结束到期提醒");
// commonNewMsgInfoVo.setMessageTitle("分析项3天内预计结束到期提醒");
// commonNewMsgInfoVo.setMsgContent(req.getLoadcases().get(0).getProjectId() + "项目的" + req.getLoadcases().stream().map(ProjectLoadcaseBean::getLoadcaseName).collect(Collectors.joining(",")) +"分析项即将到期");
// commonNewMsgInfoVo.setSender(ThreadLocalContext.getUserContext().getUser().getJobNumber());
// commonNewMsgInfoVo.setGroupType(0);
// commonNewMsgInfoVo.setMessageType(0);
// commonNewMsgInfoVo.setWorkerName(loadcaseMemberBean.getMemberName());
// commonNewMsgInfoVo.setServiceName("SIM");
// commonNewMsgInfoVo.setModelName("SIM");
// commonNewMsgInfoVo.setBusinessId("");
// commonNewMsgInfoVo.setBusinessType(MsgInfoBusinessTypeEnums.stationCodeQueryDetails.getValues());
// commonNewMsgInfoVo.setSkipId("");
// commonNewMsgInfoVo.setWhetherSupportSkip(1);
// commonNewMsgInfoVo.setWorkId("");
// commonNewMsgInfoVoList.add(commonNewMsgInfoVo);
// }
// log.info("addLoadcase 分析项3天内预计结束到期提醒发送消息，参数为：{}",commonNewMsgInfoVoList);
// String sendMessageResult = "";
// try {
// sendMessageResult = msgInfoGrpcService.newSendSingleMessage(commonNewMsgInfoVoList);
// }catch (Exception ex) {
// log.error("addLoadcase 分析项3天内预计结束到期提醒调用消息中心接口异常，原因为：{}",ex.getMessage());
// }
// log.info("addLoadcase 分析项3天内预计结束到期提醒发送消息，返回值为：{}",sendMessageResult);
projectMapper.addLoadcaseUserBatch(loadcaseUserList);
}
// 评审状态直接通过，青山和总院推送待办数据
@@ -1516,8 +1452,6 @@ public class ProjectServiceImpl implements ProjectService {
JSONObject disciplineJson = new JSONObject();
disciplineJson.put("type", DISCIPLINE_TAG);
disciplineJson.put("bean", disciplineBean);
// List<DisciplineMemberBean> disciplineMembers = projectMapper.getDisciplineAllMembers(disciplineBean.getId(), company);
// disciplineJson.put("members", disciplineMembers);
List<ProjectLoadcaseBean> loadcaseBeans = projectMapper.getDisciplineLoadcase(disciplineBean.getId(), 0, req.getProjectNode(), company);
if (!CollectionUtils.isEmpty(loadcaseBeans)) {
List<JSONObject> loadcaseJsons = new ArrayList<>();
@@ -1668,34 +1602,6 @@ public class ProjectServiceImpl implements ProjectService {
projectMapper.addLoadcaseBatch(req.getLoadcaseBeans());
}
if (!CollectionUtils.isEmpty(req.getLoadcaseMemberBeans())) {
// TODO 消息2.2
// List<CommonNewMsgInfoVo> commonNewMsgInfoVoList = new ArrayList<>();
// for (LoadcaseMemberBean loadcaseMemberBean : req.getLoadcaseMemberBeans()) {
// CommonNewMsgInfoVo commonNewMsgInfoVo = new CommonNewMsgInfoVo();
// commonNewMsgInfoVo.setGroupTitle("分析项3天内预计结束到期提醒");
// commonNewMsgInfoVo.setMessageTitle("分析项3天内预计结束到期提醒");
// commonNewMsgInfoVo.setMsgContent(req.getProjectId() + "项目的" + req.getLoadcaseBeans().stream().map(ProjectLoadcaseBean::getLoadcaseName).collect(Collectors.joining(",")) +"分析项即将到期");
// commonNewMsgInfoVo.setSender(ThreadLocalContext.getUserContext().getUser().getJobNumber());
// commonNewMsgInfoVo.setGroupType(0);
// commonNewMsgInfoVo.setMessageType(0);
// commonNewMsgInfoVo.setWorkerName(loadcaseMemberBean.getMemberName());
// commonNewMsgInfoVo.setServiceName("SIM");
// commonNewMsgInfoVo.setModelName("SIM");
// commonNewMsgInfoVo.setBusinessId("");
// commonNewMsgInfoVo.setBusinessType(MsgInfoBusinessTypeEnums.stationCodeQueryDetails.getValues());
// commonNewMsgInfoVo.setSkipId("");
// commonNewMsgInfoVo.setWhetherSupportSkip(1);
// commonNewMsgInfoVo.setWorkId("");
// commonNewMsgInfoVoList.add(commonNewMsgInfoVo);
// }
// log.info("updateProjectVersion 分析项3天内预计结束到期提醒发送消息，参数为：{}",commonNewMsgInfoVoList);
// String sendMessageResult = "";
// try {
// sendMessageResult = msgInfoGrpcService.newSendSingleMessage(commonNewMsgInfoVoList);
// }catch (Exception ex) {
// log.error("updateProjectVersion 分析项3天内预计结束到期提醒调用消息中心接口异常，原因为：{}",ex.getMessage());
// }
// log.info("updateProjectVersion 分析项3天内预计结束到期提醒发送消息，返回值为：{}",sendMessageResult);
projectMapper.addLoadcaseUserBatch(req.getLoadcaseMemberBeans());
}
if (!CollectionUtils.isEmpty(req.getPerformanceBeans())) {
@@ -2057,12 +1963,6 @@ public class ProjectServiceImpl implements ProjectService {
}
PushDevelopPlanThread thread = new PushDevelopPlanThread(attachmentGrpcClientService, perfDevelopPlanGrpcService, req.getProjectId(), map);
SdmThreadService.builder().execute(thread);
// String company = ThreadLocalContext.getUserContext().getUser().getTenantId();
// // 青山和总院推送待办数据
// if (tenantProperties.getQingshan().equals(company) || tenantProperties.getZongyuan().equals(company)) {
// PushLoadcaseInfoThread pushLoadcaseInfoThread = new PushLoadcaseInfoThread(updateLoadcaseList);
// SdmThreadService.builder().execute(pushLoadcaseInfoThread);
// }
// 只有辰致推送更新产品需求
if (tenantProperties.getChenzhi().equals(company)) {
UpdateProductDemandThread demand = new UpdateProductDemandThread(updateLoadcaseList, ThreadLocalContext.getIdCode(), projectMapper);
@@ -2352,8 +2252,6 @@ public class ProjectServiceImpl implements ProjectService {
productDemand.setCreateBy(info.getCreateBy());
String pjObjectId = info.getPjObjectId();
log.info("pjObjectId：{}", pjObjectId);
// kbProjectLibraryId = plmService.convertProjectIdToKbProjectLibraryId(info.getProjectId());
// log.info("kbProjectLibraryId为：{}",kbProjectLibraryId);
if (StringUtils.isNotBlank(pjObjectId)) {
try {
log.info("queryKbProjectLibraryByDataSourceAndSourceProjectId");
@@ -3008,28 +2906,17 @@ public class ProjectServiceImpl implements ProjectService {
log.info("maxVersion为：{},inputVersion为：{}", maxVersion, req.getInputVersion());
log.info("输入表单id：{}，版本号：{}，添加回退记录", inputForm.getId(), maxVersion);
projectMapper.addInputFormReject(inputForm.getId(), req.getRejectReason(), req.getUpdateTime(), fileJsonStr, req.getInputVersion(), req.getTenantId());
// InputFormReject inputFormReject = projectMapper.getInputFormReject(inputForm.getId(),req.getInputVersion(),req.getTenantId());
// if (ObjectUtils.isEmpty(inputFormReject)) {
// log.error("版本号：{}，已有回退记录",req.getInputVersion());
// }else {
// }
// 租户不是辰致，且为仿真总师创建的输入表单
if (!tenantProperties.getChenzhi().equals(req.getTenantId()) && inputFormType == 1) {
// todo 给仿真总师发消息
// systemService.sendNotice();
} else {
// 自建的产品需求
if (productDemandType == 1) {
// todo 给产品需求创建者发消息
// systemService.sendNotice();
} else {
// 给PLM发消息
plmService.rejectInputForm(json);
}
}
return SdmResponse.success();
}
@@ -3126,12 +3013,6 @@ public class ProjectServiceImpl implements ProjectService {
@Override
public SdmResponse<JSONObject> getRelateCount(GetRelateCountReq req) {
String company = ThreadLocalContext.getUserContext().getUser().getTenantId();
/*
设计：已关联仿真xx项，已关联试验xx项
仿真：已关联设计xx项，已关联试验xx项
试验：已关联设计xx项，已关联仿真xx项
按各自的主体计算，绑定一个或多个都计算为已绑定
*/
int bomRelateLoadcase = 0;
int bomRelateTest = 0;
List<String> bomIds = projectMapper.getBomRelateLoadcase(req.getProjectId(), req.getProjectNode(), company);