diff --git a/pom.xml b/pom.xml index 5f5b0de..dab3fc0 100644 --- a/pom.xml +++ b/pom.xml @@ -16,13 +16,13 @@ https://github.com/YunaiV/ruoyi-vue-pro - 3.0.41 - 3.0.41 - 3.0.41 - 3.0.41 - 3.0.41 + 3.0.42 + 3.0.42 + 3.0.42 + 3.0.42 + 3.0.42 3.0.42 - 3.0.41 + 3.0.42 17 ${java.version} @@ -195,7 +195,7 @@ 中铜 ZStack 私服 http://172.16.46.63:30708/repository/test/ - false + true @@ -244,12 +244,12 @@ env-local local - - 172.16.46.63:30848 - local + localhost:8848 + + zgty-qms-local DEFAULT_GROUP - - + qms + 1234567890 1.0.0 diff --git a/zt-module-bpm/zt-module-bpm-server/pom.xml b/zt-module-bpm/zt-module-bpm-server/pom.xml index e0241d3..9642724 100644 --- a/zt-module-bpm/zt-module-bpm-server/pom.xml +++ b/zt-module-bpm/zt-module-bpm-server/pom.xml @@ -38,6 +38,11 @@ zt-module-capital-api ${business.supply.version} + + com.zt.plat + zt-module-product-api + ${business.mes.version} + com.zt.plat zt-module-qms-api diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/framework/rpc/config/RpcConfiguration.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/framework/rpc/config/RpcConfiguration.java index 0ab98bc..6334a1a 100644 --- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/framework/rpc/config/RpcConfiguration.java +++ b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/framework/rpc/config/RpcConfiguration.java @@ -1,6 +1,10 @@ package com.zt.plat.module.bpm.framework.rpc.config; -import com.zt.plat.module.capital.api.AmountCreditApplyApi; +import com.zt.plat.module.capital.api.splyAmountRequest.AmountRequestApi; +import com.zt.plat.module.capital.api.splyAmtCrdtAppl.AmountCreditApplyApi; +import com.zt.plat.module.product.api.MesProcessRoutApi; +import com.zt.plat.module.product.api.plan.MesCompanyPlanApi; +import com.zt.plat.module.product.api.plan.MesFactoryPlanApi; import com.zt.plat.module.system.api.dept.DeptApi; import com.zt.plat.module.system.api.dept.PostApi; import com.zt.plat.module.system.api.dict.DictDataApi; @@ -13,6 +17,6 @@ import org.springframework.context.annotation.Configuration; @Configuration(value = "bpmRpcConfiguration", proxyBeanMethods = false) @EnableFeignClients(clients = {RoleApi.class, DeptApi.class, PostApi.class, AdminUserApi.class, SmsSendApi.class, DictDataApi.class, - PermissionApi.class, AmountCreditApplyApi.class}) + PermissionApi.class, AmountCreditApplyApi.class, MesProcessRoutApi.class, MesFactoryPlanApi.class, MesCompanyPlanApi.class, AmountRequestApi.class}) public class RpcConfiguration { } diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsExecutionListener.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsExecutionListener.java new file mode 100644 index 0000000..f8467a8 --- /dev/null +++ b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsExecutionListener.java @@ -0,0 +1,54 @@ +package com.zt.plat.module.bpm.service.qms.listener; + +import com.alibaba.fastjson.JSONObject; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.module.qms.api.task.QmsApi; +import com.zt.plat.module.qms.api.task.dto.QmsBpmDTO; +import com.zt.plat.module.qms.enums.ErrorCodeConstants; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.flowable.engine.RuntimeService; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Map; + +import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception0; + + +/** + * QMS模块执行监听 + */ +@Component +@Slf4j +public class QmsExecutionListener implements JavaDelegate { + + @Autowired + private QmsApi qmsApi; + @Resource private RuntimeService runtimeService; + + @Override + @Transactional(rollbackFor = Exception.class) + public void execute(DelegateExecution execution) { + log.info("[QmsExecutionListener][execution({}) 被调用！变量有：{}]", execution.getId(), execution.getCurrentFlowableListener().getFieldExtensions()); + Map variables = execution.getVariables(); + JSONObject jsonObject = new JSONObject(variables); + + + + String insId = execution.getProcessInstanceId(); + String businessKey = execution.getProcessInstanceBusinessKey(); + QmsBpmDTO qmsBpmDTO = new QmsBpmDTO(insId, businessKey, jsonObject, ""); + Map v = runtimeService.getVariables(execution.getProcessInstanceId()); +// Object status = runtimeService.getVariable(execution.getProcessInstanceId(), WfProcessConstant.TASK_VARIABLE_PROCESS_TERMINATE); + CommonResult result = qmsApi.bpmCallback(qmsBpmDTO); + if (!result.isSuccess()) { + log.error("[QmsExecutionListener][execution({}) 回调失败！错误码：{}，错误信息：{}]", execution.getId(), result.getCode(), result.getMsg()); + throw exception0(ErrorCodeConstants.ERROR_CODE_MODULE_QMS_BPM, result.getMsg()); + } + } + +} \ No newline at end of file diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsTaskListener.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsTaskListener.java new file mode 100644 index 0000000..a0417e0 --- /dev/null +++ b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsTaskListener.java @@ -0,0 +1,44 @@ +package com.zt.plat.module.bpm.service.qms.listener; + +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.module.qms.api.task.QmsApi; +import com.zt.plat.module.qms.api.task.dto.QmsBpmDTO; +import com.zt.plat.module.qms.enums.ErrorCodeConstants; +import com.alibaba.fastjson.JSONObject; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.flowable.engine.delegate.TaskListener; +import org.flowable.task.service.delegate.DelegateTask; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Map; + +import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception0; + + +/** + * QMS模块任务监听 + */ +@Component +@Slf4j +public class QmsTaskListener implements TaskListener { + @Autowired + private QmsApi qmsApi; + @Override + @Transactional(rollbackFor = Exception.class) + public void notify(DelegateTask delegateTask) { + log.info("[QmsTaskListener][delegateTask({})]", delegateTask); + String state = delegateTask.getState(); + Map variables = delegateTask.getVariables(); + JSONObject jsonObject = new JSONObject(variables); + String insId = delegateTask.getProcessInstanceId(); + QmsBpmDTO qmsBpmDTO = new QmsBpmDTO(insId, "", jsonObject, state); + CommonResult result = qmsApi.bpmCallback(qmsBpmDTO); + if (!result.isSuccess()) { + log.error("[QmsExecutionListener][execution({}) 回调失败！错误码：{}，错误信息：{}]", delegateTask.getId(), result.getCode(), result.getMsg()); + throw exception0(ErrorCodeConstants.ERROR_CODE_MODULE_QMS_BPM, result.getMsg()); + } + } +}