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/service/impl/WebBoServiceImpl.java                       |   22 --
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java                  |    7 
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java                          |    2 
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebContextInfoFetcher.java                  |   58 ++-----
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java                    |   86 ++++++-----
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsLinkTypeServiceI.java                          |    3 
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebProcessCommandServiceI.java                   |    4 
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLogServiceImpl.java                      |    7 
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java                    |   17 +-
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java            |    6 
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java                      |    1 
 Source/platformProject/vci-platform-starter/pom.xml                                                                        |    5 
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebLoServiceI.java                               |    1 
 Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java |    3 
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java                    |    9 
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/PlatformClientUtil.java                             |   15 +
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/constant/CorbaKeyConstant.java                           |   19 ++
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java           |   11 -
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebSecretServiceI.java                           |    3 
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java                   |    4 
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java                       |   99 +++++++------
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java                      |    6 
 22 files changed, 188 insertions(+), 200 deletions(-)

diff --git a/Source/platformProject/vci-platform-starter/pom.xml b/Source/platformProject/vci-platform-starter/pom.xml
index b7ee35d..1748446 100644
--- a/Source/platformProject/vci-platform-starter/pom.xml
+++ b/Source/platformProject/vci-platform-starter/pom.xml
@@ -119,11 +119,6 @@
             <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/impl/SmUserQueryServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
index e88d446..2df4e7e 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
@@ -1,11 +1,11 @@
 package com.vci.frameworkcore.compatibility.impl;
 
 import com.vci.client.common.providers.ServiceProvider;
+import com.vci.common.util.ThreeDES;
 import com.vci.corba.common.PLException;
 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;
@@ -31,7 +31,6 @@
 import java.util.stream.Collectors;
 
 import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
-import static com.vci.web.constant.CacheNameConstant.VCI_OBJECT_SERVICE;
 import static com.vci.web.constant.CacheNameConstant.VCI_USER;
 import static com.vci.web.util.WebUtil.arryAndSqlToClientBusinessObject;
 
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/constant/CorbaKeyConstant.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/constant/CorbaKeyConstant.java
new file mode 100644
index 0000000..c243a5d
--- /dev/null
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/constant/CorbaKeyConstant.java
@@ -0,0 +1,19 @@
+package com.vci.web.constant;
+
+/**
+ * @Description
+ * @Author dangsn
+ * @Date 2024/6/5 12:33
+ */
+public class CorbaKeyConstant {
+    public static final String CURRENT_USER_ID = "CURRENTUSER.ID";
+    public static final String CURRENT_USER_NAME = "CURRENTUSER.NAME";
+    public static final String CURRENT_USER_SECRET = "CURRENTUSER.SECRETGRADE";
+    public static final String CURRENT_USER_EMAIL = "CURRENTUSER.EMAIL";
+    public static final String CURRENT_USER_GROUPNUM = "CURRENTUSER.GROUPNUM";
+    public static final String CURRENT_MACHINE_SECRET = "CURRENTMACHINE.SECRET";
+    public static final String IP_SECRET_SWITCH = "IPSECRETSWITCH";
+    public static final String CURRENT_USER_GROUPNAME = "CURRENTUSER.GROUPNAME";
+    public static final String USER_SECRET_SWITCH = "USERSECRETSWITCH";
+    public static final String CURRENTTIME = "CURRENTTIME";
+}
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 a93641f..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
@@ -810,7 +810,7 @@
 	@Override
 	public WorkflowServicePrx getWorkService() throws VciBaseException{
 		if(workService == null){
-			this.workService = platformClientUtil.getLogonFactoryService();
+			this.workService = platformClientUtil.getWorkflowService();
 		}
 		return workService;
 	}
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 96b4dea..fa613af 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
@@ -3,12 +3,12 @@
 import com.alibaba.fastjson.JSONObject;
 import com.vci.client.mw.ClientContextVariable;
 import com.vci.client.mw.LaunchModeEnum;
+import com.vci.corba.common.PLException;
 import com.vci.corba.omd.data.AttributeValue;
 import com.vci.frameworkcore.constant.FrameWorkBtmTypeConstant;
 import com.vci.frameworkcore.properties.VciFramworkCompatibilityProperties;
 import com.vci.starter.web.annotation.config.VciConfigField;
 import com.vci.starter.web.annotation.config.VciConfigModule;
-import com.vci.starter.web.enumpck.DataSecretEnum;
 import com.vci.starter.web.enumpck.SessionStorageTypeEnum;
 import com.vci.starter.web.enumpck.UserSecretEnum;
 import com.vci.starter.web.interceptor.VciSessionForLoginI;
@@ -19,7 +19,9 @@
 import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
 import com.vci.web.pageModel.OsAttributeVO;
 import com.vci.web.properties.WebProperties;
-import com.vci.web.service.*;
+import com.vci.web.service.OsAttributeServiceI;
+import com.vci.web.service.VciMdServiceI;
+import com.vci.web.service.WebSecretServiceI;
 import com.vci.web.service.impl.UIEngineServiceImpl;
 import com.vci.web.service.impl.WebContextInfoFetcher;
 import com.vci.web.service.impl.WebInitServiceImpl;
@@ -41,6 +43,8 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -279,8 +283,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);
@@ -302,43 +306,43 @@
                         }
                         configFieldMap.put(vciConfigField.value(),field);
                     });
