From a485f4494787001a2695863e239910c019a52246 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 05 十二月 2024 20:47:40 +0800
Subject: [PATCH] 表单\表格定义保存对象转换逻辑修改。UI数据查询接口修改
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
index 2d19927..9d06303 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
@@ -10,7 +10,10 @@
import com.vci.pagemodel.*;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.util.*;
+import com.vci.starter.web.util.BeanUtilForVCI;
+import com.vci.starter.web.util.LangBaseUtil;
+import com.vci.starter.web.util.VciBaseUtil;
+import com.vci.starter.web.util.VciDateUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.enumpck.UIComponentDisplayTypeEnum;
import com.vci.web.enumpck.UIComponentTypeEnum;
@@ -27,6 +30,7 @@
import com.vci.web.xmlmodel.UIComponentDetailXO;
import com.vci.web.xmlmodel.UIComponentItemXO;
import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hdf.extractor.SEP;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -411,16 +415,13 @@
if(StringUtils.isBlank(btmId) || StringUtils.isBlank(id)){
return null;
}
- if(!QUERY_BY_CACHE){
- PortalVI portalVI = null;
- try {
- portalVI = platformClientUtil.getUIService().getPortalVIByTypeNameAndVIName(btmId, id);
- } catch (PLException vciError) {
- throw WebUtil.getVciBaseException(vciError);
- }
- return formDO2VO(portalVI);
+ PortalVI portalVI = null;
+ try {
+ portalVI = platformClientUtil.getUIService().getPortalVIByTypeNameAndVIName(btmId, id);
+ } catch (PLException vciError) {
+ throw WebUtil.getVciBaseException(vciError);
}
- return self.selectAllFormMap().getOrDefault(btmId.toLowerCase()+SEP+id.toLowerCase(),null);
+ return formDO2VO(portalVI);
}
/**
@@ -660,7 +661,7 @@
&& !UIFieldTypeEnum.CUSTOM.getValue().equalsIgnoreCase(s.getFieldType())).forEach(fieldVO->{
//鍒楄〃閲岄潰涓嶆斁edit锛岃�屾煡璇㈤噷闈㈤渶瑕佹斁edit
UITableFieldVO queryFieldVO = new UITableFieldVO();
- BeanUtil.convert(fieldVO,queryFieldVO);
+ BeanUtilForVCI.convert(fieldVO,queryFieldVO);
canQueryFields.add(queryFieldVO);
});
tableDefineVO.setSeniorQueryColumns(canQueryFields);
@@ -928,7 +929,7 @@
List<UIComponentVO> southCompVO = componentVOs.stream().filter(s->!s.getOid().equals(firstCompVO.getOid())).collect(Collectors.toList());
UILayoutVO centerVO = new UILayoutVO();
- BeanUtil.convert(layoutVO,centerVO);
+ BeanUtilForVCI.convert(layoutVO,centerVO);
centerVO.setOid(centerVO.getOid() + "_center");
centerVO.setLayoutAreaType(UILayoutAreaTypeEnum.CENTER.getValue());
centerVO.setOrderNum(0);
@@ -946,7 +947,7 @@
//鍏朵綑鐨勪綔涓簊outh
if(!CollectionUtils.isEmpty(southCompVO)) {
UILayoutVO southVO = new UILayoutVO();
- BeanUtil.convert(layoutVO, southVO);
+ BeanUtilForVCI.convert(layoutVO, southVO);
southVO.setOid(centerVO.getOid() + "_south");
southVO.setLayoutAreaType(UILayoutAreaTypeEnum.SOUTH.getValue());
southVO.setOrderNum(0);
@@ -1198,7 +1199,12 @@
if(StringUtils.isBlank(componentOid)){
return null;
}
- if(!QUERY_BY_CACHE){
+ try {
+ return uiComponentDO2VO(platformClientUtil.getUIService().getPLPageDefinationById(componentOid),true,attributeVOMap);
+ } catch (PLException vciError) {
+ throw WebUtil.getVciBaseException(vciError);
+ }
+ /*if(!QUERY_BY_CACHE){
try {
return uiComponentDO2VO(platformClientUtil.getUIService().getPLPageDefinationById(componentOid),true,attributeVOMap);
} catch (PLException vciError) {
@@ -1210,8 +1216,7 @@
if(!CollectionUtils.isEmpty(componentVOList)){
return componentVOList.get(0);
}
- }
- return null;
+ }*/
}
/**
@@ -1241,6 +1246,7 @@
componentVO.setName(page.name);
componentVO.setDescription(page.desc);
componentVO.setOrderNum((int) page.seq);
+
UIComponentDefineXO componentDefineXO = null;
try {
componentDefineXO = readInfoFromXML(page.plDefination, UIComponentDefineXO.class);
@@ -1248,6 +1254,8 @@
logger.error("璇诲彇xml鍑洪敊",e);
return null;
}
+ //鑷畾涔夋煡璇㈡柟寮�
+ componentVO.setBsCustQueryCLsOrUrl(componentDefineXO.getBsCustQueryCLsOrUrl());
//涔嬪墠鐨勭被鍨嬬殑鍊兼槸1锛�2锛�3绛夌湅鐫�涓嶇洿瑙�
UIComponentTypeEnum componentTypeEnum = null;
if("1".equals(componentDefineXO.getTemplateType())){
@@ -1316,7 +1324,7 @@
if(tableDefineVO != null) {
UITreeTableDefineVO treeTableDefineVO = new UITreeTableDefineVO();
- BeanUtil.convert(tableDefineVO, treeTableDefineVO);
+ BeanUtilForVCI.convert(tableDefineVO, treeTableDefineVO);
if(isLink){
treeTableDefineVO.setTreeCurrentField("t_oid");
treeTableDefineVO.setTreeParentField("f_oid");
--
Gitblit v1.9.3