From e6a35cef322110bdae782266dfac11eb4f7cdce1 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期三, 05 六月 2024 11:23:07 +0800
Subject: [PATCH] 对象引用改动。
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIDataController.java | 5 --
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java | 4 +-
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java | 4 +-
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/StmFunctionController.java | 2 -
Source/platformProject/vci-platform-starter/pom.xml | 5 ++
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/SmFunctionController.java | 1
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/WebProcessDaoI.java | 4 +-
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java | 1
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java | 1
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/VciFileDownloadInfo.java | 6 +-
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/OsCodeEnumDaoImpl.java | 7 +--
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java | 9 +---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/BdSelectInputCharDaoImpl.java | 5 --
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/VciFileObjectDaoImpl.java | 5 --
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java | 1
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebProcessCommandController.java | 4 +-
16 files changed, 23 insertions(+), 41 deletions(-)
diff --git a/Source/platformProject/vci-platform-starter/pom.xml b/Source/platformProject/vci-platform-starter/pom.xml
index 1748446..b7ee35d 100644
--- a/Source/platformProject/vci-platform-starter/pom.xml
+++ b/Source/platformProject/vci-platform-starter/pom.xml
@@ -119,6 +119,11 @@
<artifactId>plt-slice</artifactId>
<version>${plt.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.vci.FrameService</groupId>
+ <artifactId>FrameService</artifactId>
+ <version>1.0.RELEASE</version>
+ </dependency>
<!--common鐨勪緷璧�-->
<dependency>
<groupId>com.zeroc</groupId>
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java
index 8582351..a52aed1 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java
@@ -1,7 +1,6 @@
package com.vci.frameworkcore.compatibility;
import com.vci.corba.common.PLException;
-import com.vci.corba.common.VCIError;
import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum;
import com.vci.frameworkcore.pagemodel.MenuVO;
import com.vci.frameworkcore.pagemodel.SmFunctionVO;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
index fe1f8a3..e88d446 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
@@ -5,6 +5,7 @@
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO;
import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.server.common.ThreeDES;
import com.vci.starter.web.enumpck.BooleanEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/SmFunctionController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/SmFunctionController.java
index 352f7ab..a2272a4 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/SmFunctionController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/SmFunctionController.java
@@ -1,7 +1,6 @@
package com.vci.web.controller;
import com.vci.corba.common.PLException;
-import com.vci.corba.common.VCIError;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum;
import com.vci.frameworkcore.pagemodel.MenuVO;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/StmFunctionController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/StmFunctionController.java
index 37d18e6..b10a17a 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/StmFunctionController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/StmFunctionController.java
@@ -1,13 +1,11 @@
package com.vci.web.controller;
import com.vci.corba.common.PLException;
-import com.vci.corba.common.VCIError;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum;
import com.vci.frameworkcore.pagemodel.MenuVO;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.Tree;
import com.vci.starter.web.pagemodel.TreeQueryObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebProcessCommandController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebProcessCommandController.java
index ccbc2f7..dbb235a 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebProcessCommandController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebProcessCommandController.java
@@ -1,6 +1,6 @@
package com.vci.web.controller;
-import com.vci.rmip.workflow.server.template.TasksAssigned;
+import com.vci.corba.workflow.data.TasksAssignedInfo;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -130,7 +130,7 @@
@ResponseBody
public DataGrid getProxy(){
DataGrid dg = new DataGrid();
- TasksAssigned taskAss = proCmdService.getProxy();
+ TasksAssignedInfo taskAss = proCmdService.getProxy();
if(taskAss!=null){
dg.getData().add(taskAss);
dg.setLimit(1);
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIDataController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIDataController.java
index f910ad1..f342ec9 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIDataController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIDataController.java
@@ -9,15 +9,10 @@
import com.vci.web.query.UIDataGridQuery;
import com.vci.web.query.UIFormQuery;
import com.vci.web.query.UITreeQuery;
-import com.vci.web.query.UITreeRootQuery;
import com.vci.web.service.UIDataServiceI;
-import org.omg.CORBA.PUBLIC_MEMBER;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/WebProcessDaoI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/WebProcessDaoI.java
index e45a807..d035f70 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/WebProcessDaoI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/WebProcessDaoI.java
@@ -1,8 +1,8 @@
package com.vci.web.dao;
import com.vci.client.bof.ClientLinkObject;
-import com.vci.corba.workflow.WorkflowService;
import com.vci.corba.workflow.WorkflowServicePrx;
+import com.vci.corba.workflow.data.TasksAssignedInfo;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
@@ -341,7 +341,7 @@
* @return
* @throws VciBaseException
*/
- TasksAssigned getProxy() throws VciBaseException;
+ TasksAssignedInfo getProxy() throws VciBaseException;
/**
* 缁撴潫娴佺▼
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/BdSelectInputCharDaoImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/BdSelectInputCharDaoImpl.java
index 9dd86ff..39b01b2 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/BdSelectInputCharDaoImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/BdSelectInputCharDaoImpl.java
@@ -3,7 +3,6 @@
import com.vci.web.model.BdSelectInputCharDO;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.KeyValue;
import org.apache.commons.lang3.StringUtils;
import com.vci.starter.web.util.*;
import com.vci.web.dao.BdSelectInputCharDaoI;
@@ -14,14 +13,10 @@
import com.vci.web.pageModel.BatchCBO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
-import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
import java.util.Collection;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
-import java.util.ArrayList;
import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/OsCodeEnumDaoImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/OsCodeEnumDaoImpl.java
index e717a70..4feea27 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/OsCodeEnumDaoImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/OsCodeEnumDaoImpl.java
@@ -1,5 +1,6 @@
package com.vci.web.dao.impl;
+import com.vci.client.omd.provider.BtmProvider;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.PageHelper;
@@ -13,8 +14,6 @@
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.vo.omd.btm.common.BtmProvider;
import java.util.*;
@@ -204,8 +203,8 @@
//鍏堟煡璇㈡槑缁嗭紝鏄庣粏搴旇涓嶄細鏈�1000鏉�
Map<String,String> conditionMap = new HashMap<String, String>();
conditionMap.put("ruleOid",ruleOid);
- String sql = " select a.oid as oid from " + BtmProvider.getInstance().getBTMTableName(BtmIdConstant.OS_CODE_ENUM_BTM_TYPE) + " a left join "
- + BtmProvider.getInstance().getBTMTableName(BtmIdConstant.OS_CODE_RULE_ELEMENT_BTM_TYPE) + " b on a.pkCodeRuleElement = b.oid where b.pkCodeRule = :ruleOid";
+ String sql = " select a.oid as oid from " + BtmProvider.getInstance().getBTTableName(BtmIdConstant.OS_CODE_ENUM_BTM_TYPE) + " a left join "
+ + BtmProvider.getInstance().getBTTableName(BtmIdConstant.OS_CODE_RULE_ELEMENT_BTM_TYPE) + " b on a.pkCodeRuleElement = b.oid where b.pkCodeRule = :ruleOid";
List<com.vci.client.bof.ClientBusinessObject> enumCbos = boService.queryBySql(sql, conditionMap);
if(CollectionUtils.isEmpty(enumCbos)){
return new ArrayList<OsCodeEnumDO>();
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java
index 023cf73..d2a3640 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java
@@ -12,7 +12,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
import java.util.Collection;
import java.util.HashMap;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/VciFileObjectDaoImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/VciFileObjectDaoImpl.java
index 1276b7d..9dfc406 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/VciFileObjectDaoImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/VciFileObjectDaoImpl.java
@@ -2,20 +2,15 @@
import com.vci.file.constant.VciFileBtmTypeConstant;
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.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.constant.WebLangCodeConstant;
import com.vci.web.dao.VciFileObjectDaoI;
import com.vci.web.model.VciFileObjectDO;
import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
-import plm.bs.bom.clientobject.ClientBusinessObject;
import java.util.Collection;
import java.util.HashMap;
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 57f82e7..a93641f 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
@@ -875,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)){
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
index 32256c3..96b4dea 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
@@ -279,8 +279,8 @@
public void initSetting() {
System.out.println("----鍒濆鍖栫敤浜庢煡璇㈤厤缃殑鐢ㄦ埛----");
ClientContextVariable.setClientLanuchMode(LaunchModeEnum.WebApp);
-// InvocationUtility.registerIInvocationContext(contextInfoFetcher);
-// JacorbClientRequestInterceptor.sessionContext = contextInfoFetcher;
+ InvocationUtility.registerIInvocationContext(contextInfoFetcher);
+ JacorbClientRequestInterceptor.sessionContext = contextInfoFetcher;
System.out.println("----鍒濆鍖栫敤浜庢煡璇㈤厤缃殑鐢ㄦ埛瀹屾垚----");
System.out.println("----寮�濮嬫壂鎻忔湁VciConfigModule娉ㄨВ鐨勭被----");
String[] namesForAnnotation = ApplicationContextProvider.getApplicationContext().getBeanNamesForAnnotation(VciConfigModule.class);
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/VciFileDownloadInfo.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/VciFileDownloadInfo.java
index c0fcc74..b3d299b 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/VciFileDownloadInfo.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/VciFileDownloadInfo.java
@@ -1,6 +1,6 @@
package com.vci.web.other;
-import com.vci.corba.common.VCIError;
+import com.vci.corba.common.PLException;
import java.util.HashMap;
import java.util.Map;
@@ -63,13 +63,13 @@
}
}
- public static void getDownloadErrorInfo(String clientPath) throws VCIError{
+ public static void getDownloadErrorInfo(String clientPath) throws PLException {
Map<String,String> errorMap = getDownloadFileInfo(clientPath);
String errorMsg = "";
String[] errorArray = errorMap.values().toArray(new String[0]);
VciFileDownloadInfo.removeDownloadFileInfo(clientPath);
errorMsg = errorArray[0] +(errorArray.length>1?("锛涘彟鏈�" + errorArray.length + "涓枃浠朵篃鍑虹幇浜嗛敊璇�"):"");
- throw new VCIError(errorMsg,errorArray);
+ throw new PLException(errorMsg,errorArray);
}
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java
index 4f372ba..c6dad11 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java
@@ -1,9 +1,8 @@
package com.vci.web.other;
+import com.vci.client.bof.ClientBusinessObject;
+import com.vci.client.bof.ClientBusinessObjectOperation;
import com.vci.corba.common.PLException;
-import com.vci.corba.common.VCIError;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.annotation.FlowNotifyBefore;
import com.vci.web.annotation.FlowNotifyWeb;
import com.vci.web.bo.FlowNoticeInfo;
@@ -12,8 +11,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientBusinessObjectOperation;
import java.util.*;
@@ -74,7 +71,7 @@
operation.batchUpdateBuinessObject(allCodeList.toArray(new ClientBusinessObject[0]));
logger.info("缂栫爜鐢熷懡鍛ㄦ湡鎭㈠瀹屾垚");
}
- } catch (PLException | VCIError e) {
+ } catch (PLException e) {
e.printStackTrace();
}
}
--
Gitblit v1.9.3