From 3ff6166ea62799068064845fb083d1abb3d902a6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 09 十二月 2024 14:47:42 +0800
Subject: [PATCH] plt-slice属性调整后WEB端引用的旧属性也做了相应的调整

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java |   41 +++++++++++++++++------------------------
 1 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
index f5a32e1..83fe6b7 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
@@ -1,11 +1,8 @@
 package com.vci.web.service.impl;
 
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.vci.client.ClientSession;
 import com.vci.client.common.oq.OQTool;
-import com.vci.client.common.providers.ClientServiceProvider;
 import com.vci.common.qt.object.*;
 import com.vci.constant.FrameWorkLangCodeConstant;
 import com.vci.corba.common.PLException;
@@ -19,42 +16,31 @@
 import com.vci.dto.*;
 import com.vci.omd.constants.SystemAttribute;
 import com.vci.omd.objects.OtherInfo;
-import com.vci.po.OsLinkTypePO;
-import com.vci.starter.poi.bo.ReadExcelOption;
-import com.vci.starter.poi.bo.WriteExcelData;
-import com.vci.starter.poi.bo.WriteExcelOption;
-import com.vci.starter.poi.constant.ExcelLangCodeConstant;
-import com.vci.starter.poi.util.ExcelUtil;
 import com.vci.starter.web.exception.VciBaseException;
 import com.vci.starter.web.pagemodel.BaseResult;
 import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.Tree;
-import com.vci.starter.web.util.*;
+import com.vci.starter.web.util.ControllerUtil;
+import com.vci.starter.web.util.Lcm.DateUtil;
+import com.vci.starter.web.util.Lcm.Func;
+import com.vci.starter.web.util.LocalFileUtil;
+import com.vci.starter.web.util.VciBaseUtil;
 import com.vci.web.other.BtmQTExportData;
 import com.vci.web.other.LinkQTExportData;
-import com.vci.web.service.*;
-import com.vci.web.util.DateUtil;
-import com.vci.web.util.Func;
+import com.vci.web.service.OsQuereyTemplateServiceI;
 import com.vci.web.util.PlatformClientUtil;
 import com.vci.web.util.WebUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
-import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
-import org.jdesktop.swingx.JXDatePicker;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.swing.*;
-import java.awt.*;
 import java.io.*;
 import java.util.*;
-import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -98,7 +84,8 @@
         }else {
             qtdArray = platformClientUtil.getQTDService().getBizTypeQTDs(btmName);
         }
-        return BaseResult.dataList(Arrays.asList(qtdArray));
+        List<QTD> qtdList = Arrays.asList(qtdArray).stream().sorted(Comparator.comparing(s -> s.name,String.CASE_INSENSITIVE_ORDER)).collect(Collectors.toList());
+        return BaseResult.dataList(qtdList);
     }
 
     /**
@@ -195,6 +182,9 @@
     public BaseResult getObjTypeQTs(String btName) throws PLException, DocumentException {
         VciBaseUtil.alertNotNull(btName,"绫诲瀷鍚�");
         QTInfo[] objTypeQTs = platformClientUtil.getQTDService().getObjTypeQTs(btName);
+        if(Func.isEmpty(objTypeQTs)){
+            return BaseResult.success();
+        }
         List<QTInfoDTO> dtos = new ArrayList<>();
         Map<String, AttributeDef> allSysAttr = Arrays.stream(platformClientUtil.getBtmService().getSysAttributeDefs()).collect(Collectors.toMap(e -> e.name, e -> e));
         allSysAttr.putAll(Arrays.stream(platformClientUtil.getLinkTypeService().getSysAttributeDefs()).collect(Collectors.toMap(e -> e.name, e -> e)));
@@ -216,6 +206,8 @@
             qtInfoDTO.setCreateTimeText(DateFormatUtils.format(new Date(obj.createTime), DateUtil.PATTERN_DATETIME));
             dtos.add(qtInfoDTO);
         }
+        // TODO: 2024/12/2 Ludc 杩斿洖鍊兼帓搴�
+        dtos = dtos.stream().sorted(Comparator.comparing(QTInfoDTO::getQtName,String.CASE_INSENSITIVE_ORDER)).collect(Collectors.toList());
         return BaseResult.dataList(dtos);
     }
 
@@ -442,7 +434,7 @@
         //娣诲姞涓氬姟绫诲瀷鏍硅妭鐐�
         for (LinkType plAction : linkTypes) {
             HashMap<String,Object> childTree = new HashMap();
-            childTree.put("text", plAction.tag + "/" +plAction.name);
+            childTree.put("text", plAction.label + "/" +plAction.name);
             childTree.put("oid", plAction.oid);
 //            tree.put("children", childTree);
             addExportTreeNode(plAction, qts, childTree);
@@ -1118,7 +1110,7 @@
         //娣诲姞涓氬姟绫诲瀷鏍硅妭鐐�
         for (LinkType plAction : ltsNew) {
             HashMap<String,Object> childTree = new HashMap();
-            childTree.put("text", plAction.tag + "/" +plAction.name);
+            childTree.put("text", plAction.label + "/" +plAction.name);
             childTree.put("oid", plAction.oid);
             addExportTreeNode(plAction, qts, childTree);
             childList.add(childTree);
@@ -1612,8 +1604,9 @@
     @Override
     public BaseResult getAllQTs() throws PLException {
         QTInfo[] allQTs = platformClientUtil.getQTDService().getAllQTs();
+        List<QTInfo> allQTList = Arrays.stream(allQTs).sorted(Comparator.comparing(o -> o.qtName, String.CASE_INSENSITIVE_ORDER)).collect(Collectors.toList());
         DataGrid<QTInfo> dataGrid = new DataGrid<>();
-        dataGrid.setData(Arrays.asList(allQTs));
+        dataGrid.setData(allQTList);
         dataGrid.setTotal(allQTs.length);
         return BaseResult.dataGrid(dataGrid);
     }

--
Gitblit v1.9.3