From d5ffec728c333461b466ba5761616f90076117e5 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期五, 19 四月 2024 17:57:04 +0800
Subject: [PATCH] 1、主要完成对一些基础类的替换，将以前老的bean对象换成新平台的bean对象。 2、对树的查询接口进行修改测试联调。 3、对列表数据的查询接口进行修改测试联调。 4、对通用保存接口进行编写测试。
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java | 53 +++++++++++++++++++++++++++++------------------------
1 files changed, 29 insertions(+), 24 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..9868ece 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
@@ -3,7 +3,9 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.vci.base.common.utility.ObjectUtility;
+import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.VCIError;
+import com.vci.corba.query.ObjectQueryService;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -261,7 +263,7 @@
}
@Override
- public Map<String, ClientBusinessObject> queryLinkedCbo(LinkObject[] lo,
+ public Map<String, com.vci.client.bof.ClientBusinessObject> queryLinkedCbo(LinkObject[] lo,
boolean isDirection) throws VciBaseException {
ClientLinkObject[] clos = new ClientLinkObject[lo.length];
for(int i =0 ; i < lo.length; i ++){
@@ -273,13 +275,13 @@
}
@Override
- public Map<String, ClientBusinessObject> queryLinkedCbo(List los,
+ public Map<String, com.vci.client.bof.ClientBusinessObject> queryLinkedCbo(List los,
boolean isDirection) throws VciBaseException {
return queryLinkedCbo(los,isDirection,new ArrayList<String>());
}
@Override
- public Map<String, ClientBusinessObject> queryLinkedCbo(List los,
+ public Map<String, com.vci.client.bof.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 ++){
@@ -296,7 +298,7 @@
}
@Override
- public Map<String, ClientBusinessObject> queryLinkedCbo(
+ public Map<String, com.vci.client.bof.ClientBusinessObject> queryLinkedCbo(
ClientLinkObject[] clol, boolean isDirection) throws VciBaseException {
return queryLinkedCbo(clol,isDirection,new ArrayList<String>());
}
@@ -304,7 +306,7 @@
*
*/
@Override
- public Map<String, ClientBusinessObject> queryLinkedCbo(
+ public Map<String, com.vci.client.bof.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>();
@@ -330,7 +332,7 @@
btmTypeOidMap.put(btmType, oids);
}
}
- Map<String,ClientBusinessObject> linkedCboMap = new HashMap<String, ClientBusinessObject>();
+ Map<String,com.vci.client.bof.ClientBusinessObject> linkedCboMap = new HashMap<>();
Iterator<String> it = btmTypeOidMap.keySet().iterator();
while(it.hasNext()){
String btmType = it.next();
@@ -347,9 +349,9 @@
}
Map<String,String> conditionMap = new HashMap<>();
conditionMap.put("oid",oids);
- List<ClientBusinessObject> allCbo = boService.queryCBO(btmType, conditionMap,new PageHelper(-1),clauseList);
+ List<com.vci.client.bof.ClientBusinessObject> allCbo = boService.queryCBO(btmType, conditionMap,new PageHelper(-1),clauseList);
if(allCbo.size()>0){
- for(ClientBusinessObject cbo : allCbo){
+ for(com.vci.client.bof.ClientBusinessObject cbo : allCbo){
String linkOid = linkBoOidMap.get(cbo.getOid());
linkedCboMap.put(linkOid, cbo);
}
@@ -359,16 +361,16 @@
}
@Override
- public List<Map> clos2Map(List<ClientLinkObject> clos) throws VciBaseException {
+ public List<Map> clos2Map(List<com.vci.client.bof.ClientLinkObject> clos) throws VciBaseException {
List<Map> allMap = new ArrayList<Map>();
- for(ClientLinkObject clo : clos){
+ for(com.vci.client.bof.ClientLinkObject clo : clos){
allMap.add(clo2Map(clo));
}
return allMap;
}
@Override
- public Map clo2Map(ClientLinkObject clo) throws VciBaseException {
+ public Map clo2Map(com.vci.client.bof.ClientLinkObject clo) throws VciBaseException {
Map<String,String> map = new HashMap<String, String>();
WebUtil.copyValueToMapFromClos(clo, map);
return map;
@@ -529,7 +531,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 +543,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());
}
@@ -589,7 +591,8 @@
}
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(), 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());
return Arrays.stream(bos).collect(Collectors.toList());
} catch (VCIError e) {
// logger.error(e.error_code,e);
@@ -603,7 +606,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())){
@@ -703,24 +706,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(), Tool.qtTOXMl(qt).asXML(),totalHolder);
+ ObjectQueryService.FindLTObjectsV2Result linkObjects = ServiceProvider.getOQService().findLTObjectsV2(qt.getId(), Tool.qtTOXMl(qt).asXML());
+
List<Map<String,String>> data = new ArrayList<>();
List<String> finalEnumFields = enumFields;
final Integer[] total = {totalHolder.value};
- Arrays.stream(linkObjects).forEach(lo->{
- ClientLinkObject clo = new ClientLinkObject();
+ Arrays.stream(linkObjects.returnValue).forEach(lo->{
+ com.vci.client.bof.ClientLinkObject clo = new com.vci.client.bof.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"));
@@ -744,7 +749,7 @@
//鍒嗛〉涓嶈瓒呰繃1000
Map<String,String> boConditionMap =new HashMap<>();
boConditionMap.put("oid",QueryOptionConstant.IN + "(" + WebUtil.toInSql(oids.toArray(new String[0])) + ")");
- List<ClientBusinessObject> cbos = boService.queryCBO(btm, boConditionMap, null, fromFieldsFix);
+ List<com.vci.client.bof.ClientBusinessObject> cbos = boService.queryCBO(btm, boConditionMap, null, fromFieldsFix);
if(!CollectionUtils.isEmpty(cbos)){
cbos.stream().forEach(cbo->{
dataGrid.getData().forEach(data->{
@@ -768,7 +773,7 @@
//鍒嗛〉涓嶈瓒呰繃1000
Map<String,String> boConditionMap =new HashMap<>();
boConditionMap.put("oid",QueryOptionConstant.IN + "(" + WebUtil.toInSql(oids.toArray(new String[0])) + ")");
- List<ClientBusinessObject> cbos = boService.queryCBO(btm, boConditionMap, null, toFieldsFix);
+ List<com.vci.client.bof.ClientBusinessObject> cbos = boService.queryCBO(btm, boConditionMap, null, toFieldsFix);
if(!CollectionUtils.isEmpty(cbos)){
cbos.stream().forEach(cbo->{
dataGrid.getData().forEach(data->{
--
Gitblit v1.9.3