-//                    configFieldMap.forEach((configField,field)->{
-//                        String configValue = null;
-//                        try {
-//                            configValue = platformClientUtil.getLogonFactoryService().getFrameworkService().getConfigValue("",configField);
-//                        } catch (VCIError vciError) {
-//                           if(logger.isErrorEnabled()){
-//                               logger.error(vciError.error_code,vciError);
-//                           }
-//                        }
-//                        Class<?> fieldType = field.getType();
-//                        Method method = WebUtil.getSetmethod(bean.getClass(), field);
-//                        Object value = null;
-//                        if(fieldType.equals(Boolean.class) || fieldType.equals(boolean.class)){
-//                            value = ("on".equalsIgnoreCase(configValue) || "true".equalsIgnoreCase(configValue))?true:false;
-//                        }else if(fieldType.equals(Double.class) || fieldType.equals(double.class)){
-//                            value = WebUtil.getDouble(configValue);
-//                        }else if(fieldType.equals(Long.class) || fieldType.equals(long.class)){
-//                            value = WebUtil.getLong(configValue);
-//                        }else if(fieldType.equals(Float.class) || fieldType.equals(float.class)){
-//                            value = WebUtil.getFloat(configValue);
-//                        }else if(fieldType.equals(Integer.class) || fieldType.equals(int.class)){
-//                            value = WebUtil.getInt(configValue);
-//                        }else{
-//                            value = configValue;
-//                        }
-//                        try {
-//                            method.invoke(bean,value);
-//                        } catch (IllegalAccessException e) {
-//                            if(logger.isErrorEnabled()){
-//                                logger.error(e.getMessage(),e);
-//                            }
-//                        } catch (InvocationTargetException e) {
-//                            if(logger.isErrorEnabled()){
-//                                logger.error(e.getMessage(),e);
-//                            }
-//                        }
-//                    });
+                    configFieldMap.forEach((configField,field)->{
+                        String configValue = null;
+                        try {
+                            configValue = platformClientUtil.getFrameworkService().getConfigValue(configField);
+                        } catch (PLException vciError) {
+                           if(logger.isErrorEnabled()){
+                               logger.error(vciError.code,vciError);
+                           }
+                        }
+                        Class<?> fieldType = field.getType();
+                        Method method = WebUtil.getSetmethod(bean.getClass(), field);
+                        Object value = null;
+                        if(fieldType.equals(Boolean.class) || fieldType.equals(boolean.class)){
+                            value = ("on".equalsIgnoreCase(configValue) || "true".equalsIgnoreCase(configValue))?true:false;
+                        }else if(fieldType.equals(Double.class) || fieldType.equals(double.class)){
+                            value = WebUtil.getDouble(configValue);
+                        }else if(fieldType.equals(Long.class) || fieldType.equals(long.class)){
+                            value = WebUtil.getLong(configValue);
+                        }else if(fieldType.equals(Float.class) || fieldType.equals(float.class)){
+                            value = WebUtil.getFloat(configValue);
+                        }else if(fieldType.equals(Integer.class) || fieldType.equals(int.class)){
+                            value = WebUtil.getInt(configValue);
+                        }else{
+                            value = configValue;
+                        }
+                        try {
+                            method.invoke(bean,value);
+                        } catch (IllegalAccessException e) {
+                            if(logger.isErrorEnabled()){
+                                logger.error(e.getMessage(),e);
+                            }
+                        } catch (InvocationTargetException e) {
+                            if(logger.isErrorEnabled()){
+                                logger.error(e.getMessage(),e);
+                            }
+                        }
+                    });
                 }
             }
         }
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsLinkTypeServiceI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsLinkTypeServiceI.java
index e499467..4143af1 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsLinkTypeServiceI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsLinkTypeServiceI.java
@@ -1,12 +1,11 @@
 package com.vci.web.service;
 
+import com.vci.corba.omd.ltm.LinkType;
 import com.vci.starter.web.pagemodel.BaseQueryObject;
 import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.web.pageModel.OsAttributeVO;
 import com.vci.web.pageModel.OsBtmTypeAttributeVO;
 import com.vci.web.pageModel.OsLinkTypeAttributeVO;
 import com.vci.web.pageModel.OsLinkTypeVO;
-import plm.corba.linkTypeManager.LinkType;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebLoServiceI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebLoServiceI.java
index d529484..77fa85b 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebLoServiceI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebLoServiceI.java
@@ -3,6 +3,7 @@
 import com.vci.client.bof.ClientBusinessObject;
 import com.vci.client.bof.ClientLinkObject;
 import com.vci.client.bof.ClientLinkObjectOperation;
+import com.vci.corba.omd.data.LinkObject;
 import com.vci.starter.web.exception.VciBaseException;
 import com.vci.starter.web.pagemodel.DataGrid;
 import com.vci.starter.web.pagemodel.PageHelper;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebProcessCommandServiceI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebProcessCommandServiceI.java
index fcb67d2..75f57e0 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebProcessCommandServiceI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebProcessCommandServiceI.java
@@ -1,6 +1,6 @@
 package com.vci.web.service;
 
-import com.vci.rmip.workflow.server.template.TasksAssigned;
+import com.vci.corba.workflow.data.TasksAssignedInfo;
 import com.vci.starter.web.exception.VciBaseException;
 import com.vci.web.dto.ProcessStartConfigDTO;
 import com.vci.web.pageModel.ProcessUserVO;
@@ -78,7 +78,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/service/WebSecretServiceI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebSecretServiceI.java
index 7eda033..e41448d 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebSecretServiceI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebSecretServiceI.java
@@ -1,10 +1,7 @@
 package com.vci.web.service;
 
 import com.vci.frameworkcore.pagemodel.SmUserVO;
-import com.vci.rmip.framework.client.systemConfig.object.UserObject;
 import com.vci.starter.web.exception.VciBaseException;
-
-import java.util.Map;
 
 /**
  * web绔殑瀵嗙骇鏈嶅姟
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
index ab7013b..0384af9 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
@@ -32,7 +32,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.util.HtmlUtils;
-import plm.corba.enumManager.EnumItemFilter;
 
 import java.util.*;
 import java.util.stream.Collectors;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java
index 75e2548..330c7d1 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java
@@ -1,6 +1,7 @@
 package com.vci.web.service.impl;
 
 import com.vci.corba.common.PLException;
+import com.vci.corba.omd.ltm.LinkType;
 import com.vci.starter.web.annotation.log.VciUnLog;
 import com.vci.starter.web.enumpck.VciFieldTypeEnum;
 import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -137,9 +138,9 @@
             vo.setCreator(linkType.creator);
             vo.setLastModifier(linkType.modifier);
             try {
-                vo.setCreateTime(VciDateUtil.str2Date(linkType.createTime,VciDateUtil.DateTimeFormat));
-                vo.setLastModifyTime(VciDateUtil.str2Date(linkType.modifyTime,VciDateUtil.DateTimeFormat));
-                vo.setTs(VciDateUtil.str2Date(linkType.ts,VciDateUtil.DateTimeMillFormat));
+                vo.setCreateTime(VciDateUtil.long2Date(linkType.createTime));
+                vo.setLastModifyTime(VciDateUtil.long2Date(linkType.modifyTime));
+                vo.setTs(VciDateUtil.long2Date(linkType.ts));
             } catch (Exception e) {
                 e.printStackTrace();
             }
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
index 7f6a14e..dc56825 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
@@ -2232,12 +2232,8 @@
             throw WebUtil.getVciBaseException(vciError);
         }
         //淇濆瓨to绔垨鑰協rom绔�
-        BusinessObjectHolder boHolder = new BusinessObjectHolder();
-//        toCbo.dealBusinessObjectNullValue();
-//        boHolder.value = toCbo.getBusinessObject();
         try{
-//            platformClientUtil.getBOFactoryService().updateBusinessObject(boHolder);
-            ServiceProvider.getBOFService().updateBusinessObject(toCbo.getBusinessObject());
+            platformClientUtil.getBOFactoryService().updateBusinessObject(toCbo.getBusinessObject());
         } catch (PLException vciError) {
             throw WebUtil.getVciBaseException(vciError);
         }
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
index 056e30d..9d6182c 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
@@ -39,7 +39,6 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import plm.corba.portal.*;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -865,7 +864,7 @@
 	@Cacheable(value = VCI_OBJECT_SERVICE,key = CacheKeyConstant.ALL_UI,unless = "#result == null")
 	public List<UIContentVO> selectAllUIContent() {
 		try {
-			return UIContentDO2VOs(Arrays.stream(platformClientUtil.getPortalService().getAllPLPageLayoutDefinations()).collect(Collectors.toList()));
+			return UIContentDO2VOs(Arrays.stream(platformClientUtil.getPortalService().getAllPLUILayouts()).collect(Collectors.toList()));
 		} catch (PLException vciError) {
 			throw WebUtil.getVciBaseException(vciError);
 		}
@@ -876,10 +875,10 @@
 	 * @param pageLayoutDefinations 涓婁笅鏂嘦I瀵硅薄
 	 * @return 鏄剧ず瀵硅薄
 	 */
