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/WebLoServiceImpl.java | 118 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 60 insertions(+), 58 deletions(-)
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 0356542..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,8 +2,19 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.vci.base.common.utility.ObjectUtility;
-import com.vci.corba.common.VCIError;
+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;
@@ -18,23 +29,11 @@
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.omg.CORBA.IntHolder;
-import org.omg.CORBA.PRIVATE_MEMBER;
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 plm.bs.bom.clientobject.BOFactoryClient;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientLinkObject;
-import plm.bs.bom.clientobject.ClientLinkObjectOperation;
-import plm.bs.bom.common.AttributeValue;
-import plm.bs.bom.common.BusinessObject;
-import plm.bs.bom.common.LinkObject;
-import plm.corba.qt.BOAndLO;
-import plm.oq.objectQuery.common.*;
-
-import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
@@ -50,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;
@@ -95,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;
@@ -103,13 +102,13 @@
@Override
public List<ClientLinkObject> queryCLO(String linkType,
- Map<String, String> conditionMap) throws VciBaseException {
+ Map<String, String> conditionMap) throws VciBaseException {
return queryCLO(linkType, "", 1, conditionMap);
}
@Override
public List<ClientBusinessObject> queryLinkCbo(String linkType,
- String toBtmname, Map<String, String> conditionMap)
+ String toBtmname, Map<String, String> conditionMap)
throws VciBaseException {
return queryLinkCbo(linkType, toBtmname, 1, conditionMap);
}
@@ -119,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 閾炬帴绫诲瀷鍚嶇О
@@ -190,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;
}
@@ -214,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)
@@ -244,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();
@@ -253,7 +252,7 @@
}
return rtnOBJs;
}
- } catch (VCIError e) {
+ } catch (PLException e) {
// logger.error(e.error_code,e);
// throw WebUtil.getVciBaseException(e);
}
@@ -277,7 +276,7 @@
boolean isDirection) throws VciBaseException {
return queryLinkedCbo(los,isDirection,new ArrayList<String>());
}
-
+
@Override
public Map<String, ClientBusinessObject> queryLinkedCbo(List los,
boolean isDirection,List<String> queryColumn) throws VciBaseException {
@@ -301,7 +300,7 @@
return queryLinkedCbo(clol,isDirection,new ArrayList<String>());
}
/*****
- *
+ *
*/
@Override
public Map<String, ClientBusinessObject> queryLinkedCbo(
@@ -330,7 +329,7 @@
btmTypeOidMap.put(btmType, oids);
}
}
- Map<String,ClientBusinessObject> linkedCboMap = new HashMap<String, ClientBusinessObject>();
+ Map<String,ClientBusinessObject> linkedCboMap = new HashMap<>();
Iterator<String> it = btmTypeOidMap.keySet().iterator();
while(it.hasNext()){
String btmType = it.next();
@@ -414,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());
@@ -439,7 +438,7 @@
}
}
return savedClientLinkObject;
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -456,7 +455,7 @@
WebUtil.alertNotNull(loName,"閾炬帴");
try {
return loOperation.createLinkObject(loName,WebUtil.getCurrentUserId());
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -482,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());
@@ -500,7 +499,7 @@
if(clos!=null){
try {
loOperation.batchdDeleteLinkObject(clos.toArray(new ClientLinkObject[0]));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -516,7 +515,7 @@
if(clos!=null){
try {
loOperation.batchUpdateLinkObject(clos.toArray(new ClientLinkObject[0]));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -529,7 +528,7 @@
* @return 閾炬帴绫诲瀷鍜屽叧鑱旂殑to绔�
*/
@Override
- public List<BOAndLO> queryCLOAndBOBySchema(UILinkTypeDataQuery linkTypeDataQuery) {
+ public List<com.vci.corba.query.data.BOAndLO> queryCLOAndBOBySchema(UILinkTypeDataQuery linkTypeDataQuery) {
VciBaseUtil.alertNotNull(linkTypeDataQuery,"閾炬帴绫诲瀷鏌ヨ瀵硅薄",linkTypeDataQuery.getQueryTemplateName(),"鏌ヨ妯℃澘鐨勫悕绉�");
QueryTemplate qt =boService.getQtByName(linkTypeDataQuery.getQueryTemplateName(),linkTypeDataQuery.getReplaceMap());
return queryCLOAndBOByQueryTemplate(qt,linkTypeDataQuery);
@@ -541,7 +540,7 @@
* @param linkTypeDataQuery 閾炬帴绫诲瀷鐨勬煡璇㈠璞�
* @return 閾炬帴绫诲瀷鍜屼笟鍔＄被鍨�
*/
- private List<BOAndLO> queryCLOAndBOByQueryTemplate(QueryTemplate qt,UILinkTypeDataQuery linkTypeDataQuery){
+ private List<com.vci.corba.query.data.BOAndLO> queryCLOAndBOByQueryTemplate(QueryTemplate qt,UILinkTypeDataQuery linkTypeDataQuery){
if(StringUtils.isNotBlank(linkTypeDataQuery.getToBtmType()) && StringUtils.isBlank(qt.getBtmType())) {
qt.setBtmType(linkTypeDataQuery.getToBtmType());
}
@@ -583,15 +582,16 @@
}
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 {
- BOAndLO[] bos = platformClientUtil.getQueryService().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 (VCIError e) {
+ } catch (PLException e) {
// logger.error(e.error_code,e);
throw WebUtil.getVciBaseException(e);
}
@@ -603,7 +603,7 @@
* @return 閾炬帴瀵硅薄鍜宼o绔笟鍔″璞�
*/
@Override
- public List<BOAndLO> queryCLOAndBoByLinkType(UILinkTypeDataQuery linkTypeDataQuery){
+ public List<com.vci.corba.query.data.BOAndLO> queryCLOAndBoByLinkType(UILinkTypeDataQuery linkTypeDataQuery){
VciBaseUtil.alertNotNull(linkTypeDataQuery,"閾炬帴绫诲瀷鏌ヨ瀵硅薄",linkTypeDataQuery.getLinkType(),"閾炬帴绫诲瀷鐨勫悕绉�");
QueryTemplate qt = null;
if(StringUtils.isBlank(linkTypeDataQuery.getQueryTemplateName())){
@@ -693,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);
}
@@ -703,24 +703,26 @@
Map<String,List<String>> toBtmOidsMap = new HashMap<>();
try {
IntHolder totalHolder = new IntHolder();
- LinkObject[] linkObjects = platformClientUtil.getQueryService().findLTObjectsV2(qt.getId(), Tool.qtTOXMl(qt).asXML(),totalHolder);
+// 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).forEach(lo->{
+ Arrays.stream(linkObjects.returnValue).forEach(lo->{
ClientLinkObject clo = new ClientLinkObject();
clo.setLinkObject(lo);
Map<String, String> map = new HashMap<>();
boService.queryEnumText(null,clo, finalEnumFields);
WebUtil.copyValueToMapFromClos(clo,map);
- List<String> fromOids = fromBtmOidsMap.getOrDefault(lo.fromBTMName, new ArrayList<>());
+ List<String> fromOids = fromBtmOidsMap.getOrDefault(lo.fromBTName, new ArrayList<>());
fromOids.add(lo.fromOid);
- fromBtmOidsMap.put(lo.fromBTMName,fromOids);
+ fromBtmOidsMap.put(lo.fromBTName,fromOids);
- List<String> toOids = toBtmOidsMap.getOrDefault(lo.toBTMName, new ArrayList<>());
+ List<String> toOids = toBtmOidsMap.getOrDefault(lo.toBTName, new ArrayList<>());
toOids.add(lo.toOid);
- toBtmOidsMap.put(lo.toBTMName,toOids);
+ toBtmOidsMap.put(lo.toBTName,toOids);
data.add(map);
if(total[0] == 0){
total[0] = VciBaseUtil.getInt(map.getOrDefault(QTConstants.COUNT_OVER_ALIAS.toLowerCase(),"0"));
@@ -728,7 +730,7 @@
});
dataGrid.setData(data);
dataGrid.setTotal(total[0]);
- } catch (VCIError e) {
+ } catch (PLException e) {
// logger.error(e.error_code,e);
throw WebUtil.getVciBaseException(e);
}
@@ -825,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);
}
}
--
Gitblit v1.9.3