From 663878fdcd0d44c105888014f4cdf7fc926f609f Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期三, 19 六月 2024 10:27:04 +0800
Subject: [PATCH] 1、去掉client包的相关更改。 2、修改登录鉴权修改。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java
index 17ccc7b..747dc9e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java
@@ -1,14 +1,16 @@
package com.vci.web.dao.impl;
-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.omd.data.BusinessObject;
+import com.vci.corba.omd.data.LinkObject;
import com.vci.corba.workflow.WorkflowService;
import com.vci.corba.workflow.WorkflowServicePrx;
import com.vci.corba.workflow.data.*;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.omd.utils.ObjectTool;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -606,7 +608,7 @@
* @throws VciBaseException
*/
@Override
- public List<ClientLinkObject> getDataCloInTask(String taskOid, String executionid) throws VciBaseException {
+ public List<LinkObject> 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());
@@ -619,18 +621,18 @@
}
private DataGrid getData(String linkType,Map<String,String> conditionMap,String referColumns) throws VciBaseException{
- List<ClientLinkObject> clos = loService.queryCLO(taskDataLink, conditionMap);
+ List<LinkObject> clos = loService.queryCLO(taskDataLink, conditionMap);
Map<String,List<String>> btmOidMap = new HashMap<String, List<String>>();
if(clos!=null&&clos.size()>0){
- for(ClientLinkObject clo : clos){
+ for(LinkObject clo : clos){
List<String> oids = null;
- String btm = clo.getToBTMName().toLowerCase();
+ String btm = clo.toBTName.toLowerCase();
if(btmOidMap.containsKey(btm)){
oids = btmOidMap.get(btm);
}else{
oids = new ArrayList<String>();
}
- oids.add(clo.getToOid());
+ oids.add(clo.toOid);
btmOidMap.put(btm, oids);
}
}
@@ -648,7 +650,7 @@
}else {
caluesList.add("*");
}
- List<com.vci.client.bof.ClientBusinessObject> cbos = boService.queryCBO(btm, conditionMap,null,caluesList);
+ List<BusinessObject> cbos = boService.queryCBO(btm, conditionMap,null,caluesList);
data.addAll(boService.cbos2Map(cbos));
}
}
@@ -726,21 +728,21 @@
PageHelper pageHelper = new PageHelper(-1);
pageHelper.setSort("endTime");
pageHelper.setOrder(pageHelper.asc);
- List<com.vci.client.bof.ClientBusinessObject> undoTaskCbos= boService.queryCBO(workitemBtmType, conditionMap);
+ List<BusinessObject> undoTaskCbos= boService.queryCBO(workitemBtmType, conditionMap);
if(undoTaskCbos != null && undoTaskCbos.size() > 0) {
- for(com.vci.client.bof.ClientBusinessObject cbo : undoTaskCbos) {
+ for(BusinessObject cbo : undoTaskCbos) {
ProcessHistoryVO his = new ProcessHistoryVO();
- String taskName = cbo.getName();
+ String taskName = cbo.name;
if(StringUtils.contains(taskName,"-")) {
taskName = taskName.substring(taskName.lastIndexOf("-") + 1);
}
his.setTaskName(taskName);
- his.setCreateTime(String.valueOf(cbo.getCreateTime()));
- String userIdString = cbo.getAttributeValue("principal");
+ his.setCreateTime(String.valueOf(cbo.createTime));
+ String userIdString = ObjectTool.getBOAttributeValue(cbo,"principal");
if(StringUtils.contains(userIdString,":")) {
userIdString = userIdString.substring(userIdString.indexOf(":") + 1);
}
- his.setAssignee(cbo.getAttributeValue("principal"));
+ his.setAssignee(ObjectTool.getBOAttributeValue(cbo,"principal"));
String userShowInfoString = "";
SmUserVO user = userQueryService.getUserByUserId(userIdString);
if(user != null){
@@ -749,7 +751,7 @@
userShowInfoString = userIdString;
}
his.setAssigneeName(userShowInfoString);
- his.setExecutionId(cbo.getAttributeValue("executionid"));
+ his.setExecutionId(ObjectTool.getBOAttributeValue(cbo,"executionid"));
hisList.add(his);
}
@@ -936,19 +938,19 @@
oidList.add(oid);
}
//杞崲鎴�500闀垮害鐨�
- List<com.vci.client.bof.ClientBusinessObject> cboList = new ArrayList<com.vci.client.bof.ClientBusinessObject>();
+ List<BusinessObject> cboList = new ArrayList<BusinessObject>();
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<com.vci.client.bof.ClientBusinessObject> tempCbos = boService.queryCBO(btmType,conditionMap);
+ List<BusinessObject> 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<com.vci.client.bof.ClientBusinessObject> tempCbos = boService.queryCBO(btmType,conditionMap);
+ List<BusinessObject> tempCbos = boService.queryCBO(btmType,conditionMap);
cboList.addAll(tempCbos);
}
//鎵惧埌杩欎釜涓氬姟绫诲瀷鐨勮捣濮嬬姸鎬�
--
Gitblit v1.9.3