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

Merge branch 'main' of http://carsafe.uicp.cn/toolchaintechnologycenter/spdm-backend

Browse Source
This commit is contained in:
gulongcheng
2026-01-21 16:01:42 +08:00
parent c8ddc5920e 106390fdfc
commit 5a30c79f02
16 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/src/main/resources/application-dev-190.yml
View File

@@ -130,6 +130,7 @@ security:
- /data/uploadFiles
- /data/initNewTenant
- /data/getMinioPresignedUrl
- /data/getPublicDownloadUrl
data:
storage-monitor:

1
data/src/main/resources/application-dev-65.yml
View File

@@ -130,6 +130,7 @@ security:
- /data/uploadFiles
- /data/initNewTenant
- /data/getMinioPresignedUrl
- /data/getPublicDownloadUrl
data:
storage-monitor:

1
data/src/main/resources/application-local.yml
View File

@@ -135,6 +135,7 @@ security:
- /data/uploadFiles
- /data/initNewTenant
- /data/getMinioPresignedUrl
- /data/getPublicDownloadUrl
data:
storage-monitor:

1
data/src/main/resources/application-lyric.yml
View File

@@ -130,6 +130,7 @@ security:
- /data/uploadFiles
- /data/initNewTenant
- /data/getMinioPresignedUrl
- /data/getPublicDownloadUrl
data:
storage-monitor:

6
project/src/main/java/com/sdm/project/controller/SimulationRunController.java
View File

@@ -368,9 +368,9 @@ public class SimulationRunController implements ISimulationRunFeignClient {
/**
* 归档算例下指标图片报告等结果数据到任务下
*/
@PostMapping("/synKeyResultToTask")
public SdmResponse synKeyResultToTask(@RequestBody KeyResultReq req) {
return runService.synKeyResultToTask(req);
@PostMapping("/syncKeyResultToTask")
public SdmResponse syncKeyResultToTask(@RequestBody KeyResultReq req) {
return runService.syncKeyResultToTask(req);
}
}

2
project/src/main/java/com/sdm/project/service/ISimulationRunService.java
View File

@@ -104,6 +104,6 @@ public interface ISimulationRunService extends IService<SimulationRun> {
SdmResponse<TaskRunPo> detail(SpdmTaskRunReq req);
SdmResponse synKeyResultToTask(KeyResultReq req);
SdmResponse syncKeyResultToTask(KeyResultReq req);
}

6
project/src/main/java/com/sdm/project/service/handle/LyricQueryDemandFileHandler.java
View File

@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@@ -67,8 +68,9 @@ public class LyricQueryDemandFileHandler implements IQueryDemandFileHandler {
fileMetadataInfoResp.setFileType(FileBizTypeEnum.DEMAND_FILE.getValue());
fileMetadataInfoResp.setFileSize(attachmentInfo.getFileSize());
fileMetadataInfoResp.setCreatorName(StringUtils.isNotBlank(attachmentInfo.getCreateBy()) ? attachmentInfo.getCreateBy() : "EPUser");
fileMetadataInfoResp.setCreateTime(LocalDateTime.parse(attachmentInfo.getCreateTime()));
fileMetadataInfoResp.setUpdateTime(LocalDateTime.parse(attachmentInfo.getModifyTime()));
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
fileMetadataInfoResp.setCreateTime(LocalDateTime.parse(attachmentInfo.getCreateTime(), formatter));
fileMetadataInfoResp.setUpdateTime(LocalDateTime.parse(attachmentInfo.getModifyTime(), formatter));
resultList.add(fileMetadataInfoResp);
}
}

4
project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
View File

