From 93f7335e1a52591662d5d37f41ac352860b2ca2a Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期二, 04 六月 2024 18:39:50 +0800
Subject: [PATCH] 1、对象引用改动。

---
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java |   32 +++++++++++---------------------
 1 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java
index 0d760dc..57f82e7 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java
@@ -1,13 +1,14 @@
 package com.vci.web.dao.impl;
 
-import com.vci.base.common.utility.ObjectUtility;
-import com.vci.corba.common.VCIError;
-import com.vci.corba.framework.data.UserEntityInfo;
+import com.vci.client.bof.ClientLinkObject;
+import com.vci.common.utility.ObjectUtility;
+import com.vci.corba.common.PLException;
+import com.vci.corba.common.data.UserEntityInfo;
+import com.vci.corba.workflow.WorkflowService;
+import com.vci.corba.workflow.WorkflowServicePrx;
 import com.vci.corba.workflow.data.*;
-import com.vci.corba.workflow.method.WorkflowService;
 import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
 import com.vci.frameworkcore.pagemodel.SmUserVO;
-import com.vci.rmip.workflow.server.template.TasksAssigned;
 import com.vci.starter.web.constant.QueryOptionConstant;
 import com.vci.starter.web.exception.VciBaseException;
 import com.vci.starter.web.pagemodel.DataGrid;
@@ -16,7 +17,6 @@
 import com.vci.starter.web.util.BeanUtil;
 import com.vci.starter.web.util.VciBaseUtil;
 import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.constant.WFVariablesKeyConstant;
 import com.vci.web.dao.WebProcessDaoI;
 import com.vci.web.model.ProcessInstance;
 import com.vci.web.model.ProcessTask;
@@ -31,16 +31,11 @@
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientLinkObject;
 
 import java.util.*;
-import java.util.stream.Collectors;
-
 import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
 
 /**
@@ -82,7 +77,7 @@
 	/**
 	 * 骞冲彴鐨勬祦绋嬫湇鍔�
 	 */
-	private WorkflowService workService = null;
+	private WorkflowServicePrx workService = null;
 
 	/**
 	 * 骞冲彴璋冪敤瀹㈡埛绔�
@@ -563,7 +558,7 @@
 		WebUtil.alertNotNull(executionId,"娴佺▼鎵ц涓婚敭",key,"鍙傛暟Key");
 		UserEntityInfo ueo = new UserEntityInfo();
 		SessionInfo si = WebUtil.getCurrentUserSessionInfo();
-		ueo.ip = si.getIp();
+//		ueo..ip = si.getIp();
 		ueo.modules = "娴佺▼";
 		ueo.userName = si.getUserId();
 //		while(StringUtils.countMatches(executionId,".")>1){
@@ -611,7 +606,7 @@
 	 * @throws VciBaseException
 	 */
 	@Override
-	public List<ClientLinkObject> getDataCloInTask(String taskOid,String executionid) throws VciBaseException {
+	public List<ClientLinkObject> getDataCloInTask(String taskOid, String executionid) throws VciBaseException {
 		Map<String,String> conditionMap = new HashMap<String, String>();
 		if(StringUtils.isNotBlank(taskOid)) {
 			conditionMap.put("f_oid", taskOid.trim());
@@ -813,14 +808,9 @@
 	}
 
 	@Override
-	public WorkflowService getWorkService() throws VciBaseException{
+	public WorkflowServicePrx getWorkService() throws VciBaseException{
 		if(workService == null){
-			try {
-				this.workService = platformClientUtil.getLogonFactoryService().getWorkflowService();
-			} catch (VCIError e) {
-//				logger.error(e.error_code,e);
-				throw WebUtil.getVciBaseException(e);
-			}
+			this.workService = platformClientUtil.getLogonFactoryService();
 		}
 		return workService;
 	}

--
Gitblit v1.9.3