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

仿真地图评审故障修复

Browse Source
This commit is contained in:
daiqy88
2025-11-13 14:30:15 +08:00
parent 2faf3a0985
commit 1976207d2e
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
capability/src/main/java/com/sdm/capability/model/req/flow/GetFlowTemplateReq.java
View File

@@ -12,9 +12,9 @@ public class GetFlowTemplateReq {
public String templateType;
public int templateStatus;
public int templateStatus = -1;
public int approveType;
public int approveType = -1;
public long creator;

2
common/src/main/java/com/sdm/common/feign/inter/task/ISimuluationTaskPoolFeignClient.java
View File

@@ -6,7 +6,7 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@FeignClient(name = "taskpool")
@FeignClient(name = "task")
public interface ISimuluationTaskPoolFeignClient {
@PostMapping("/taskpool/approveHandleNotice")

4
system/src/main/java/com/sdm/system/model/entity/AppCenterItemBean.java
View File

@@ -34,9 +34,9 @@ public class AppCenterItemBean extends BaseBean {
public String comment; // 应用描述
public String tenantId; //租户ID
public long tenantId; //租户ID
public String creator; // 应用创建者
public long creator; // 应用创建者
public String createTime; // 应用创建时间
}

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

@@ -195,7 +195,6 @@ public class SimulationApproveServiceImpl implements ISimulatinoApprovalService
SdmResponse sdmResponse = SdmResponse.success();
String url = cidUrl+launchApprovePath;
String cidFlowId = launchCidApprovalFlow(flowBean.templateId, flowBean.userId,flowBean.tenantId,url);
if (cidFlowId.isEmpty()) {
sdmResponse = SdmResponse.failed("发起Cid审批流程失败");

15
task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java
View File

@@ -3,6 +3,7 @@ package com.sdm.task.service.impl;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.util.StringUtil;
import com.sdm.common.common.ResultCode;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.common.ThreadLocalContext;
@@ -418,8 +419,14 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
{
String approveContents = poolTreeObj.toJSONString();
int approveAction = 1;
String approveTemplateId = poolTreeObj.getString("approveTemplateId");
String approveTemplateName = poolTreeObj.getString("approveTemplateName");
if(StringUtil.isEmpty(approveTemplateId) || StringUtil.isEmpty(approveTemplateName))
{
return SdmResponse.failed("评审流程模版休息错误");
}
//发起评审
if(launchTaskPoolApprove(poolTree.approveTemplateId,poolTree.approveTemplateName,approveContents,approveAction))
if(launchTaskPoolApprove(approveTemplateId,approveTemplateId,approveContents,approveAction))
{
return SdmResponse.success();
}
@@ -1505,6 +1512,10 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
String contents = approveReq.approveContents;
int status = approveReq.approveStatus;
int approveAction = approveReq.approveAction;
long tenantId = approveReq.tenantId;
long userId = approveReq.userId;
ThreadLocalContext.setTenantId(tenantId);
ThreadLocalContext.setUserId(userId);
if(status == 2 && contents != null) //评审成功
{
switch(approveAction)
@@ -1528,7 +1539,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
*/
private void createTaskPoolApprovePostHandle(String approveContents)
{
JSONObject poolTreeObj = JSONObject.from(approveContents);
JSONObject poolTreeObj = JSONObject.parseObject(approveContents);
poolTreeObj.put("bApprove",false); //清除上次评审标记
createTaskPool(poolTreeObj);
}