From a53ab71161c5a546c70fa22ec5530cc4b2c7a672 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 03 十二月 2024 17:12:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
index 6e662f9..b200894 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
@@ -1,5 +1,7 @@
package com.vci.web.service.impl;
+import com.vci.bo.FlowNoticeInfo;
+import com.vci.constant.WFVariablesKeyConstant;
import com.vci.corba.common.PLException;
import com.vci.corba.common.data.UserEntityInfo;
import com.vci.corba.omd.data.BusinessObject;
@@ -7,6 +9,7 @@
import com.vci.corba.workflow.data.FlowInstanceInfo;
import com.vci.corba.workflow.data.MapTransfersInfo;
import com.vci.corba.workflow.data.TasksAssignedInfo;
+import com.vci.dto.ProcessStartConfigDTO;
import com.vci.dto.ProcessTemplateVO;
import com.vci.dto.VciFileObjectDTO;
import com.vci.omd.utils.ObjectTool;
@@ -14,23 +17,19 @@
import com.vci.pagemodel.ProcessOutcomeVO;
import com.vci.pagemodel.ProcessTaskVO;
import com.vci.pagemodel.ProcessUserVO;
+import com.vci.starter.web.annotation.FlowNotifyAfter;
+import com.vci.starter.web.annotation.FlowNotifyBefore;
+import com.vci.starter.web.annotation.FlowNotifyWeb;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.enumpck.DataSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.SessionInfo;
+import com.vci.starter.web.util.BusAnnotationUtil;
import com.vci.starter.web.util.LangBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.annotation.FlowNotifyAfter;
-import com.vci.web.annotation.FlowNotifyBefore;
-import com.vci.web.annotation.FlowNotifyWeb;
-import com.vci.bo.FlowNoticeInfo;
-import com.vci.constant.WFVariablesKeyConstant;
import com.vci.web.dao.WebProcessDaoI;
-import com.vci.dto.ProcessStartConfigDTO;
-import com.vci.web.properties.WebProperties;
import com.vci.web.service.*;
-import com.vci.web.util.BusAnnotationUtil;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -69,11 +68,7 @@
private WebProcessDaoI processDao;
@Autowired
- private OsLifeCycleServiceI lifeCycleService;
-
-
- @Autowired
- private WebProperties webProperties;
+ private WebLifeCycleServiceI lifeCycleService;
/**
* 鏂囦欢涓婁紶鏈嶅姟
@@ -261,7 +256,11 @@
throw WebUtil.getVciBaseException(e);
}
if (StringUtils.isNotBlank(config.getStartStatus())) {
- lifeCycleService.transCboStatus(allCbo, config.getStartStatus());
+ try {
+ lifeCycleService.transCboStatus(allCbo, config.getStartStatus());
+ } catch (Exception e) {
+ throw new VciBaseException("鍚姩娴佺▼鏃讹紝鎵归噺璺冭縼鐢熷懡鍛ㄦ湡鐘舵�佸け璐ワ紒", new Object[]{}, e);
+ }
}
callAfter(processInstanceId,null,null,currentTime);
}
@@ -634,10 +633,19 @@
}
List<Map> mapList = boService.cbos2Map(workItemCbos);
callBefore(mapList,"suspend",note,currentTime);
- lifeCycleService.transCboStatus(needUpdateCbos, "Suspended");
+ try {
+ lifeCycleService.transCboStatus(needUpdateCbos, "Suspended");
+ } catch (Exception e) {
+ throw new VciBaseException("鎸傝捣娴佺▼鏃讹紝鎵归噺璺冭縼鐢熷懡鍛ㄦ湡鐘舵�佸け璐ワ紒", new Object[]{}, e);
+ }
callAfter(null,null,mapList,currentTime);
}
+ /**
+ * 鎭㈠娴佺▼
+ * @param executionId 娴佺▼涓婚敭
+ * @throws VciBaseException
+ */
@Override
public void resumeProcess(String executionId) throws VciBaseException {
WebUtil.alertNotNull(executionId, "娴佺▼鎵ц瀹炰緥鐨勪富閿�");
@@ -674,7 +682,11 @@
}
callBefore(null,"resume","",currentTime);
- lifeCycleService.transCboStatus(needUpdateCbos, "Executing");
+ try {
+ lifeCycleService.transCboStatus(needUpdateCbos, "Executing");
+ } catch (Exception e) {
+ throw new VciBaseException("鎭㈠娴佺▼鏃讹紝鎵归噺璺冭縼鐢熷懡鍛ㄦ湡鐘舵�佸け璐ワ紒", new Object[]{}, e);
+ }
callAfter(null,boService.cbos2Map(workItemCbos),null,currentTime);
}
--
Gitblit v1.9.3