toolchaintechnologycenter/spdm-backend
1
0
Fork 1
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:
lidongyang
2026-03-03 14:42:22 +08:00
parent f1ead69d7f 1c08d0635e
commit cf19690cba
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
capability/src/main/java/com/sdm/capability/controller/FlowController.java
View File

@@ -69,7 +69,7 @@ public class FlowController implements ISimulationFlowFeignClient {
@SysLog("发布流程模版草稿")
@PostMapping("/releaseFlowTemplate")
public SdmResponse releaseFlowTemplateDraft(@RequestBody @Validated ReleaseFlowTemplateReq req) {
return IFlowService.releaseFlowTemplate(req.uuid,req.versionType,req.approveTemplateName,req.approveTemplateId);
return IFlowService.releaseFlowTemplate(req.uuid,req.versionType,req.approveTemplateName,req.approveTemplateId,req.simulationPoolInfoList);
}
/**

9
capability/src/main/java/com/sdm/capability/model/req/flow/ReleaseFlowTemplateReq.java
View File

@@ -1,10 +1,14 @@
package com.sdm.capability.model.req.flow;
import com.sdm.capability.model.entity.SimulationFlowTaskBindInfo;
import com.sdm.common.entity.pojo.BaseEntity;
import lombok.Data;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.ArrayList;
import java.util.List;
@Data
public class ReleaseFlowTemplateReq extends BaseEntity {
public ReleaseFlowTemplateReq() {
@@ -19,4 +23,9 @@ public class ReleaseFlowTemplateReq extends BaseEntity {
public String approveTemplateId;
/**
* 绑定的工况
*/
public List<SimulationFlowTaskBindInfo> simulationPoolInfoList = new ArrayList();
}

3
capability/src/main/java/com/sdm/capability/service/IFlowService.java
View File

@@ -1,5 +1,6 @@
package com.sdm.capability.service;
import com.sdm.capability.model.entity.SimulationFlowTaskBindInfo;
import com.sdm.capability.model.entity.SimulationFlowTemplate;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.req.system.LaunchApproveReq;
@@ -45,7 +46,7 @@ public interface IFlowService {
* @param uuid
* @return
*/
SdmResponse releaseFlowTemplate(String uuid,int versionType,String approveTemplateName,String approveTemplateId);
SdmResponse releaseFlowTemplate(String uuid,int versionType,String approveTemplateName,String approveTemplateId,List<SimulationFlowTaskBindInfo> simulationPoolInfoList);
/**

10
capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.sdm.capability.service.impl;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -209,7 +210,7 @@ public class FlowServiceImpl extends BaseService implements IFlowService {
}
@Override
public SdmResponse releaseFlowTemplate(String uuid,int versionType,String approveTemplateName,String approveTemplateId) {
public SdmResponse releaseFlowTemplate(String uuid,int versionType,String approveTemplateName,String approveTemplateId,List<SimulationFlowTaskBindInfo> simulationPoolInfoList) {
SdmResponse response = SdmResponse.success();
String condition = "uuid='"+uuid+"'";
List<SimulationFlowTemplate> templates = flowMapper.queryFlowTemplateByCondition(condition);
@@ -230,6 +231,7 @@ public class FlowServiceImpl extends BaseService implements IFlowService {
}
else //发起评审
{
templateDraft.simulationPoolInfoList = simulationPoolInfoList;
SdmResponse approveRespond = launchApprove(templateDraft);
if(!approveRespond.isSuccess())
{
@@ -268,6 +270,7 @@ public class FlowServiceImpl extends BaseService implements IFlowService {
flowTemplateJson.put("flowId", flowTemplate.uuid);
flowTemplateJson.put("flowContents", flowTemplate.templateContent);
flowTemplateJson.put("viewContents", flowTemplate.viewContent);
flowTemplateJson.put("poolContents", flowTemplate.simulationPoolInfoList);
approveReq.approveContents = flowTemplateJson.toJSONString();
return approveFeignClient.launchApproval(approveReq);
}
@@ -539,6 +542,11 @@ public class FlowServiceImpl extends BaseService implements IFlowService {
flowTemplate.processDefinitionId = sdmResponse.getData().getProcessDefinitionId();
}
flowTemplate.templateStatus = 1;
// 绑定工况库
String poolContents = contentObj.getString("poolContents");
List<SimulationFlowTaskBindInfo> simulationPoolInfoList = JSON.parseArray(poolContents, SimulationFlowTaskBindInfo.class);
bindFLowTemplateAndTask(flowTemplate.templateCode, simulationPoolInfoList);
}
flowTemplate.approveType = approveStatus;
flowMapper.updateFlowTemplate(flowTemplate);