From 391eec3114a17e68652434c6eae610799d80290e Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 11:13:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
index d6ec36d..df39636 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
@@ -34,6 +34,7 @@
import com.vci.web.service.OsQuereyTemplateServiceI;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.UITools;
+import com.vci.web.util.WebUtil;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -165,12 +166,12 @@
if(PortalVIType.Table.getName()==viType){
lableName=PortalVIType.Table.getLabel();
}
- PortalVIVO portalVIVO = new PortalVIVO();
+ PortalVIVO portalVIVO = null;
PortalVI portalVI = platformClientUtil.getPortalService().getPortalVIById(id);
if(portalVI==null||StringUtils.isBlank(portalVI.id)){
throw new VciBaseException("鏍规嵁涓婚敭鏈煡璇㈠埌鏁版嵁");
}
- portalVIVO=portalVIDOO2VO(portalVI);
+ portalVIVO = portalVIDOO2VO(portalVI);
return portalVIVO;
}
@@ -828,7 +829,7 @@
@Override
public PortalVI portalVIDTOO2VI(PortalVIDTO portalVIDTO) {
PortalVI portalVI = new PortalVI();
- portalVI.id = portalVIDTO.getId();
+ portalVI.id = StringUtils.isNotBlank(portalVIDTO.getId()) ? portalVIDTO.getId() : WebUtil.getPk();
portalVI.typeFlag = portalVIDTO.getTypeFlag();
portalVI.typeName = portalVIDTO.getTypeName();
portalVI.viName = portalVIDTO.getViName();
@@ -892,7 +893,7 @@
@Override
public PortalVIVO portalVIDOO2VO(PortalVI portalVI) {
- PortalVIVO portalVIVO=new PortalVIVO();
+ PortalVIVO portalVIVO = new PortalVIVO();
portalVIVO.setId(portalVI.id);
portalVIVO.setTypeFlagText(PortalVITypeFlag.getByIntVal(portalVI.typeFlag).getLabel());
portalVIVO.setTypeFlag(portalVI.typeFlag);
@@ -1225,16 +1226,17 @@
* @param prmItemDO
*/
private void initTableConfigDTOO2DOData(PRMItemDO prmItemDO,PRMItemDTO prmItemDTO){
-
- prmItemDO.setItemOutFields(VciBaseUtil.array2String(prmItemDTO.getItemOutFieldList().toArray(new String[]{})));//闇�瑕佷娇鐢ㄧ殑瀛楁
- prmItemDO.setItemKeyFields(CollectionUtils.isEmpty(prmItemDTO.getItemKeyFieldList())?"":VciBaseUtil.array2String(prmItemDTO.getItemKeyFieldList().toArray(new String[]{})));//闇�瑕佹悳绱㈢殑瀛楁
- List<String> newItemFieldWidthList = prmItemDTO.getItemFieldWidthList().stream().map(KeyValue::getValue).distinct().collect(Collectors.toList());
- prmItemDO.setItemFieldWidth(VciBaseUtil.array2String(newItemFieldWidthList.toArray(new String[]{}),":"));//瀛楁瀹藉害
- List<ItemSeniorQueryBO> itemSeniorQueryBOS = prmItemDTO.getItemSeniorQueryBOS();
- List<String> itemSeniorQueryColsList = new ArrayList<>();
- List<String> itemSeniorQueryColsCountsList=new ArrayList<>();
- List<String> itemQuerySqlList = new ArrayList<>();
- itemSeniorQueryBOS.stream().forEach(itemSeniorQueryBO -> {
+ prmItemDO.setItemOutFields(VciBaseUtil.array2String(prmItemDTO.getItemOutFieldList().toArray(new String[]{})));
+ //闇�瑕佷娇鐢ㄧ殑瀛楁prmItemDO.setItemKeyFields(CollectionUtils.isEmpty(prmItemDTO.getItemKeyFieldList())?"":VciBaseUtil.array2String(prmItemDTO.getItemKeyFieldList().toArray(new String[]{})));//闇�瑕佹悳绱㈢殑瀛楁
+ // TODO: 2024/12/5 Ludc 杩欏効鍘婚噸鐢ㄧ殑涓嶅锛孠eyValue::getValue鏄瀹藉害鍘婚噸浜�
+ List<String> newItemFieldWidthList = prmItemDTO.getItemFieldWidthList().stream().distinct().map(KeyValue::getValue).collect(Collectors.toList());
+ // TODO: 2024/12/5 Ludc 鍒嗛殧绗﹁鍜屽钩鍙扮粺涓�鐢�,鑰屼笉鏄敤:
+ prmItemDO.setItemFieldWidth(VciBaseUtil.array2String(newItemFieldWidthList.toArray(new String[]{}),","));//瀛楁瀹藉害
+ List<ItemSeniorQueryBO> itemSeniorQueryBOS = prmItemDTO.getItemSeniorQueryBOS();
+ List<String> itemSeniorQueryColsList = new ArrayList<>();
+ List<String> itemSeniorQueryColsCountsList=new ArrayList<>();
+ List<String> itemQuerySqlList = new ArrayList<>();
+ itemSeniorQueryBOS.stream().forEach(itemSeniorQueryBO -> {
String itemSeniorQueryCols = itemSeniorQueryBO.getItemSeniorQueryCols();
String itemSeniorQueryColsCounts = itemSeniorQueryBO.getItemSeniorQueryColsCounts();
String itemQuerySql = itemSeniorQueryBO.getItemQuerySql();
--
Gitblit v1.9.3