-	private List<UIContentVO> UIContentDO2VOs(Collection<PLPageLayoutDefination> pageLayoutDefinations){
+	private List<UIContentVO> UIContentDO2VOs(Collection<PLUILayout> pageLayoutDefinations){
 		List<UIContentVO> contentVOS = new ArrayList<>();
-		Optional.ofNullable(pageLayoutDefinations).orElseGet(()->new ArrayList<PLPageLayoutDefination>()).stream().forEach(pageLayout->{
-//			contentVOS.add(UIContentDO2VO(pageLayout,false));
+		Optional.ofNullable(pageLayoutDefinations).orElseGet(()->new ArrayList<PLUILayout>()).stream().forEach(pageLayout->{
+			contentVOS.add(UIContentDO2VO(pageLayout,false));
 		});
 		if(!CollectionUtils.isEmpty(contentVOS)) {
 			Map<String, List<UILayoutVO>> layoutMap = batchListLayoutByContent(contentVOS.stream().map(UIContentVO::getOid).collect(Collectors.toSet()));
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
index 0d56564..92c1b6d 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
@@ -556,14 +556,14 @@
 	 * @return 鏌ヨ鍑烘潵鐨勫��
 	 * @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
 	 */
-	private List<com.vci.client.bof.ClientBusinessObject> baseQueryCBO(QueryTemplate qt,Map<String,String> conditionMap,PageHelper ph,List<String> clauseList) throws VciBaseException{
+	private List<ClientBusinessObject> baseQueryCBO(QueryTemplate qt,Map<String,String> conditionMap,PageHelper ph,List<String> clauseList) throws VciBaseException{
 		List<com.vci.client.bof.ClientBusinessObject> allCbos = new ArrayList<com.vci.client.bof.ClientBusinessObject>();
 		if(clauseList == null){
 			clauseList = new ArrayList<String>();
 			clauseList.add("*");
 		}
 		setRightValueToQueryTemplate(qt,conditionMap);//璁剧疆瀵嗙骇鏌ヨ锛屽拰鏁版嵁鏉冮檺鎺у埗
-		List<com.vci.corba.query.data.BtmRefQueryOption> refOpts = new ArrayList<BtmRefQueryOption>();
+		List<BtmRefQueryOption> refOpts = new ArrayList<BtmRefQueryOption>();
 		List<String> enumAttrName = new ArrayList<String>();
 		List<String> thisQueryAttr = new ArrayList<String>();
 		if(clauseList!=null && clauseList.size()>0){
@@ -610,25 +610,15 @@
 		//璁剧疆鍒嗛〉淇℃伅鍜屾帓搴�
 		setPageAndOrderToQT(qt,ph);
 		try {
-			// QTServiceOperations qtService = platformClientUtil.getQueryService();
-			ObjectQueryServicePrx qtService = ServiceProvider.getOQService();
+			ObjectQueryServicePrx qtService = platformClientUtil.getQueryService();
 			if(qtService == null){
 				logger.error("娌℃湁鎵惧埌鏌ヨ鏈嶅姟");
 				throw new VciBaseException(msgCodePrefix+"qtServerNull", new String[]{});
 			}
-//			IntHolder count = new IntHolder();
-			ObjectQueryService.FindBTMObjectsV3Result bos = null;
-//			String invo = JSONObject.toJSONString(InvocationUtility.getInvocation());
-			try{
-				//bos = qtService.findBTMObjectsV3(invo,qt.getId(), OQTool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
-				bos = qtService.findBTMObjectsV3(qt.getId(), OQTool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0]));
-			}catch (PLException e){
-				//bos = qtService.findBTMObjectsV4(invo,qt.getId(), OQTool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
-				bos = qtService.findBTMObjectsV3(qt.getId(), OQTool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0]));
-			}
+			ObjectQueryService.FindBTMObjectsV3Result bos = qtService.findBTMObjectsV3(qt.getId(), OQTool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[refOpts.size()]));
 			if (bos != null && bos.count > 0) {
-				for (com.vci.corba.omd.data.BusinessObject bo : bos.returnValue) {
-					com.vci.client.bof.ClientBusinessObject cbo = new com.vci.client.bof.ClientBusinessObject();
+				for (BusinessObject bo : bos.returnValue) {
+					ClientBusinessObject cbo = new ClientBusinessObject();
 					cbo.setBusinessObject(bo);
 					queryEnumText(cbo,enumAttrName);
 					allCbos.add(cbo);
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
index 27a1fcf..1d5153f 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
@@ -41,7 +41,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import plm.ddlTool.client.DDLToolClient;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -648,8 +647,9 @@
                     String alterSql = BtmProvider.getInstance().getAddPKSql(btmItem.name);
                     sql = sql.substring(0, sql.lastIndexOf(","));
                     sql = sql + "\n)";
-                    DDLToolClient.getService().executeUpdateOracle(sql);
-                    DDLToolClient.getService().executeUpdateOracle(alterSql);
+                    //TODO 鏆傛椂涓嶆竻妤氱敤浣曠鏂瑰紡鍒涘缓琛紝姝ゅ鍏堟敞閲婃帀
+//                    DDLToolClient.getService().executeUpdateOracle(sql);
+//                    DDLToolClient.getService().executeUpdateOracle(alterSql);
                 }catch (PLException vciError){
                     throw WebUtil.getVciBaseException(vciError);
                 }
@@ -1131,7 +1131,8 @@
             }
             addSql = VciBaseUtil.removeComma(addSql.replace("\n\t",""));
             addSql = addSql + ")";
-            DDLToolClient.getService().batchExecuteUpdateOracle(new String[]{addSql});
+            //TODO 涓嶆竻妤氬叿浣撲娇鐢ㄤ粈涔堟柟娉曪紝鏆傛椂娉ㄩ噴锛屼絾涓嶈鍒犻櫎
+//            DDLToolClient.getService().batchExecuteUpdateOracle(new String[]{addSql});
         }
     }
 
@@ -1149,7 +1150,8 @@
             }
             removeSql = VciBaseUtil.removeComma(removeSql.replace("\n\t",""));
             removeSql = removeSql + ")";
-            DDLToolClient.getService().batchExecuteUpdateOracle(new String[]{removeSql});
+            //TODO 涓嶆竻妤氬叿浣撲娇鐢ㄤ粈涔堟柟娉曪紝鏆傛椂娉ㄩ噴锛屼絾涓嶈鍒犻櫎
+//            DDLToolClient.getService().batchExecuteUpdateOracle(new String[]{removeSql});
         }
     }
 
