From 7b3d5fb08fdbd2ce574c3b9ab666c8c7082be728 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 06 九月 2024 15:38:35 +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 |   38 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 36 insertions(+), 2 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 f6ed246..36e1356 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
@@ -168,6 +168,9 @@
         }
         PortalVIVO portalVIVO=new PortalVIVO();
         PortalVI portalVI=  platformClientUtil.getPortalService().getPortalVIById(id);
+        if(portalVI==null||StringUtils.isBlank(portalVI.id)){
+            throw new VciBaseException("鏍规嵁涓婚敭鏈煡璇㈠埌鏁版嵁");
+        }
         portalVIVO=portalVIDOO2VO(portalVI);
         return portalVIVO;
     }
@@ -640,7 +643,7 @@
         boolean flag = false;
         String labelName=PortalVIType.Form.getName();
         try {
-            VciBaseUtil.alertNotNull(portalVIDTO.getViName(),"鍚嶇О涓嶈兘涓虹┖锛�");
+            VciBaseUtil.alertNotNull(portalVIDTO.getViName(),"鍚嶇О");
             if(portalVIDTO.getPrm()==null||portalVIDTO.getPrm().getPrmItemList()==null||portalVIDTO.getPrm().getPrmItemList().size()==0){
                 throw  new Throwable(labelName+"锛屾湭璁剧疆");
             }
@@ -985,6 +988,15 @@
         prmItemDO.setItemHttpPathField(prmItemDTO.getItemHttpPathField());
         if(viType==PortalVIType.Table.getIntVal()) {//濡傛灉鏄〃鏍�
             initTableConfigDTOO2DOData(prmItemDO,prmItemDTO);
+        }else{
+            List<String> itemValueList=new ArrayList<>();
+            List<KeyValue> keyValueList=prmItemDTO.getItemKeyValueList();
+            Optional.ofNullable(keyValueList).orElseGet(()->new ArrayList<>()).stream().forEach(keyValue -> {
+              String value=  keyValue.getValue()+"{"+keyValue.getKey()+"}";
+                itemValueList.add(value);
+            });
+            prmItemDO.setItemValueList(itemValueList);
+
         }
         return prmItemDO;
     }
@@ -1049,8 +1061,20 @@
         prmItemVO.setItemIsHttpSave(prmItemDO.getItemIsHttpSave());
         prmItemVO.setItemHttpVolumnPath(prmItemDO.getItemHttpVolumnPath());
         prmItemVO.setItemHttpPathField(prmItemDO.getItemHttpPathField());
+
         if(viType==PortalVIType.Table.getIntVal()) {//濡傛灉鏄〃鏍�
             initTableConfigDOO2VOData(prmItemVO,prmItemDO);
+        }else{
+          List<String> enumList=  prmItemDO.getItemValueList();
+          List<KeyValue>itemKeyValueList=new ArrayList<>();
+            Optional.ofNullable(enumList).orElseGet(()->new ArrayList<>()).stream().forEach(enumValue->{
+             List<String> keyValueList=  VciBaseUtil.str2List(VciBaseUtil.removeComma(enumValue,"}"),"\\{");
+                KeyValue keyValue=new KeyValue();
+                keyValue.setKey(keyValueList.get(1));
+                keyValue.setValue(keyValueList.get(0));
+                itemKeyValueList.add(keyValue);
+            });
+            prmItemVO.setItemKeyValueList(itemKeyValueList);
         }
         return prmItemVO;
     }
@@ -1117,6 +1141,17 @@
         prmItemDTO.setItemHttpPathField(prmItemDO.getItemHttpPathField());
         if(viType==PortalVIType.Table.getIntVal()) {//濡傛灉鏄〃鏍�
             initTableConfigDOO2VOData(prmItemDTO,prmItemDO);
+        }else{
+            List<String> enumList=  prmItemDO.getItemValueList();
+            List<KeyValue>itemKeyValueList=new ArrayList<>();
+            Optional.ofNullable(enumList).orElseGet(()->new ArrayList<>()).stream().forEach(enumValue->{
+                List<String> keyValueList=  VciBaseUtil.str2List(VciBaseUtil.removeComma(enumValue,"}"),"\\{");
+                KeyValue keyValue=new KeyValue();
+                keyValue.setKey(keyValueList.get(1));
+                keyValue.setValue(keyValueList.get(0));
+                itemKeyValueList.add(keyValue);
+            });
+            prmItemDTO.setItemKeyValueList(itemKeyValueList);
         }
         return prmItemDTO;
     }
@@ -1258,7 +1293,6 @@
     private List<String> getRefFormVIName(String refFormOid){
         List<String> keyList=new ArrayList<>();
         try {
-
             PortalVI refFormVI = UITools.getService().getPortalVIById(refFormOid);
             PortalVIVO portalVIVO= portalVIDOO2VO(refFormVI);
             if(portalVIVO!=null&&portalVIVO.getPrm().getPrmItemList().size()>0){

--
Gitblit v1.9.3