From 72c7bbd66b8456db7dabf0dbc15f7aa9c2af2b9d Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期三, 05 六月 2024 14:53:54 +0800
Subject: [PATCH] 项目引用调整
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java | 50 ++++++++++++++++++++------------------------------
1 files changed, 20 insertions(+), 30 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 3bd376e..17ccc7b 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());
@@ -653,7 +648,7 @@
}else {
caluesList.add("*");
}
- List<ClientBusinessObject> cbos = boService.queryCBO(btm, conditionMap,null,caluesList);
+ List<com.vci.client.bof.ClientBusinessObject> cbos = boService.queryCBO(btm, conditionMap,null,caluesList);
data.addAll(boService.cbos2Map(cbos));
}
}
@@ -731,16 +726,16 @@
PageHelper pageHelper = new PageHelper(-1);
pageHelper.setSort("endTime");
pageHelper.setOrder(pageHelper.asc);
- List<ClientBusinessObject> undoTaskCbos= boService.queryCBO(workitemBtmType, conditionMap);
+ List<com.vci.client.bof.ClientBusinessObject> undoTaskCbos= boService.queryCBO(workitemBtmType, conditionMap);
if(undoTaskCbos != null && undoTaskCbos.size() > 0) {
- for(ClientBusinessObject cbo : undoTaskCbos) {
+ for(com.vci.client.bof.ClientBusinessObject cbo : undoTaskCbos) {
ProcessHistoryVO his = new ProcessHistoryVO();
String taskName = cbo.getName();
if(StringUtils.contains(taskName,"-")) {
taskName = taskName.substring(taskName.lastIndexOf("-") + 1);
}
his.setTaskName(taskName);
- his.setCreateTime(cbo.getCreateTime());
+ his.setCreateTime(String.valueOf(cbo.getCreateTime()));
String userIdString = cbo.getAttributeValue("principal");
if(StringUtils.contains(userIdString,":")) {
userIdString = userIdString.substring(userIdString.indexOf(":") + 1);
@@ -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.getWorkflowService();
}
return workService;
}
@@ -885,8 +875,8 @@
}
@Override
- public TasksAssigned getProxy() throws VciBaseException{
- TasksAssigned assign = null;
+ public TasksAssignedInfo getProxy() throws VciBaseException{
+ TasksAssignedInfo assign = null;
// try {
// TasksAssignedInfo taskAss = getWorkService().getTasksAssignedByUserName("", WebUtil.getUserEntityInfo( "娴佺▼"));
// if(taskAss!=null && StringUtils.isNotEmpty(taskAss.id)){
@@ -946,19 +936,19 @@
oidList.add(oid);
}
//杞崲鎴�500闀垮害鐨�
- List<ClientBusinessObject> cboList = new ArrayList<ClientBusinessObject>();
+ List<com.vci.client.bof.ClientBusinessObject> cboList = new ArrayList<com.vci.client.bof.ClientBusinessObject>();
if(oidList.size()>500){
List<List<String>> oidListForIn = WebUtil.switchListForOracleIn(oidList);
for(List<String> oidListForInRecord : oidListForIn){
Map<String,String> conditionMap = new HashMap<String, String>();
conditionMap.put("oid",QueryOptionConstant.IN + "(" + WebUtil.toInSql(oidListForInRecord.toArray(new String[0])) + ")" );
- List<ClientBusinessObject> tempCbos = boService.queryCBO(btmType,conditionMap);
+ List<com.vci.client.bof.ClientBusinessObject> tempCbos = boService.queryCBO(btmType,conditionMap);
cboList.addAll(tempCbos);
}
}else{
Map<String,String> conditionMap = new HashMap<String, String>();
conditionMap.put("oid",QueryOptionConstant.IN + "(" + WebUtil.toInSql(oidList.toArray(new String[0])) + ")" );
- List<ClientBusinessObject> tempCbos = boService.queryCBO(btmType,conditionMap);
+ List<com.vci.client.bof.ClientBusinessObject> tempCbos = boService.queryCBO(btmType,conditionMap);
cboList.addAll(tempCbos);
}
//鎵惧埌杩欎釜涓氬姟绫诲瀷鐨勮捣濮嬬姸鎬�
--
Gitblit v1.9.3