@@ -1285,8 +1287,9 @@
                     }
                     sql = sql.substring(0, sql.lastIndexOf(","));
                     sql = sql + "\n)";
-                    DDLToolClient.getService().executeUpdateOracle(sql);
-                    DDLToolClient.getService().executeUpdateOracle(LinkTypeProvider.getInstance().getAddPKSql(linkType.name));
+                    //TODO 涓嶆竻妤氬叿浣撲娇鐢ㄤ粈涔堟柟娉曪紝鏆傛椂娉ㄩ噴锛屼絾涓嶈鍒犻櫎
+//                    DDLToolClient.getService().executeUpdateOracle(sql);
+//                    DDLToolClient.getService().executeUpdateOracle(LinkTypeProvider.getInstance().getAddPKSql(linkType.name));
                 }catch (PLException vciError){
                     throw WebUtil.getVciBaseException(vciError);
                 }
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebContextInfoFetcher.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebContextInfoFetcher.java
index 555abd0..34d927f 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebContextInfoFetcher.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebContextInfoFetcher.java
@@ -1,14 +1,13 @@
 package com.vci.web.service.impl;
 
-import com.vci.corba.common.data.VCIInvocationInfo;
-import com.vci.mw.client.ClientContextVariable;
-import com.vci.mw.client.IInvocationContext;
-import com.vci.starter.corba.constant.CorbaKeyConstant;
-import com.vci.starter.corba.initializer.JacorbSessionContext;
+import com.vci.client.mw.ClientSessionUtility;
+import com.vci.client.mw.IInvocationContext;
+import com.vci.corba.common.data.InvocationInfo;
 import com.vci.starter.web.annotation.log.VciUnLog;
 import com.vci.starter.web.enumpck.DataSecretEnum;
 import com.vci.starter.web.pagemodel.SessionInfo;
 import com.vci.starter.web.util.WebThreadLocalUtil;
+import com.vci.web.constant.CorbaKeyConstant;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
@@ -20,7 +19,7 @@
  * @date 2021-2-2
  */
 @Component