@@ -1539,7 +1539,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
try {
// 获取临时路径中脚本生成的报告
String reportName = "report_" +
LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) +
LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) +
".docx";
FileInputStream fileInputStream = new FileInputStream(TEMP_REPORT_PATH + randomId + File.separator + reportName);
fileData = fileInputStream.readAllBytes();
@@ -2040,7 +2040,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
}
@Override
public SdmResponse synKeyResultToTask(KeyResultReq req) {
public SdmResponse syncKeyResultToTask(KeyResultReq req) {
SimulationRun simulationRun = this.lambdaQuery().eq(SimulationRun::getUuid, req.getRunId()).one();
if (simulationRun == null) {
return SdmResponse.failed("算例不存在");

7
project/src/main/resources/mapper/SimulationDemandMapper.xml
View File

@@ -177,11 +177,8 @@
INNER JOIN simulation_demand_extra is_mold
ON sd.uuid = is_mold.demand_id
AND is_mold.property_name = 'isMoldMaking'
<if test="req.isMoldMaking != null and req.isMoldMaking == 'Y'">
and is_mold.property_value = 'Y'
</if>
<if test="req.isMoldMaking != null and req.isMoldMaking == 'N'">
and is_mold.property_value = 'N'
<if test="req.isMoldMaking != null">
AND is_mold.property_value = #{req.isMoldMaking}
</if>
LEFT JOIN simulation_demand_extra mold_material
ON sd.uuid = mold_material.demand_id

5
system/src/main/java/com/sdm/system/controller/SystemApproveController.java
View File

@@ -50,6 +50,11 @@ public class SystemApproveController implements IApproveFeignClient {
return approveServer.queryApproveFlowStatus(flowId);
}
@GetMapping("queryNewApproveFlowStatus")
public SdmResponse queryNewApproveFlowStatus(@RequestParam("flowId") String flowId) {
return approveServer.queryNewApproveFlowStatus(flowId);
}
/**
* 根据flowId批量查询审批详情
* @param flowIds

2
system/src/main/java/com/sdm/system/service/ISimulatinoApprovalService.java
View File

@@ -58,6 +58,8 @@ public interface ISimulatinoApprovalService {
*/
SdmResponse queryApproveFlowStatus(String flowId);
SdmResponse queryNewApproveFlowStatus(String flowId);
SdmResponse queryBatchApproveFlowStatus(List<String> flowIds);
/**

25
system/src/main/java/com/sdm/system/service/impl/SimulationApproveServiceImpl.java
View File

@@ -53,6 +53,9 @@ public class SimulationApproveServiceImpl implements ISimulatinoApprovalService
@Value("${cid.flow.queryApproveDetail}")
private String queryFlowDetailPath;
@Value("${cid.flow.queryNewApproveDetail}")
private String queryNewApproveDetail;
@Value("${cid.flow.stopApproveFlow}")
private String stopFlowPath;
@@ -306,6 +309,28 @@ public class SimulationApproveServiceImpl implements ISimulatinoApprovalService
return sdmResponse;
}
@Override
public SdmResponse queryNewApproveFlowStatus( String flowId)
{
SdmResponse sdmResponse = SdmResponse.success();
LaunchApproveReq flowBean = approveMapper.querySimulationApproveFlowByCidFlowId(flowId);
if(flowBean == null){
sdmResponse = SdmResponse.failed("评审流程不存在");
}
else
{
String url = cidUrl+queryNewApproveDetail;
JSONArray array = queryCidApproveFlowStatus(flowBean.cidFlowId, flowBean.templateId,flowBean.tenantId,url);
if(array != null){
sdmResponse.setData(array);
}
else{
sdmResponse = SdmResponse.failed("获取评审流程状态信息失败");
}
}
return sdmResponse;
}
@Override
public SdmResponse queryBatchApproveFlowStatus(List<String> flowIds) {
SdmResponse sdmResponse ;

1
system/src/main/resources/application-dev-190.yml
View File

@@ -164,6 +164,7 @@ cid:
launchApprove: /spdm-flow/startFlow
queryFlowTemplate: /spdm-flow/listProcessByGroup
queryApproveDetail: /spdm-flow/queryFlowNodeDetail
queryNewApproveDetail: /spdm-flow/queryNewFlowNodeDetail
stopApproveFlow: /spdm-flow/stopFlow
group: SPDM
# 单次批量查询cid审批流详情的条数

1
system/src/main/resources/application-dev-65.yml
View File

@@ -164,6 +164,7 @@ cid:
launchApprove: /spdm-flow/startFlow
queryFlowTemplate: /spdm-flow/listProcessByGroup
queryApproveDetail: /spdm-flow/queryFlowNodeDetail
queryNewApproveDetail: /spdm-flow/queryNewFlowNodeDetail
stopApproveFlow: /spdm-flow/stopFlow
group: SPDM
# 单次批量查询cid审批流详情的条数

1
system/src/main/resources/application-local.yml
View File

@@ -164,6 +164,7 @@ cid:
launchApprove: /spdm-flow/startFlow
queryFlowTemplate: /spdm-flow/listProcessByGroup
queryApproveDetail: /spdm-flow/queryFlowNodeDetail
queryNewApproveDetail: /spdm-flow/queryNewFlowNodeDetail
stopApproveFlow: /spdm-flow/stopFlow
group: SPDM
# 单次批量查询cid审批流详情的条数

1
system/src/main/resources/application-lyric.yml
View File

@@ -164,6 +164,7 @@ cid:
launchApprove: /spdm-flow/startFlow
queryFlowTemplate: /spdm-flow/listProcessByGroup
queryApproveDetail: /spdm-flow/queryFlowNodeDetail
queryNewApproveDetail: /spdm-flow/queryNewFlowNodeDetail
stopApproveFlow: /spdm-flow/stopFlow
group: SPDM
# 单次批量查询cid审批流详情的条数