From f29ad099c6dc5c55d6cb94fb190d06743777ec6d Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期三, 05 六月 2024 10:56:48 +0800
Subject: [PATCH] 项目引用调整
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java | 66 ++++++++++++++------------------
1 files changed, 29 insertions(+), 37 deletions(-)
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..0d56564 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,21 @@
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.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.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 +31,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.*;
@@ -343,11 +341,11 @@
if(key.indexOf("_start")>-1){
String attr = key.replace("_start", "");
thisConditionMap.put(attr, value);
- condition = Tool.getCondition(thisConditionMap);
+ condition = OQTool.getCondition(thisConditionMap);
if(conditionMap.containsKey(attr + "_end")){//濡傛灉娌℃湁缁撴潫锛屽叾瀹炰篃鏄厑璁哥殑锛�
Map<String,String> endConditonMap = new HashMap<String, String>();
endConditonMap.put(attr, conditionMap.get(attr + "_end"));
- condition = Tool.mergeCondition(condition, Tool.getCondition(endConditonMap), Connector.AND);
+ condition = OQTool.mergeCondition(condition, OQTool.getCondition(endConditonMap), Connector.AND);
}
}
}else{
@@ -368,12 +366,12 @@
}else {
thisConditionMap.put(key, value);
}
- condition = Tool.getCondition(thisConditionMap);
+ condition = OQTool.getCondition(thisConditionMap);
}
if(mergeCondition == null){
mergeCondition = condition;
}else{
- mergeCondition = Tool.mergeCondition(mergeCondition, condition, isOr?Connector.OR:Connector.AND);
+ mergeCondition = OQTool.mergeCondition(mergeCondition, condition, isOr? Connector.OR:Connector.AND);
}
}
}
@@ -603,7 +601,7 @@
conditionMap = WebUtil.getNotNullMap(conditionMap);
Condition condition = 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);
}
@@ -622,11 +620,11 @@
ObjectQueryService.FindBTMObjectsV3Result bos = null;
// String invo = JSONObject.toJSONString(InvocationUtility.getInvocation());
try{
- //bos = qtService.findBTMObjectsV3(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
- bos = qtService.findBTMObjectsV3(qt.getId(), Tool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0]));
+ //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(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
- bos = qtService.findBTMObjectsV3(qt.getId(), Tool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0]));
+ //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]));
}
if (bos != null && bos.count > 0) {
for (com.vci.corba.omd.data.BusinessObject bo : bos.returnValue) {
@@ -954,7 +952,7 @@
VciBaseUtil.alertNotNull(name,"鏌ヨ妯℃澘鐨勫悕绉�");
// QTWrapper wrapper = platformClientUtil.getQueryService().getQT(name);
QTInfo wrapper = ServiceProvider.getOMDService().getQTDService().getQT(name);
- qt = Tool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), name);
+ qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), name);
//鍥犱负涔嬪墠骞冲彴鐨凾ool.replaceQTValues 娌℃湁澶勭悊 ${xxx}銆傦紝 涓轰簡蹇界暐澶у皬鍐欙紝鎴戜滑杩欓噷鍗曠嫭澶勭悊 weidy@2021-3-10
//鎴戜滑杞崲涓哄皬鍐�
Condition condition = qt.getCondition();
@@ -992,9 +990,9 @@
});
}
}catch(PLException e){
- //logger.error(e.error_code,e);
- //throw WebUtil.getVciBaseException(e);
- } catch (DocumentException | VCIError e) {
+ logger.error(e.code,e);
+ throw WebUtil.getVciBaseException(e);
+ } catch (DocumentException e) {
logger.error("鏌ヨ妯℃澘杞崲",e);
throw new VciBaseException(this.msgCodePrefix + "qtError", new Object[]{name});
}
@@ -1034,24 +1032,18 @@
conditionMap = WebUtil.getNotNullMap(conditionMap);
Condition condition = 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);
}
- int count = 0;
+ long count = 0;
try{
-// count = platformClientUtil.getQueryService().findTotalCount();
- count = Integer.parseInt(String.valueOf(ServiceProvider.getOQService().findTotalCount(qt.getId(), Tool.qtTOXMl(qt).asXML())));
+ count = platformClientUtil.getQueryService().findTotalCount(qt.getId(), OQTool.qtTOXMl(qt).asXML());
}catch (PLException e) {
- try {
-// count = platformClientUtil.getQueryService().findTotalCount(qt.getId(), Tool.qtTOXMl(qt).asXML());
- count = Integer.parseInt(String.valueOf(ServiceProvider.getOQService().findTotalCount(qt.getId(), Tool.qtTOXMl(qt).asXML())));
- }catch (PLException ee) {
-// logger.error(ee.error_code,ee);
-// throw WebUtil.getVciBaseException(ee);
- }
+ logger.error(e.code,e);
+ throw WebUtil.getVciBaseException(e);
}
- return count;
+ return (int) count;
}
/**
@@ -1107,8 +1099,8 @@
if(results!=null && results.length>0 && results[0] != null && results[0].length>0){
return WebUtil.getInt(results[0][0]);
}
- }catch (VCIError e){
- throw WebUtil.getVciBaseException(e);
+ } catch (PLException e) {
+ throw new RuntimeException(e);
}
return 0;
}
--
Gitblit v1.9.3