From 1976207d2e36c6df1362bda732f4f93dba88a3fb Mon Sep 17 00:00:00 2001 From: daiqy88 Date: Thu, 13 Nov 2025 14:30:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E5=9C=B0=E5=9B=BE=E8=AF=84?= =?UTF-8?q?=E5=AE=A1=E6=95=85=E9=9A=9C=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/req/flow/GetFlowTemplateReq.java | 4 ++-- .../task/ISimuluationTaskPoolFeignClient.java | 2 +- .../system/model/entity/AppCenterItemBean.java | 4 ++-- .../impl/SimulationApproveServiceImpl.java | 1 - .../impl/SimulationTaskPoolServiceImpl.java | 15 +++++++++++++-- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/capability/src/main/java/com/sdm/capability/model/req/flow/GetFlowTemplateReq.java b/capability/src/main/java/com/sdm/capability/model/req/flow/GetFlowTemplateReq.java index 0b43b664..f51876b0 100644 --- a/capability/src/main/java/com/sdm/capability/model/req/flow/GetFlowTemplateReq.java +++ b/capability/src/main/java/com/sdm/capability/model/req/flow/GetFlowTemplateReq.java @@ -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; diff --git a/common/src/main/java/com/sdm/common/feign/inter/task/ISimuluationTaskPoolFeignClient.java b/common/src/main/java/com/sdm/common/feign/inter/task/ISimuluationTaskPoolFeignClient.java index 87077284..e58f9543 100644 --- a/common/src/main/java/com/sdm/common/feign/inter/task/ISimuluationTaskPoolFeignClient.java +++ b/common/src/main/java/com/sdm/common/feign/inter/task/ISimuluationTaskPoolFeignClient.java @@ -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") diff --git a/system/src/main/java/com/sdm/system/model/entity/AppCenterItemBean.java b/system/src/main/java/com/sdm/system/model/entity/AppCenterItemBean.java index ed05bc51..e2287588 100644 --- a/system/src/main/java/com/sdm/system/model/entity/AppCenterItemBean.java +++ b/system/src/main/java/com/sdm/system/model/entity/AppCenterItemBean.java @@ -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; // 应用创建时间 } diff --git a/system/src/main/java/com/sdm/system/service/impl/SimulationApproveServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/SimulationApproveServiceImpl.java index 8a1217d4..bf35df1e 100644 --- a/system/src/main/java/com/sdm/system/service/impl/SimulationApproveServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/SimulationApproveServiceImpl.java @@ -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审批流程失败"); diff --git a/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java index 9d20c61b..33e841df 100644 --- a/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java +++ b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java @@ -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); }