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 | 99 ++++++++++++++++++++++++++-----------------------
1 files changed, 52 insertions(+), 47 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 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);
}
}
--
Gitblit v1.9.3