From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001 From: ludc <ludc@vci-tech.com> Date: 星期四, 16 一月 2025 18:20:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebFlowServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebFlowServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebFlowServiceImpl.java index 6ca01fb..34970af 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebFlowServiceImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebFlowServiceImpl.java @@ -1,10 +1,14 @@ package com.vci.web.service.impl; +import com.mxgraph.model.mxCell; +import com.mxgraph.view.mxGraph; import com.vci.corba.common.PLException; import com.vci.corba.wf.data.ProcessCategoryInfo; import com.vci.corba.wf.data.ProcessDefinitionInfo; +import com.vci.pagemodel.DeployProcessVO; import com.vci.starter.web.exception.VciBaseException; import com.vci.starter.web.pagemodel.BaseQueryObject; +import com.vci.starter.web.pagemodel.BaseResult; import com.vci.starter.web.pagemodel.DataGrid; import com.vci.starter.web.util.Lcm.Func; import com.vci.starter.web.util.VciBaseUtil; @@ -15,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.swing.*; import java.util.Arrays; import java.util.Comparator; import java.util.Date; @@ -128,6 +133,47 @@ } /** + * 閮ㄧ讲娴佺▼ + * @param deployProcessVO + * @return + * @throws VciBaseException + */ + @Override + public BaseResult deployProcess(DeployProcessVO deployProcessVO) throws Exception { + VciBaseUtil.alertNotNull( + deployProcessVO,"娴佺▼閮ㄧ讲瀵硅薄", + deployProcessVO.getProcessCategoryId(),"娴佺▼鍒嗙被", + deployProcessVO.getXmlContext(),"娴佺▼妯℃澘鍐呭" + ); + //鍩虹鏍¢獙 + /*if(!checkTask()){ + BaseResult.fail("娴佺▼浠诲姟涓嶈兘閲嶅悕锛岃纭"); + } + if(!checkJoin()){ + BaseResult.fail("鍚堝苟鑺傜偣涓嶈兘閲嶅悕锛岃纭"); + } + if(!checkFork()){ + BaseResult.fail("鍒嗘敮鑺傜偣涓嶈兘閲嶅悕锛岃纭"); + } + if(!checkDecision()){ + BaseResult.fail("鍒ゆ柇鑺傜偣涓嶈兘閲嶅悕锛岃纭"); + } + if(!checkEdge()){ + BaseResult.fail("璺敱鍚嶇О鍜岃妭鐐瑰悕绉伴噸鍚嶏紝璇风‘璁�"); + } + */ + + boolean res = platformClientUtil.getWFService().deployProcess( + null, + deployProcessVO.getXmlContext(), + null, + deployProcessVO.getProcessCategoryId(), + deployProcessVO.getTaskInfos() + ); + return res ? BaseResult.success("娴佺▼閮ㄧ讲鎴愬姛锛�"):BaseResult.success("娴佺▼閮ㄧ讲澶辫触锛�"); + } + + /** * 鏍规嵁涓婚敭鍜屽悕绉版煡璇㈡祦绋嬪垎绫绘槸鍚﹀瓨鍦� * @param category * @return -- Gitblit v1.9.3