From 08635bced778daba88cd02a6382f7727de4f7bab Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 09 九月 2024 10:29:32 +0800
Subject: [PATCH] ui定义下页面定义添加、查询接口调整

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java |   51 ++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java
index 3b63d43..b315dc0 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java
@@ -80,10 +80,10 @@
     /**
      * 鎺掑簭姣旇緝鍣�
      */
-    private Comparator<PLPageDefination> pageDefinationComparator = new Comparator<PLPageDefination>() {
+    private Comparator<PLDefinationVO> pageDefinationComparator = new Comparator<PLDefinationVO>() {
         @Override
-        public int compare(PLPageDefination o1, PLPageDefination o2) {
-            return new Integer(o1.seq).compareTo(new Integer(o2.seq));
+        public int compare(PLDefinationVO o1, PLDefinationVO o2) {
+            return new Integer(o1.getSeq()).compareTo(new Integer(o2.getSeq()));
         }
     };
 
@@ -397,20 +397,48 @@
 
     /**
      * 鏌ヨ椤甸潰璁捐瀹氫箟
-     * @param plPageContextOId
+     * @param pageContextOId
      * @return
      */
     @Override
-    public DataGrid getPLPageDefinations(String plPageContextOId) throws PLException {
+    public DataGrid getPLPageDefinations(String pageContextOId) throws PLException {
         DataGrid dataGrid = new DataGrid();
-        if(Func.isBlank(plPageContextOId)) return dataGrid;
-        PLPageDefination[] plPageDefinations = platformClientUtil.getUIService().getPLPageDefinationsByPageContextOId(plPageContextOId);
-
-        dataGrid.setTotal(plPageDefinations.length);
-        Arrays.sort(plPageDefinations, pageDefinationComparator);
-        dataGrid.setData(Arrays.asList(plPageDefinations));
+        if(Func.isBlank(pageContextOId)) return dataGrid;
+        PLPageDefination[] plPageDefinations = platformClientUtil.getUIService().getPLPageDefinationsByPageContextOId(pageContextOId);
+        if(Func.isEmpty(plPageDefinations)){
+            return dataGrid;
+        }
+        //DO2VO
+        List<PLDefinationVO> plDefinationVOS = this.pageDefinations2PLDefinationVO(Arrays.asList(plPageDefinations));
+        dataGrid.setTotal(plDefinationVOS.size());
+        Collections.sort(plDefinationVOS, Comparator.comparing(PLDefinationVO::getSeq));
+        //Arrays.sort(plDefinationVOS, pageDefinationComparator);
+        dataGrid.setData(plDefinationVOS);
         return dataGrid;
     }
+
+    /**
+     * 椤甸潰瀹氫箟鐨凞O2VO瀵硅薄
+     * @param plPageDefinations
+     * @return
+     */
+    private List<PLDefinationVO> pageDefinations2PLDefinationVO(List<PLPageDefination> plPageDefinations){
+        List<PLDefinationVO> plDefinationVOList = new ArrayList<>();
+        plPageDefinations.stream().forEach(item->{
+            try {
+                PLDefinationVO plDefinationVO = new PLDefinationVO();
+                PLDefination plDefination = UITools.getPLDefination(item.plDefination);
+                BeanUtil.copy(plDefination,plDefinationVO);
+                plDefinationVOList.add(plDefinationVO);
+            } catch (Throwable e) {
+                e.printStackTrace();
+                logger.error(e.getMessage());
+                throw new VciBaseException("椤甸潰瀹氫箟DO瀵硅薄杞琕O瀵硅薄鏃跺嚭鐜伴敊璇�,鍘熷洜锛�"+e.getMessage());
+            }
+        });
+        return plDefinationVOList;
+    }
+
 
     /**
      * 娣诲姞椤甸潰瀹氫箟
@@ -1028,6 +1056,7 @@
             }
         });
     }
+
     /**
      * UI瑙掕壊瀵硅薄杞崲
      * @param infos

--
Gitblit v1.9.3