-public class WebContextInfoFetcher implements IInvocationContext, JacorbSessionContext {
+public class WebContextInfoFetcher implements IInvocationContext {
 
 	/**
 	 * 鑾峰彇corba鎵�闇�鐨勪細璇濈殑淇℃伅
@@ -28,46 +27,30 @@
 	 */
 	@Override
 	@VciUnLog
-	public VCIInvocationInfo getInvocationInfo() {
+	public InvocationInfo getInvocationInfo() {
 		SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().get();
 		if(sessionInfo == null){
-			return ClientContextVariable.getInvocationInfo();
+			return ClientSessionUtility.getInvocation();
 		}else {
-			VCIInvocationInfo vcii = new VCIInvocationInfo();
+			InvocationInfo vcii = new InvocationInfo();
 			if (sessionInfo != null) {
-				vcii.clientIPInfo = sessionInfo.getIp()==null?"127.0.0.1":sessionInfo.getIp();
-				vcii.clientMachine = sessionInfo.getMachine()== null?"PC":sessionInfo.getMachine();
-				vcii.clientOS = sessionInfo.getOs()==null?"windows":sessionInfo.getOs();
-				vcii.clientOSUser = sessionInfo.getOsUser() == null?"unknow":sessionInfo.getOsUser();
-				vcii.email=sessionInfo.getEmail() ==null?"":sessionInfo.getEmail();
-				vcii.groupIDs = sessionInfo.getDeptOid()==null?new String[0]:sessionInfo.getDeptOid().split(",");
-				vcii.groupNames =sessionInfo.getDeptName() ==null?new String[0]:sessionInfo.getDeptName().split(",");
-				vcii.language = sessionInfo.getLanguage()==null?"ZH_CN":sessionInfo.getLanguage();
-				vcii.secretGrade = sessionInfo.getUserSecret()==null?"10": sessionInfo.getUserSecret();
-				vcii.trueName = sessionInfo.getUserName() ==null?"":sessionInfo.getUserName();
-				vcii.userID = sessionInfo.getUserOid()==null?"":sessionInfo.getUserOid();
-				vcii.userName = sessionInfo.getUserId() == null?"":sessionInfo.getUserId();
-				vcii.roleIDs = sessionInfo.getRolesName() == null ? new String[0]:sessionInfo.getRolesName().keySet().toArray(new String[0]);
-				vcii.roleNames = sessionInfo.getRolesName() == null ? new String[0]:sessionInfo.getRolesName().values().toArray(new String[0]);
+				vcii.setToken(sessionInfo.getToken());
 				Map<String,String> globalAttributeMap = sessionInfo.getGlobalAttributeMap();
 				if(globalAttributeMap==null){
 					globalAttributeMap = new HashMap<>();
+					globalAttributeMap.put(CorbaKeyConstant.CURRENT_USER_ID,sessionInfo.getUserId());
+					globalAttributeMap.put(CorbaKeyConstant.CURRENT_USER_NAME,sessionInfo.getUserName());
+					globalAttributeMap.put(CorbaKeyConstant.CURRENT_USER_SECRET,sessionInfo.getUserSecret());
+					globalAttributeMap.put(CorbaKeyConstant.CURRENT_USER_EMAIL,sessionInfo.getEmail());
+					globalAttributeMap.put(CorbaKeyConstant.CURRENT_USER_GROUPNUM,"");
+					globalAttributeMap.put(CorbaKeyConstant.CURRENT_MACHINE_SECRET, DataSecretEnum.NONE.getValue()+"");
+					globalAttributeMap.put(CorbaKeyConstant.IP_SECRET_SWITCH,"off");
+					globalAttributeMap.put(CorbaKeyConstant.CURRENT_USER_GROUPNAME,sessionInfo.getDeptName());
+					globalAttributeMap.put(CorbaKeyConstant.USER_SECRET_SWITCH,"off");
+					globalAttributeMap.put(CorbaKeyConstant.CURRENTTIME, String.valueOf(System.currentTimeMillis()));
 				}
-				String[] globalAttributeString = new String[11];
-				globalAttributeString[0]= CorbaKeyConstant.CURRENT_USER_ID + "=" + globalAttributeMap.getOrDefault(CorbaKeyConstant.CURRENT_USER_ID,sessionInfo.getUserId());
-				globalAttributeString[1]=CorbaKeyConstant.CURRENT_USER_NAME + "=" + globalAttributeMap.getOrDefault(CorbaKeyConstant.CURRENT_USER_NAME,sessionInfo.getUserName());
-				globalAttributeString[2]=CorbaKeyConstant.CURRENT_USER_SECRET +"=" + globalAttributeMap.getOrDefault(CorbaKeyConstant.CURRENT_USER_SECRET,sessionInfo.getUserSecret());
-				globalAttributeString[3]=CorbaKeyConstant.CURRENT_USER_EMAIL +"=" + globalAttributeMap.getOrDefault(CorbaKeyConstant.CURRENT_USER_EMAIL,sessionInfo.getEmail());
-				globalAttributeString[4]=CorbaKeyConstant.CURRENT_USER_GROUPNUM +"=" + globalAttributeMap.getOrDefault(CorbaKeyConstant.CURRENT_USER_GROUPNUM,"");
-				globalAttributeString[5]=CorbaKeyConstant.CURRENT_MACHINE_SECRET + "=" + globalAttributeMap.getOrDefault(CorbaKeyConstant.CURRENT_MACHINE_SECRET, DataSecretEnum.NONE.getValue()+"");
-				String ipSec = globalAttributeMap.getOrDefault(CorbaKeyConstant.IP_SECRET_SWITCH,"off");
-				globalAttributeString[6]=CorbaKeyConstant.IP_SECRET_SWITCH + "=" + ipSec;
-				globalAttributeString[7]=CorbaKeyConstant.CURRENT_USER_GROUPNAME +"=" + globalAttributeMap.getOrDefault(CorbaKeyConstant.CURRENT_USER_GROUPNAME,sessionInfo.getDeptName());
-				globalAttributeString[8]=CorbaKeyConstant.USER_SECRET_SWITCH+ "=" + globalAttributeMap.getOrDefault(CorbaKeyConstant.USER_SECRET_SWITCH,"off");
-				globalAttributeString[9]=String.valueOf(System.currentTimeMillis());
-				globalAttributeString[10]=sessionInfo.getToken();
 				//鐜板湪涓嶇‘瀹氳�佺殑鏄惁鍙互鎺ュ彈鏁扮粍澶氫釜鐨勬儏鍐�
-				vcii.extAttribs = globalAttributeString;
+				vcii.extAttribs = globalAttributeMap;
 			}
 			return vcii;
 		}
@@ -77,7 +60,6 @@
 	 * 鑾峰彇褰撳墠浼氳瘽
 	 * @return 浼氳瘽鐨勫璞�
 	 */
-	@Override
 	public SessionInfo getSessionInfo() {
 		return WebThreadLocalUtil.getCurrentUserSessionInfoInThread().get();
 	}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java
index 402f00c..5d73662 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java
@@ -2,14 +2,19 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.vci.client.bof.BOFactoryClient;
 import com.vci.client.bof.ClientBusinessObject;
 import com.vci.client.bof.ClientLinkObject;
 import com.vci.client.bof.ClientLinkObjectOperation;
+import com.vci.client.common.oq.OQTool;
 import com.vci.client.common.providers.ServiceProvider;
 import com.vci.common.qt.object.*;
+import com.vci.common.utility.ObjectUtility;
 import com.vci.corba.common.PLException;
+import com.vci.corba.omd.data.AttributeValue;
 import com.vci.corba.omd.data.LinkObject;
 import com.vci.corba.query.ObjectQueryService;
+import com.vci.corba.query.data.BOAndLO;
 import com.vci.starter.web.constant.QueryOptionConstant;
 import com.vci.starter.web.exception.VciBaseException;
 import com.vci.starter.web.pagemodel.DataGrid;
@@ -44,17 +49,17 @@
 	 * 澶氳瑷�鍓嶇紑
 	 */
 	private final String msgCodePrefix = "com.vci.web.loService.";
-	
+
 	/**
 	 * 鏃ュ織瀵硅薄
 	 */
 	private Logger logger = LoggerFactory.getLogger(getClass());
-	
+
 	/**
 	 * LO鎿嶄綔绫�
 	 */
 	private ClientLinkObjectOperation loOperation = new ClientLinkObjectOperation();
-	
+
 	@Autowired
 	private WebBoServiceI boService;
 
@@ -89,7 +94,7 @@
 		LO_BASE_FIELD_MAP.put("ts","ts");
 		LO_BASE_FIELD_MAP.put("linkTypeName","linkTypeName");
 	}
-	
+
 	@Override
 	public ClientLinkObjectOperation getLoOption() throws VciBaseException {
 		return loOperation;
@@ -113,13 +118,13 @@
 			int level, Map<String, String> conditionMap) throws VciBaseException {
 		return queryCLO(linkType, toBtmName, level, false, conditionMap);
 	}
-	
+
 	@Override
 	public List<ClientLinkObject> queryCLO(String linkType, String toBtmName,
 			int level, boolean isDirection,Map<String, String> conditionMap) throws VciBaseException {
 		return queryCLO(linkType,toBtmName,level,isDirection,conditionMap,new PageHelper(-1));
 	}
-	
+
 	/***
 	 * 閾炬帴鏌ヨ锛屾敮鎸侀檺瀹氭煇绔殑涓氬姟绫诲瀷锛岄檺瀹氬眰绾э紝鎺掑簭锛屽弽鍚戯紝鏌ヨ鏉′欢锛屼絾鏄笉鏀寔鏋氫妇鍜屽弬鐓у瓧娈电殑鏄剧ず
 	 * @param linkType 閾炬帴绫诲瀷鍚嶇О
@@ -184,19 +189,19 @@
 		Condition condition = boService.getConditionByMap(conditionMap);
 		qt.setCondition(condition);
 		try {
-			LinkObject[] bos = platformClientUtil.getQueryService().findLTObjects(qt.getId(), Tool.qtTOXMl(qt).asXML());
+			LinkObject[] bos = platformClientUtil.getQueryService().findLTObjects(qt.getId(), OQTool.qtTOXMl(qt).asXML());
 			if (bos != null && bos.length > 0) {
 				for (LinkObject bo : bos) {
 					ClientLinkObject clo = new ClientLinkObject();
 					clo.setLinkObject(bo);
-					
+
 					rtnOBJs.add(clo);
 				}
 				return rtnOBJs;
 			}
-		} catch (VCIError e) {
-//			logger.error(e.error_code,e);
-//			throw WebUtil.getVciBaseException(e);
+		} catch (PLException e) {
+			logger.error(e.code,e);
+			throw WebUtil.getVciBaseException(e);
 		}
 		return rtnOBJs;
 	}
@@ -208,7 +213,7 @@
 			throws VciBaseException {
 		return queryLinkCbo(linkType, toBtmname, level, false, conditionMap);
 	}
-	
+
 	@Override
 	public List<ClientBusinessObject> queryLinkCbo(String linkType,
 			String toBtmName, int level,boolean isDirection, Map<String, String> conditionMap)
@@ -238,7 +243,7 @@
 			}else if(!isDirection && conditionMap.containsKey("f_oid")){
 				btmOid = conditionMap.get("f_oid");
 			}
-			BOAndLO[] bos = platformClientUtil.getQueryService().getBOAndLOS(qt.getId(), Tool.qtTOXMl(qt).asXML(),btmOid);
+			BOAndLO[] bos = platformClientUtil.getQueryService().getBOAndLOS(qt.getId(), OQTool.qtTOXMl(qt).asXML(),btmOid);
 			if (bos != null && bos.length > 0) {
 				for (BOAndLO blo : bos) {
 					ClientBusinessObject cbo = new ClientBusinessObject();
@@ -247,7 +252,7 @@
 				}
 				return rtnOBJs;
 			}
-		} catch (VCIError e) {
+		} catch (PLException e) {
 //			logger.error(e.error_code,e);
 //			throw WebUtil.getVciBaseException(e);
 		}
@@ -255,7 +260,7 @@
 	}
 
 	@Override
-	public Map<String, com.vci.client.bof.ClientBusinessObject> queryLinkedCbo(LinkObject[] lo,
+	public Map<String, ClientBusinessObject> queryLinkedCbo(LinkObject[] lo,
 			boolean isDirection) throws VciBaseException {
         ClientLinkObject[] clos = new ClientLinkObject[lo.length];
         for(int i =0 ; i < lo.length; i ++){
@@ -267,13 +272,13 @@
 	}
 
 	@Override
-	public Map<String, com.vci.client.bof.ClientBusinessObject> queryLinkedCbo(List los,
+	public Map<String, ClientBusinessObject> queryLinkedCbo(List los,
 			boolean isDirection) throws VciBaseException {
 		return queryLinkedCbo(los,isDirection,new ArrayList<String>());
 	}
-	
+
 	@Override
-	public Map<String, com.vci.client.bof.ClientBusinessObject> queryLinkedCbo(List los,
+	public Map<String, ClientBusinessObject> queryLinkedCbo(List los,
 			boolean isDirection,List<String> queryColumn) throws VciBaseException {
 		ClientLinkObject[] clos = new ClientLinkObject[los.size()];
 		for(int i = 0 ; i < los.size(); i ++){
@@ -290,15 +295,15 @@
 	}
 
 	@Override
-	public Map<String, com.vci.client.bof.ClientBusinessObject> queryLinkedCbo(
+	public Map<String, ClientBusinessObject> queryLinkedCbo(
 			ClientLinkObject[] clol, boolean isDirection) throws VciBaseException {
 		return queryLinkedCbo(clol,isDirection,new ArrayList<String>());
 	}
 	/*****
-	 * 
+	 *
 	 */
 	@Override
-	public Map<String, com.vci.client.bof.ClientBusinessObject> queryLinkedCbo(
+	public Map<String, ClientBusinessObject> queryLinkedCbo(
 			ClientLinkObject[] clol, boolean isDirection,List<String> queryColumn) throws VciBaseException{
 		Map<String/*t_oid鎴栬�協_oid*/,String/*oid*/> linkBoOidMap = new HashMap<String, String>();
 		Map<String,String> btmTypeOidMap = new HashMap<String, String>();
@@ -324,7 +329,7 @@
 				btmTypeOidMap.put(btmType, oids);
 			}
 		}
-		Map<String,com.vci.client.bof.ClientBusinessObject> linkedCboMap = new HashMap<>();
+		Map<String,ClientBusinessObject> linkedCboMap = new HashMap<>();
 		Iterator<String> it = btmTypeOidMap.keySet().iterator();
 		while(it.hasNext()){
 			String btmType = it.next();
@@ -341,9 +346,9 @@
 			}
 			Map<String,String> conditionMap = new HashMap<>();
 			conditionMap.put("oid",oids);
-			List<com.vci.client.bof.ClientBusinessObject> allCbo = boService.queryCBO(btmType, conditionMap,new PageHelper(-1),clauseList);
+			List<ClientBusinessObject> allCbo = boService.queryCBO(btmType, conditionMap,new PageHelper(-1),clauseList);
 			if(allCbo.size()>0){
-				for(com.vci.client.bof.ClientBusinessObject cbo : allCbo){
+				for(ClientBusinessObject cbo : allCbo){
 					String linkOid = linkBoOidMap.get(cbo.getOid());
 					linkedCboMap.put(linkOid, cbo);
 				}
@@ -353,16 +358,16 @@
 	}
 
 	@Override
-	public List<Map> clos2Map(List<com.vci.client.bof.ClientLinkObject> clos) throws VciBaseException {
+	public List<Map> clos2Map(List<ClientLinkObject> clos) throws VciBaseException {
 		List<Map> allMap = new ArrayList<Map>();
-		for(com.vci.client.bof.ClientLinkObject clo : clos){
+		for(ClientLinkObject clo : clos){
 			allMap.add(clo2Map(clo));
 		}
 		return allMap;
 	}
 
 	@Override
-	public Map clo2Map(com.vci.client.bof.ClientLinkObject clo) throws VciBaseException {
+	public Map clo2Map(ClientLinkObject clo) throws VciBaseException {
 		Map<String,String> map = new HashMap<String, String>();
 		WebUtil.copyValueToMapFromClos(clo, map);
 		return map;
@@ -408,16 +413,16 @@
 			if(StringUtils.isBlank(clo.getCreator())){
 				clo.setCreator(WebUtil.getCurrentUserId());
 			}
-			if(StringUtils.isBlank(clo.getCreateTime())){
-				clo.setCreateTime(VciDateUtil.getNowString(VciDateUtil.DateTimeMillFormat));
+			if(clo.getCreateTime() == 0){
+				clo.setCreateTime(VciDateUtil.getTime(VciDateUtil.getNow()));
 			}
 			if(StringUtils.isBlank(clo.getLastModifier())){
 				clo.setLastModifier(clo.getCreator());
 			}
-			if(StringUtils.isBlank(clo.getLastModifyTime())){
+			if(clo.getLastModifyTime() == 0){
 				clo.setLastModifyTime(clo.getCreateTime());
 			}
-			if(StringUtils.isBlank(clo.getTs())){
+			if(clo.getTs() == 0){
 				clo.setTs(clo.getCreateTime());
 			}
 			linkObjects.add(clo.getLinkObject());
@@ -433,7 +438,7 @@
 				}
 			}
 			return savedClientLinkObject;
-		} catch (VCIError vciError) {
+		} catch (PLException vciError) {
 			throw WebUtil.getVciBaseException(vciError);
 		}
 	}
@@ -450,7 +455,7 @@
 		WebUtil.alertNotNull(loName,"閾炬帴");
 		try {
 			return loOperation.createLinkObject(loName,WebUtil.getCurrentUserId());
-		} catch (VCIError vciError) {
+		} catch (PLException vciError) {
 			throw WebUtil.getVciBaseException(vciError);
 		}
 	}
@@ -476,7 +481,7 @@
 		newClo.setLinkObject(lo);
 		newClo.setOid((new ObjectUtility()).getNewObjectID36());
 		newClo.setCreator(WebUtil.getCurrentUserId());
-		newClo.setCreateTime(VciDateUtil.getNowString(VciDateUtil.DateTimeMillFormat));
+		newClo.setCreateTime(VciDateUtil.getTime(VciDateUtil.getNow()));
 		newClo.setLastModifier(newClo.getCreator());
 		newClo.setLastModifyTime(newClo.getCreateTime());
 		newClo.setTs(newClo.getCreateTime());
@@ -494,7 +499,7 @@
 		if(clos!=null){
 			try {
 				loOperation.batchdDeleteLinkObject(clos.toArray(new ClientLinkObject[0]));
-			} catch (VCIError vciError) {
+			} catch (PLException vciError) {
 				throw  WebUtil.getVciBaseException(vciError);
 			}
 		}
@@ -510,7 +515,7 @@
 		if(clos!=null){
 			try {
 				loOperation.batchUpdateLinkObject(clos.toArray(new ClientLinkObject[0]));
-			} catch (VCIError vciError) {
+			} catch (PLException vciError) {
 				throw  WebUtil.getVciBaseException(vciError);
 			}
 		}
@@ -577,14 +582,14 @@
 		}
 		Condition condition = boService.getConditionByMap(conditionMap);
 		if(qt.getCondition() !=null) {
-			qt.setCondition(Tool.mergeCondition(qt.getCondition(), condition, Connector.AND));
+			qt.setCondition(OQTool.mergeCondition(qt.getCondition(), condition, Connector.AND));
 		}else {
 			qt.setCondition(condition);
 		}
 		boService.setPageAndOrderToQT(qt,linkTypeDataQuery.getPageHelper());
 		try {
-//			com.vci.corba.query.data.BOAndLO[] bos = platformClientUtil.getQueryService().getBOAndLOS(qt.getId(), Tool.qtTOXMl(qt).asXML(),linkTypeDataQuery.getParentOid()==null?"":linkTypeDataQuery.getParentOid());
-			com.vci.corba.query.data.BOAndLO[] bos = ServiceProvider.getOQService().getBOAndLOS(qt.getId(), Tool.qtTOXMl(qt).asXML(),linkTypeDataQuery.getParentOid()==null?"":linkTypeDataQuery.getParentOid());
+//			com.vci.corba.query.data.BOAndLO[] bos = platformClientUtil.getQueryService().getBOAndLOS(qt.getId(), OQTool.qtTOXMl(qt).asXML(),linkTypeDataQuery.getParentOid()==null?"":linkTypeDataQuery.getParentOid());
+			com.vci.corba.query.data.BOAndLO[] bos = ServiceProvider.getOQService().getBOAndLOS(qt.getId(), OQTool.qtTOXMl(qt).asXML(),linkTypeDataQuery.getParentOid()==null?"":linkTypeDataQuery.getParentOid());
 			return Arrays.stream(bos).collect(Collectors.toList());
 		} catch (PLException e) {
 //			logger.error(e.error_code,e);
@@ -688,7 +693,7 @@
 		}
 		Condition condition = boService.getConditionByMap(conditionMap);
 		if(qt.getCondition() !=null) {
-			qt.setCondition(Tool.mergeCondition(qt.getCondition(), condition, Connector.AND));
+			qt.setCondition(OQTool.mergeCondition(qt.getCondition(), condition, Connector.AND));
 		}else {
 			qt.setCondition(condition);
 		}
@@ -698,15 +703,15 @@
 		Map<String,List<String>> toBtmOidsMap = new HashMap<>();
 		try {
 			IntHolder totalHolder = new IntHolder();
-//			com.vci.corba.omd.data.LinkObject[] linkObjects = platformClientUtil.getQueryService().findLTObjectsV2(qt.getId(), Tool.qtTOXMl(qt).asXML(),totalHolder);
-			ObjectQueryService.FindLTObjectsV2Result linkObjects = ServiceProvider.getOQService().findLTObjectsV2(qt.getId(), Tool.qtTOXMl(qt).asXML());
+//			com.vci.corba.omd.data.LinkObject[] linkObjects = platformClientUtil.getQueryService().findLTObjectsV2(qt.getId(), OQTool.qtTOXMl(qt).asXML(),totalHolder);
+			ObjectQueryService.FindLTObjectsV2Result linkObjects = ServiceProvider.getOQService().findLTObjectsV2(qt.getId(), OQTool.qtTOXMl(qt).asXML());
 
 
 			List<Map<String,String>> data = new ArrayList<>();
 			List<String> finalEnumFields = enumFields;
 			final Integer[] total = {totalHolder.value};
 			Arrays.stream(linkObjects.returnValue).forEach(lo->{
-				com.vci.client.bof.ClientLinkObject clo = new com.vci.client.bof.ClientLinkObject();
+				ClientLinkObject clo = new ClientLinkObject();
 				clo.setLinkObject(lo);
 				Map<String, String> map = new HashMap<>();
 				boService.queryEnumText(null,clo, finalEnumFields);
@@ -741,7 +746,7 @@
 					//鍒嗛〉涓嶈瓒呰繃1000
 					Map<String,String> boConditionMap =new HashMap<>();
 					boConditionMap.put("oid",QueryOptionConstant.IN + "(" + WebUtil.toInSql(oids.toArray(new String[0])) + ")");
-					List<com.vci.client.bof.ClientBusinessObject> cbos = boService.queryCBO(btm, boConditionMap, null, fromFieldsFix);
+					List<ClientBusinessObject> cbos = boService.queryCBO(btm, boConditionMap, null, fromFieldsFix);
 					if(!CollectionUtils.isEmpty(cbos)){
 						cbos.stream().forEach(cbo->{
 							dataGrid.getData().forEach(data->{
@@ -765,7 +770,7 @@
 					//鍒嗛〉涓嶈瓒呰繃1000
 					Map<String,String> boConditionMap =new HashMap<>();
 					boConditionMap.put("oid",QueryOptionConstant.IN + "(" + WebUtil.toInSql(oids.toArray(new String[0])) + ")");
-					List<com.vci.client.bof.ClientBusinessObject> cbos = boService.queryCBO(btm, boConditionMap, null, toFieldsFix);
+					List<ClientBusinessObject> cbos = boService.queryCBO(btm, boConditionMap, null, toFieldsFix);
 					if(!CollectionUtils.isEmpty(cbos)){
 						cbos.stream().forEach(cbo->{
 							dataGrid.getData().forEach(data->{
@@ -822,8 +827,8 @@
 		Condition condition = boService.getConditionByMap(conditionMap);
 		qt.setCondition(condition);
 		try {
-			return  platformClientUtil.getQueryService().findTotalCount(qt.getId(), Tool.qtTOXMl(qt).asXML());
-		} catch (VCIError vciError) {
+			return Math.toIntExact(platformClientUtil.getQueryService().findTotalCount(qt.getId(), OQTool.qtTOXMl(qt).asXML()));
+		} catch (PLException vciError) {
 			throw WebUtil.getVciBaseException(vciError);
 		}
 	}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLogServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLogServiceImpl.java
index 68bc63b..0ea5c4b 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLogServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLogServiceImpl.java
@@ -1,9 +1,6 @@
 package com.vci.web.service.impl;
 
-import com.vci.corba.common.VCIError;
-import com.vci.corba.common.data.VCIInvocationInfo;
-import com.vci.corba.framework.data.UserEntityInfo;
-import com.vci.rmip.ClientSession;
+import com.vci.corba.common.data.UserEntityInfo;
 import com.vci.starter.web.pagemodel.SessionInfo;
 import com.vci.starter.web.util.WebThreadLocalUtil;
 import com.vci.web.bo.VciLogObjectBO;
@@ -15,7 +12,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -93,7 +89,6 @@
 				VciLogObjectBO log = allLogs.get(0);
 				SessionInfo si = log_userMap.get(log.getOid());
 				UserEntityInfo ue = new UserEntityInfo();
-				ue.ip = log.getIp();
 				ue.modules = log.getModelName();
 				ue.userName = log.getUserId();
 				WebThreadLocalUtil.getCurrentUserSessionInfoInThread().set(si);
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
index 4c7db5e..5efa41b 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
@@ -1,16 +1,15 @@
 package com.vci.web.service.impl;
 
-import com.vci.corba.common.VCIError;
-import com.vci.corba.framework.data.UserEntityInfo;
+import com.vci.client.bof.ClientLinkObject;
+import com.vci.corba.common.data.UserEntityInfo;
 import com.vci.corba.workflow.data.FlowInstanceInfo;
 import com.vci.corba.workflow.data.MapTransfersInfo;
+import com.vci.corba.workflow.data.TasksAssignedInfo;
 import com.vci.file.dto.VciFileObjectDTO;
-import com.vci.rmip.workflow.server.template.TasksAssigned;
 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.PageHelper;
 import com.vci.starter.web.pagemodel.SessionInfo;
 import com.vci.starter.web.util.LangBaseUtil;
 import com.vci.starter.web.util.VciDateUtil;
@@ -34,8 +33,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientLinkObject;
 
 import java.util.*;
 import java.util.Map.Entry;
@@ -551,7 +548,7 @@
     }
 
     @Override
-    public TasksAssigned getProxy() throws VciBaseException {
+    public TasksAssignedInfo getProxy() throws VciBaseException {
         return processDao.getProxy();
     }
 
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java
index 8386f3e..77b29f6 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java
@@ -1,5 +1,7 @@
 package com.vci.web.service.impl;
 
+import com.vci.client.bof.ClientLinkObject;
+import com.vci.client.workflow.editor.FlowConstants;
 import com.vci.file.pagemodel.VciFileObjectVO;
 import com.vci.frameworkcore.compatibility.OrgDeptQueryServiceI;
 import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
@@ -7,19 +9,16 @@
 import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
 import com.vci.frameworkcore.pagemodel.SmRoleVO;
 import com.vci.frameworkcore.pagemodel.SmUserVO;
-import com.vci.rmip.workflow.client.editor.FlowConstants;
 import com.vci.starter.web.enumpck.DataSecretEnum;
 import com.vci.starter.web.enumpck.UserSecretEnum;
 import com.vci.starter.web.exception.VciBaseException;
 import com.vci.starter.web.pagemodel.*;
-import com.vci.starter.web.util.BeanUtil;
 import com.vci.starter.web.util.Md5;
 import com.vci.starter.web.util.VciBaseUtil;
 import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
 import com.vci.web.constant.FileTypeConstants;
 import com.vci.web.constant.WFVariablesKeyConstant;
 import com.vci.web.dao.WebProcessDaoI;
-import com.vci.web.model.OsStatusDO;
 import com.vci.web.model.WFProcessClassifyDO;
 import com.vci.web.pageModel.*;
 import com.vci.web.properties.WebProperties;
@@ -35,7 +34,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientLinkObject;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java
index b00a728..76e99b9 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebSecretServiceImpl.java
@@ -1,4 +1,5 @@
 package com.vci.web.service.impl;
+
 import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
 import com.vci.frameworkcore.pagemodel.SmUserVO;
 import com.vci.starter.web.enumpck.DataSecretEnum;
@@ -8,8 +9,8 @@
 import com.vci.web.constant.EnumIdConstant;
 import com.vci.web.pageModel.KeyValue;
 import com.vci.web.properties.WebProperties;
-import com.vci.web.service.WebBoServiceI;
 import com.vci.web.service.OsEnumServiceI;
+import com.vci.web.service.WebBoServiceI;
 import com.vci.web.service.WebSecretServiceI;
 import com.vci.web.util.WebUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -17,7 +18,6 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/PlatformClientUtil.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/PlatformClientUtil.java
index 7efe896..fab4471 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/PlatformClientUtil.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/PlatformClientUtil.java
@@ -3,6 +3,7 @@
 import com.vci.client.common.providers.ServiceProvider;
 import com.vci.corba.bofactory.BOFactoryServicePrx;
 import com.vci.corba.common.PLException;
+import com.vci.corba.framework.FrameworkServicePrx;
 import com.vci.corba.omd.atm.AttPoolServicePrx;
 import com.vci.corba.omd.btm.BTMServicePrx;
 import com.vci.corba.omd.etm.EnumServicePrx;
@@ -87,12 +88,20 @@
    }
 
     /**
-     * 鑾峰彇鐧诲綍涓绘湇鍔�
+     * 鑾峰彇娴佺▼鏈嶅姟
      * @return 鏈嶅姟鐨勫璞�
      */
-    public WorkflowServicePrx getLogonFactoryService(){
+    public WorkflowServicePrx getWorkflowService(){
         return ServiceProvider.getWFService();
-  }
+    }
+
+    /**
+     * 鑾峰彇涓绘湇鍔�
+     * @Return 鏈嶅姟鐨勫璞�
+     */
+    public FrameworkServicePrx getFrameworkService(){
+        return ServiceProvider.getFrameService();
+    }
 
     /**
      * 鑾峰彇鐘舵�佹睜鐨勬湇鍔�

--
Gitblit v1.9.3