From 890eef1b4240e0fcf8c6f2000e01f43e587702ef Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期二, 04 六月 2024 16:44:00 +0800
Subject: [PATCH] 调整项目的引用
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java | 19 +--
Source/platformProject/pom.xml | 1
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebBoServiceI.java | 11 -
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java | 2
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/OsCodeBreakCodeDaoImpl.java | 1
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/BdSelectInputCharServiceImpl.java | 37 +++---
Source/platformProject/vci-platform-web/pom.xml | 2
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/FormulaServiceImpl.java | 3
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java | 15 ++-
Source/platformProject/vci-platform-starter/pom.xml | 147 +++++++++++++++++++++++++++--
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java | 1
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java | 14 --
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java | 3
13 files changed, 181 insertions(+), 75 deletions(-)
diff --git a/Source/platformProject/pom.xml b/Source/platformProject/pom.xml
index 231d211..58e34ad 100644
--- a/Source/platformProject/pom.xml
+++ b/Source/platformProject/pom.xml
@@ -15,6 +15,7 @@
<version>2024.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
+ <platform.version>2024.1-SNAPSHOT</platform.version>
<vciplt.version>2022.RELEASE</vciplt.version>
<old.spring.version>3.2.0.RELEASE</old.spring.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/Source/platformProject/vci-platform-starter/pom.xml b/Source/platformProject/vci-platform-starter/pom.xml
index 1050ce5..59a3d7a 100644
--- a/Source/platformProject/vci-platform-starter/pom.xml
+++ b/Source/platformProject/vci-platform-starter/pom.xml
@@ -26,6 +26,87 @@
<artifactId>plt-client</artifactId>
<version>1.0.RELEASE</version>
</dependency>
+ <!--client鐨勪緷璧�-->
+ <dependency>
+ <groupId>com.formdev</groupId>
+ <artifactId>flatlaf</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jgoodies</groupId>
+ <artifactId>jgoodies-common</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jgoodies</groupId>
+ <artifactId>jgoodies-looks</artifactId>
+ <version>2.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jgraph</groupId>
+ <artifactId>jgraph</artifactId>
+ <version>3.1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.mxgraph</groupId>
+ <artifactId>jgraphx</artifactId>
+ <version>3.1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.l2fprod</groupId>
+ <artifactId>nativeskin</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.belerweb</groupId>
+ <artifactId>pinyin4j</artifactId>
+ <version>2.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>3.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml-schemas</artifactId>
+ <version>3.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-scratchpad</artifactId>
+ <version>3.9</version>
+ </dependency>
+ <dependency>
+ <groupId>com.protege</groupId>
+ <artifactId>protege35</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.skinlf</groupId>
+ <artifactId>skinlf</artifactId>
+ <version>6.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.swinglabs</groupId>
+ <artifactId>swingx</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.swixml</groupId>
+ <artifactId>swixml</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.uitheme</groupId>
+ <artifactId>uitheme</artifactId>
+ <version>1.3.1</version>
+ </dependency>
<!--common-->
<dependency>
@@ -38,27 +119,69 @@
<artifactId>plt-slice</artifactId>
<version>1.0.RELEASE</version>
</dependency>
+ <!--common鐨勪緷璧�-->
+ <dependency>
+ <groupId>com.zeroc</groupId>
+ <artifactId>ice</artifactId>
+ <version>3.7.10</version>
+ </dependency>
+ <dependency>
+ <groupId>com.zeroc</groupId>
+ <artifactId>icebox</artifactId>
+ <version>3.7.10</version>
+ </dependency>
<dependency>
<groupId>com.zeroc</groupId>
<artifactId>icegridgui</artifactId>
<version>1.0.RELEASE</version>
</dependency>
-
<dependency>
- <groupId>org.jbpm</groupId>
- <artifactId>jbpm-core</artifactId>
- <version>4.3.2</version>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.1</version>
</dependency>
<!--鎿嶄綔xml闇�瑕�-->
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>1.2.83</version>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.19</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>2.12.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>2.12.4</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-core</artifactId>
+ <version>4.3.2</version>
</dependency>
<!--commons鐨勫嚑涓粍浠�-->
<dependency>
@@ -76,12 +199,14 @@
<artifactId>commons-fileupload</artifactId>
<version>1.3.1</version>
</dependency>
- <dependency><!---zip鍘嬬缉 鏇挎崲antzip-->
+ <!---zip鍘嬬缉 鏇挎崲antzip-->
+ <dependency>
<groupId>net.lingala.zip4j</groupId>
<artifactId>zip4j</artifactId>
<version>1.3.2</version>
</dependency>
- <dependency><!--zip鍘嬬缉鎵�闇�瑕佺殑jar-->
+ <!--zip鍘嬬缉鎵�闇�瑕佺殑jar-->
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.9</version>
diff --git a/Source/platformProject/vci-platform-web/pom.xml b/Source/platformProject/vci-platform-web/pom.xml
index 0eabe55..7a58871 100644
--- a/Source/platformProject/vci-platform-web/pom.xml
+++ b/Source/platformProject/vci-platform-web/pom.xml
@@ -144,7 +144,7 @@
<dependency>
<groupId>com.vci</groupId>
<artifactId>vci-platform-starter</artifactId>
- <version>2022.1-SNAPSHOT</version>
+ <version>${platform.version}</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/OsCodeBreakCodeDaoImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/OsCodeBreakCodeDaoImpl.java
index d5ee9b4..345e660 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/OsCodeBreakCodeDaoImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/OsCodeBreakCodeDaoImpl.java
@@ -13,7 +13,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/service/WebBoServiceI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebBoServiceI.java
index 5689dff..634c6d8 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebBoServiceI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebBoServiceI.java
@@ -1,20 +1,15 @@
package com.vci.web.service;
+import com.vci.client.bof.ClientBusinessObject;
+import com.vci.common.qt.object.Condition;
+import com.vci.common.qt.object.QueryTemplate;
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.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.pageModel.BatchCBO;
-import com.vci.client.bof.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientBusinessObjectOperation;
-import plm.bs.bom.clientobject.ClientLinkObject;
-import plm.corba.qt.QTServiceOperations;
-import plm.oq.objectQuery.common.Condition;
-import plm.oq.objectQuery.common.QueryTemplate;
import java.util.Collection;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/BdSelectInputCharServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/BdSelectInputCharServiceImpl.java
index 3e4c249..1d60c81 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/BdSelectInputCharServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/BdSelectInputCharServiceImpl.java
@@ -1,35 +1,34 @@
package com.vci.web.service.impl;
-import com.vci.web.pageModel.BdSelectInputCharVO;
-import com.vci.web.dto.BdSelectInputCharDTO;
-import com.vci.web.model.BdSelectInputCharDO;
-import com.vci.web.dao.BdSelectInputCharDaoI;
-import com.vci.web.pageModel.KeyValue;
-import com.vci.web.service.BdSelectInputCharServiceI;
-import com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.*;
-import com.vci.starter.web.util.*;
-import com.vci.starter.web.wrapper.*;
-import com.vci.starter.revision.bo.TreeWrapperOptions;
+import com.vci.starter.web.pagemodel.BaseResult;
+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.BeanUtilForVCI;
+import com.vci.starter.web.util.VciBaseUtil;
+import com.vci.web.dao.BdSelectInputCharDaoI;
+import com.vci.web.dto.BdSelectInputCharDTO;
+import com.vci.web.model.BdSelectInputCharDO;
+import com.vci.web.pageModel.BatchCBO;
+import com.vci.web.pageModel.BdSelectInputCharVO;
+import com.vci.web.pageModel.KeyValue;
+import com.vci.web.service.BdSelectInputCharServiceI;
+import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.WebUtil;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.annotation.Resource;
import org.springframework.util.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import java.lang.reflect.Field;
+import javax.annotation.Resource;
import java.util.*;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.frameworkcore.lcstatuspck.*;
-import com.vci.web.pageModel.BatchCBO;
+
import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
-import static com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant.*;
/**
* 鍙緭鍙�夊唴瀹规湇鍔�
* @author weidy
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/FormulaServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/FormulaServiceImpl.java
index f267a2c..5892509 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/FormulaServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/FormulaServiceImpl.java
@@ -3,7 +3,6 @@
import com.vci.starter.web.constant.VciSystemVarConstants;
import com.vci.starter.web.toolmodel.DateConverter;
import com.vci.starter.web.util.Md5;
-import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
import com.vci.web.service.WebBoServiceI;
import org.apache.commons.lang3.StringUtils;
@@ -20,8 +19,6 @@
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
/**
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java
index 771c83d..eef1f76 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java
@@ -5,12 +5,8 @@
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum;
-import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
-import com.vci.frameworkcore.pagemodel.SmFunctionVO;
-import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO;
-import com.vci.frameworkcore.pagemodel.SmRoleVO;
import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.frameworkcore.properties.VciSecurityManageProperties;
import com.vci.starter.web.annotation.bus.*;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.interceptor.VciSessionForLoginI;
@@ -19,10 +15,8 @@
import com.vci.starter.web.util.ApplicationContextProvider;
import com.vci.starter.web.util.Md5;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.util.VciDateUtil;
import com.vci.web.bo.LoginResultBO;
import com.vci.web.dto.LoginUserDTO;
-import com.vci.frameworkcore.properties.VciSecurityManageProperties;
import com.vci.web.service.LoginServiceI;
import com.vci.web.util.BusAnnotationUtil;
import org.apache.commons.lang3.StringUtils;
@@ -33,11 +27,7 @@
import org.springframework.util.CollectionUtils;
import java.lang.reflect.Method;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.*;
+import java.util.Map;
/**
* 鐧诲綍鐨勬湇鍔�
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
index 3d39be0..7a387cb 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
@@ -21,7 +21,6 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
index 5896187..8735572 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
@@ -14,7 +14,8 @@
import com.vci.web.constant.CacheKeyConstant;
import com.vci.web.pageModel.*;
import com.vci.web.service.*;
-import com.vci.web.util.*;
+import com.vci.web.util.ConcurrentDateFormat;
+import com.vci.web.util.Func;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java
index e684778..4df0334 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.vci.file.util.VciZipUtil;
-import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
@@ -41,7 +40,6 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.util.HtmlUtils;
-import plm.vo.omd.btm.common.BtmProvider;
import javax.annotation.Resource;
import java.io.*;
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 500a13d..f37d360 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
@@ -2,7 +2,7 @@
import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
-import com.vci.corba.common.VCIError;
+import com.vci.corba.omd.etm.EnumItem;
import com.vci.corba.omd.etm.EnumType;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.enumpck.UserSecretEnum;
@@ -13,8 +13,14 @@
import com.vci.starter.web.util.VciDateUtil;
import com.vci.web.constant.CacheKeyConstant;
import com.vci.web.constant.EnumIdConstant;
-import com.vci.web.pageModel.*;
-import com.vci.web.service.*;
+import com.vci.web.pageModel.KeyValue;
+import com.vci.web.pageModel.OsEnumItemVO;
+import com.vci.web.pageModel.OsEnumVO;
+import com.vci.web.pageModel.OsStatusVO;
+import com.vci.web.service.OsEnumServiceI;
+import com.vci.web.service.OsLifeCycleServiceI;
+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.slf4j.Logger;
@@ -26,7 +32,6 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.util.HtmlUtils;
-import com.vci.corba.omd.etm.EnumItem;
import plm.corba.enumManager.EnumItemFilter;
import java.util.*;
@@ -47,7 +52,7 @@
* 骞冲彴璋冪敤瀹㈡埛绔�
*/
//@Autowired
- //private PlatformClientUtil platformClientUtil;
+ private PlatformClientUtil platformClientUtil;
/**
* 鐢熷懡鍛ㄦ湡
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 b75e0f4..f420a1f 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
@@ -1,19 +1,20 @@
package com.vci.web.service.impl;
-import com.alibaba.fastjson.JSONObject;
-import com.vci.base.common.utility.ObjectUtility;
+import com.vci.client.bof.ClientBusinessObject;
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.common.VCIError;
+import com.vci.corba.omd.data.AttributeValue;
+import com.vci.corba.omd.data.BusinessObject;
import com.vci.corba.omd.qtm.QTInfo;
import com.vci.corba.query.ObjectQueryService;
import com.vci.corba.query.ObjectQueryServicePrx;
+import com.vci.corba.query.data.BtmRefQueryOption;
import com.vci.corba.query.data.KV;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.mw.client.InvocationUtility;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.corba.query.data.BtmRefQueryOption;
import com.vci.starter.web.enumpck.BooleanEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -29,16 +30,12 @@
import org.apache.commons.lang3.StringUtils;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
-import org.omg.CORBA.IntHolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import com.vci.client.bof.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientLinkObject;
-import plm.bs.bom.common.*;
-import plm.oq.objectQuery.common.*;
+
import java.lang.reflect.Field;
import java.util.*;
@@ -373,7 +370,7 @@
if(mergeCondition == null){
mergeCondition = condition;
}else{
- mergeCondition = Tool.mergeCondition(mergeCondition, condition, isOr?Connector.OR:Connector.AND);
+ mergeCondition = Tool.mergeCondition(mergeCondition, condition, isOr? Connector.OR:Connector.AND);
}
}
}
--
Gitblit v1.9.3