From aed7f0e9be4e88a4ed632f9ca7aca05fa1e7f6b8 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 12 九月 2024 17:44:21 +0800
Subject: [PATCH] UI上下文导出树查询和导出接口
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/UIManagerController.java | 155 ++++++++++++++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIManagerServiceI.java | 25 +-
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java | 371 +++++++++++++++++++++++++-----------
4 files changed, 419 insertions(+), 134 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java
index 68d26e2..b364cdc 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java
@@ -99,7 +99,7 @@
/**
* 涓氬姟绫诲瀷
*/
- private String btmType = "";
+ //private String btmType = "";
/**
* 閾炬帴绫诲瀷
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/UIManagerController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/UIManagerController.java
index a0795b9..ad31810 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/UIManagerController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/UIManagerController.java
@@ -1,20 +1,25 @@
package com.vci.web.controller;
+import cn.hutool.core.io.FileUtil;
import com.vci.corba.common.PLException;
-import com.vci.corba.portal.data.PLPageDefination;
import com.vci.corba.portal.data.PLTabPage;
import com.vci.corba.portal.data.PLUILayout;
import com.vci.dto.UIAuthorDTO;
import com.vci.pagemodel.PLDefinationVO;
+import com.vci.pagemodel.PLTabButtonVO;
import com.vci.pagemodel.PLUILayoutCloneVO;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
+import com.vci.starter.web.util.ControllerUtil;
+import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.service.OsBtmServiceI;
import com.vci.web.service.UIManagerServiceI;
+import com.vci.web.util.Func;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,10 +27,12 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
-import javax.xml.crypto.Data;
+import java.io.File;
import java.io.IOException;
-import java.util.Comparator;
+import java.util.Arrays;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* UI瀹氫箟鎺у埗灞�
@@ -160,13 +167,45 @@
}
/**
+ * 鏌ヨ瑕佸鍑篣I涓婁笅鏂囨爲
+ * @param expDatas
+ * @return
+ * @throws PLException
+ */
+ @GetMapping( "/getExpContextTree")
+ @VciBusinessLog(operateName = "鏌ヨ瑕佸鍑篣I涓婁笅鏂囨爲")
+ public BaseResult getExpContextTree(String[] expDatas){
+ try {
+ return BaseResult.success(uiManagerService.getExpContextTree(Arrays.asList(expDatas)),"Success");
+ }catch (Exception e) {
+ e.printStackTrace();
+ String exceptionMessage = "鏌ヨ瑕佸鍑篣I涓婁笅鏂囨爲鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
+
+ /**
* 瀵煎嚭UI涓婁笅鏂�
* name 閾炬帴绫诲瀷鍚嶇О
* @return
*/
- @GetMapping("/expUIContextData")
- public void expUIContextData(String[] oids, HttpServletResponse response) throws PLException, IOException {
- uiManagerService.expUIContextData(oids, response);
+ @PostMapping("/expUIContextData")
+ public void expUIContextData(@RequestBody Map<String,String> expConditionMap, HttpServletResponse response) throws PLException, IOException {
+ try {
+ String excelPath = uiManagerService.expUIContextData(expConditionMap);
+ ControllerUtil.writeFileToResponse(response,excelPath);
+ FileUtil.del(LocalFileUtil.getDefaultTempFolder() + File.separator);
+ } catch (Exception e) {
+ String msg = "瀵煎嚭UI涓婁笅鏂囨椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+ try {
+ //鍑洪敊鏃�
+ e.printStackTrace();
+ ControllerUtil.writeDataToResponse(response,"error_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss") + ".txt", StringUtils.isNotBlank(msg)?msg.getBytes():new byte[0],null);
+ } catch (IOException ioException) {
+ ioException.printStackTrace();
+ }
+ }
}
/**
@@ -339,6 +378,110 @@
}
}
+ //椤甸潰璁捐涓嬮厤缃寜閽浉鍏虫帴鍙�
+ /**
+ * 鑾峰彇椤电鍖哄煙鎸夐挳閰嶇疆淇℃伅
+ * @param pageDefinationOid
+ * @return
+ */
+ @GetMapping( "/getTabButtons")
+ @VciBusinessLog(operateName = "鑾峰彇椤电鍖哄煙鎸夐挳閰嶇疆淇℃伅")
+ public BaseResult getTabButtons(String pageDefinationOid){
+ try {
+ return BaseResult.dataList(uiManagerService.getTabButtons(pageDefinationOid));
+ }catch (Exception e) {
+ e.printStackTrace();
+ String exceptionMessage = "鑾峰彇椤电鍖哄煙鎸夐挳閰嶇疆淇℃伅鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
+
+ /**
+ * 娣诲姞鎸夐挳閰嶇疆淇℃伅
+ * @param tabButtonVO
+ * @return 淇濆瓨缁撴灉
+ */
+ @PostMapping("/addTapButton")
+ public BaseResult addTapButton(@RequestBody PLTabButtonVO tabButtonVO){
+ try {
+ return uiManagerService.addTapButton(tabButtonVO);
+ } catch (Throwable e) {
+ e.printStackTrace();
+ String exceptionMessage = "鎸夐挳閰嶇疆淇℃伅娣诲姞鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
+
+ /**
+ * 淇敼鎸夐挳閰嶇疆淇℃伅
+ * @param tabButtonVO
+ * @return 淇敼缁撴灉
+ */
+ @PutMapping("/updateTapButton")
+ public BaseResult updateTapButton(@RequestBody PLTabButtonVO tabButtonVO){
+ try {
+ return uiManagerService.updateTapButton(tabButtonVO);
+ } catch (Throwable e) {
+ e.printStackTrace();
+ String exceptionMessage = "淇敼鎸夐挳閰嶇疆淇℃伅鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
+
+ /**
+ * 鍒犻櫎鍗曚釜鎸夐挳閰嶇疆
+ * @param tabButtonVO
+ * @return
+ */
+ @DeleteMapping("/deleteTapButton")
+ public BaseResult deleteTapButton(@RequestBody PLTabButtonVO tabButtonVO){
+ try {
+ return uiManagerService.deleteTapButton(tabButtonVO) ? BaseResult.success("鍒犻櫎鍗曚釜鎸夐挳閰嶇疆鎴愬姛锛�"):BaseResult.fail("鍒犻櫎鍗曚釜鎸夐挳閰嶇疆澶辫触锛�");
+ } catch (PLException e) {
+ e.printStackTrace();
+ String exceptionMessage = "鍒犻櫎鍗曚釜鎸夐挳閰嶇疆鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
+
+ /**
+ * 璋冩暣涓轰笅绾ф寜閽�
+ * @param tabButtonVO
+ * @return 淇敼缁撴灉
+ */
+ @PutMapping("/joinBtn")
+ public BaseResult joinBtn(@RequestBody PLTabButtonVO tabButtonVO){
+ try {
+ return uiManagerService.joinBtn(tabButtonVO);
+ } catch (Throwable e) {
+ e.printStackTrace();
+ String exceptionMessage = "璋冩暣涓轰笅绾ф寜閽椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
+
+ /**
+ * 璋冩暣涓轰笂绾ф寜閽�
+ * @param tabButtonVO
+ * @return 淇敼缁撴灉
+ */
+ @PutMapping("/exitBtn")
+ public BaseResult exitBtn(@RequestBody PLTabButtonVO tabButtonVO){
+ try {
+ return uiManagerService.exitBtn(tabButtonVO);
+ } catch (Throwable e) {
+ e.printStackTrace();
+ String exceptionMessage = "璋冩暣涓轰笂绾ф寜閽椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
+
/**
* 鏍规嵁瑙掕壊鑾峰彇UI/琛ㄥ崟/鎸夐挳鐨勬潈闄�.
* @param baseQueryObject
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIManagerServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIManagerServiceI.java
index 3b4f001..fc7d26f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIManagerServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIManagerServiceI.java
@@ -1,9 +1,7 @@
package com.vci.web.service;
import com.vci.corba.common.PLException;
-import com.vci.corba.portal.data.PLTabButton;
import com.vci.corba.portal.data.PLUILayout;
-import com.vci.corba.portal.data.PLPageDefination;
import com.vci.corba.portal.data.PLTabPage;
import com.vci.pagemodel.PLTabButtonVO;
import com.vci.pagemodel.PLUILayoutCloneVO;
@@ -18,6 +16,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
+import java.util.Map;
/**
* @author ludc
@@ -63,11 +62,18 @@
boolean cloneUIContextData(PLUILayoutCloneVO pluiLayoutCloneVO) throws PLException;
/**
+ * 鏍规嵁鍕鹃�夌殑鏉′欢鑾峰彇闇�瑕佸鍑虹殑ui涓婁笅鏂囨爲
+ * @param expDatas
+ * @return
+ */
+ Tree getExpContextTree(List<String> expDatas);
+
+ /**
* 瀵煎嚭ui涓婁笅鏂�(鍕鹃�夌殑瑕佸鍑虹殑鎺у埗鍖虹殑鏁版嵁)
* oids
* @return
*/
- void expUIContextData(String[] oids, HttpServletResponse response) throws PLException, IOException;
+ String expUIContextData(Map<String,String> expConditionMap) throws PLException, IOException;
/**
* 瀵煎叆UI涓婁笅鏂�
@@ -170,24 +176,24 @@
/**
* 鍒犻櫎鍗曚釜鎸夐挳閰嶇疆
- * @param tabButton
+ * @param tabButtonVO
* @return
*/
- boolean deleteTapButton(PLTabButton tabButton) throws PLException;
+ boolean deleteTapButton(PLTabButtonVO tabButtonVO) throws PLException;
/**
* 璋冩暣涓轰笅绾ф寜閽�
- * @param plTabButton
+ * @param tabButtonVO
* @return
*/
- BaseResult joinBtn(PLTabButton plTabButton) throws PLException;
+ BaseResult joinBtn(PLTabButtonVO tabButtonVO) throws PLException;
/**
* 璋冩暣涓轰笂绾ф寜閽�
- * @param plTabButton
+ * @param tabButtonVO
* @return
*/
- BaseResult exitBtn(PLTabButton plTabButton) throws PLException;
+ BaseResult exitBtn(PLTabButtonVO tabButtonVO) throws PLException;
/**
* 鑾峰彇UI鏉冮檺鏍�
@@ -204,6 +210,5 @@
* @throws Exception
*/
boolean authorizedUI(UIAuthorDTO uiAuthorDTO)throws Exception;
-
}
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 408a5c2..d85f3ef 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
@@ -1,5 +1,6 @@
package com.vci.web.service.impl;
+import com.alibaba.fastjson.JSON;
import com.vci.common.utility.ObjectUtility;
import com.vci.corba.common.PLException;
import com.vci.corba.framework.data.RoleRightInfo;
@@ -8,21 +9,22 @@
import com.vci.corba.portal.data.*;
import com.vci.dto.RoleRightDTO;
import com.vci.dto.UIAuthorDTO;
-import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
import com.vci.model.PLDefination;
import com.vci.pagemodel.*;
+import com.vci.starter.poi.bo.WriteExcelData;
+import com.vci.starter.poi.bo.WriteExcelOption;
+import com.vci.starter.poi.util.ExcelUtil;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.SessionInfo;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.util.VciDateUtil;
-import com.vci.starter.web.util.WebThreadLocalUtil;
+import com.vci.starter.web.util.*;
import com.vci.web.service.OsBtmServiceI;
import com.vci.web.service.UIManagerServiceI;
import com.vci.web.util.*;
+import com.vci.web.util.BeanUtil;
import org.apache.commons.lang3.StringUtils;
import com.vci.web.util.Func;
import com.vci.web.util.PlatformClientUtil;
@@ -35,11 +37,9 @@
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.swing.*;
-import javax.swing.tree.TreePath;
-import java.io.IOException;
+import java.io.File;
import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import java.util.regex.Pattern;
@@ -313,13 +313,133 @@
}
/**
+ * 鏍规嵁鍕鹃�夌殑鏉′欢鑾峰彇闇�瑕佸鍑虹殑ui涓婁笅鏂囨爲
+ * @param expDatas
+ * @return
+ */
+ @Override
+ public Tree getExpContextTree(List<String> expDatas) {
+ VciBaseUtil.alertNotNull(expDatas,"瀵煎嚭鏌ヨ鍒楄〃");
+ Tree tree = new Tree();
+ String newObjectID36 = ObjectUtility.getNewObjectID36();
+ tree.setOid(newObjectID36);
+ tree.setText("鍖哄煙");
+ tree.setLevel(0);
+ List<Tree> treeList = new ArrayList<>();
+ expDatas.stream().forEach(oid->{
+ try {
+ PLUILayout pluiLayout = platformClientUtil.getUIService().getPLUILayoutById(oid);
+ if(Func.isNotEmpty(pluiLayout) && Func.isNotBlank(pluiLayout.plOId)){
+ Tree tree1 = new Tree();
+ tree1.setText(pluiLayout.plName);
+ tree1.setOid(pluiLayout.plOId);
+ tree1.setLevel(1);
+ tree1.setParentId(newObjectID36);
+ //鏌ヨ
+ PLTabPage[] plTabPages = platformClientUtil.getUIService().getPLTabPagesByPageDefinationOId(pluiLayout.plOId);
+ List<Tree> treeChildrens = new ArrayList<>();
+ Arrays.stream(plTabPages).forEach(item->{
+ Tree tree2 = new Tree();
+ tree2.setLeaf(true);
+ tree2.setOid(item.plOId);
+ tree2.setText(item.plName);
+ tree2.setLevel(2);
+ tree2.setParentId(item.plContextOId);
+ treeChildrens.add(tree2);
+ });
+ tree1.setChildren(treeChildrens);
+ treeList.add(tree1);
+ }
+ } catch (PLException e) {
+ e.printStackTrace();
+ }
+ });
+
+ tree.setChildren(treeList);
+ return tree;
+ }
+
+ /**
* 瀵煎嚭ui涓婁笅鏂�(鍕鹃�夌殑瑕佸鍑虹殑鎺у埗鍖虹殑鏁版嵁)
* oids
* @return
*/
@Override
- public void expUIContextData(String[] oids, HttpServletResponse response) throws PLException, IOException {
+ public String expUIContextData(Map<String,String> expConditionMap) throws PLException {
+ if(Func.isEmpty(expConditionMap)){
+ throw new PLException("500",new String[]{"璇峰嬀閫夎瀵煎嚭鐨刄I涓婁笅鏂囨暟鎹�!"});
+ }
+ //鐣岄潰娌′紶鍚嶇О锛屼娇鐢ㄩ粯璁ゅ鍑哄悕绉�
+ String exportFileName = "UI涓婁笅鏂囧鍑篲" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss");
+ //璁剧疆鍒楀悕
+ List<String> columns = Arrays.asList(
+ "鎵�灞炰笟鍔＄被鍨�","鍚嶇О", "UI涓婁笅鏂�", "瀵艰埅鍖�", "鎺у埗鍖�","鎿嶄綔鍖�",
+ "椤电搴忓彿","鍖哄煙缂栫爜","鍖哄煙鍚嶇О","鏄惁鍚敤","鏄剧ず琛ㄨ揪寮�", "UI瑙ｆ瀽绫�",
+ "鎵╁睍灞炴��", "鎻忚堪","椤甸潰璁捐淇℃伅","椤甸潰涓嬮厤缃殑鎸夐挳"
+ );
+ //鍐檈xcel
+ String excelPath = LocalFileUtil.getDefaultTempFolder() + File.separator + exportFileName + ".xls";
+ try {
+ new File(excelPath).createNewFile();
+ } catch (Throwable e) {
+ throw new VciBaseException(LangBaseUtil.getErrorMsg(e), new String[]{excelPath}, e);
+ }
+ //璁剧疆鍒�
+ List<WriteExcelData> excelDataList = new ArrayList<>();
+ //璁剧疆鍒楀ご
+ for (int index = 0; index < columns.size(); index++) {
+ excelDataList.add(new WriteExcelData(0,index, columns.get(index)));
+ }
+ AtomicInteger row = new AtomicInteger(1);
+ expConditionMap.entrySet().stream().forEach(item->{
+ //key瀛樻斁鐨剈i涓婁笅鏂囩殑id
+ try {
+ PLUILayout pluiLayout = platformClientUtil.getUIService().getPLUILayoutById(item.getKey());
+ //value涓瓨鏀剧殑澶氫釜浠ラ�楀彿闂撮殧鐨勯〉绛緄d,閫氳繃杩欎釜id鏌ヨ鍑哄叾涓嬬殑椤甸潰璁捐鍜屾寜閽厤缃�
+ List<String> plTabPageOIds = Arrays.asList(item.getValue().split(","));
+ if(Func.isNotEmpty(pluiLayout) && Func.isNotBlank(pluiLayout.plOId) && Func.isNotEmpty(plTabPageOIds)){
+ PLTabPage[] plTabPages = platformClientUtil.getUIService().getPLTabPagesByPageDefinationOId(pluiLayout.plOId);
+ List<PLTabPage> filterTabPages = Arrays.stream(plTabPages).filter(plTabPage -> plTabPageOIds.contains(plTabPage.plOId)).collect(Collectors.toList());
+ filterTabPages.stream().forEach(tabPage->{
+ excelDataList.add(new WriteExcelData(row.get(),0, pluiLayout.plRelatedType));
+ excelDataList.add(new WriteExcelData(row.get(),1, pluiLayout.plName));
+ excelDataList.add(new WriteExcelData(row.get(),2, pluiLayout.plCode));
+ excelDataList.add(new WriteExcelData(row.get(),3, pluiLayout.plIsShowForm));
+ excelDataList.add(new WriteExcelData(row.get(),4, pluiLayout.plIsShowNavigator));
+ excelDataList.add(new WriteExcelData(row.get(),5, pluiLayout.plIsShowTab));
+ excelDataList.add(new WriteExcelData(row.get(),6, tabPage.plSeq));
+ excelDataList.add(new WriteExcelData(row.get(),7, tabPage.plLabel));
+ excelDataList.add(new WriteExcelData(row.get(),8, tabPage.plName));
+ excelDataList.add(new WriteExcelData(row.get(),9, tabPage.plIsOpen));
+ excelDataList.add(new WriteExcelData(row.get(),10, tabPage.plOpenExpression));
+ excelDataList.add(new WriteExcelData(row.get(),11, tabPage.plUIParser));
+ excelDataList.add(new WriteExcelData(row.get(),12, tabPage.plExtAttr));
+ excelDataList.add(new WriteExcelData(row.get(),13, tabPage.plDesc));
+ try {
+ PLPageDefination[] plPageDefinations = platformClientUtil.getUIService().getPLPageDefinationsByPageContextOId(tabPage.plOId);
+ if(Func.isNotEmpty(plPageDefinations)){
+ excelDataList.add(new WriteExcelData(row.get(),14, JSON.toJSONString(plPageDefinations)));
+ List<PLTabButtonVO> tabButtonsTotal = new ArrayList<>();
+ Arrays.stream(plPageDefinations).forEach(plPageDefination->{
+ List<PLTabButtonVO> tabButtons = this.getTabButtons(plPageDefination.plOId);
+ tabButtonsTotal.addAll(tabButtons);
+ });
+ excelDataList.add(new WriteExcelData(row.get(),15, JSON.toJSONString(tabButtonsTotal)));
+ }
+ } catch (PLException e) {
+ e.printStackTrace();
+ }
+ row.getAndIncrement();
+ });
+ }
+ } catch (PLException e) {
+ e.printStackTrace();
+ }
+ });
+ WriteExcelOption excelOption = new WriteExcelOption(excelDataList);
+ ExcelUtil.writeDataToFile(excelPath, excelOption);
+ return excelPath;
}
/**
@@ -329,6 +449,10 @@
*/
@Override
public BaseResult impUIContextData(MultipartFile file) {
+
+
+
+
return null;
}
@@ -436,6 +560,13 @@
PLDefinationVO plDefinationVO = new PLDefinationVO();
PLDefination plDefination = UITools.getPLDefination(item.plDefination);
BeanUtil.copy(plDefination,plDefinationVO);
+ plDefinationVO.setDescription(item.desc);
+ plDefinationVO.setSeq(String.valueOf(item.seq));
+ plDefinationVO.setTabPageOId(item.plTabPageOId);
+ plDefinationVO.setId(item.plOId);
+ plDefinationVO.setName(item.name);
+ plDefinationVO.setType(item.plType);
+ plDefinationVO.setTemplateType(String.valueOf(plDefination.getTemplateType()));
plDefinationVOList.add(plDefinationVO);
} catch (Throwable e) {
e.printStackTrace();
@@ -460,14 +591,14 @@
pd.plTabPageOId = pdVO.getTabPageOId();
pd.plOId = ObjectUtility.getNewObjectID36();
//涓嶈兘涓虹┖灞炴�ф鏌�
- if(!this.baseInfoIsOk(pd,false)){
+ /*if(!this.baseInfoIsOk(pd,false)){
return false;
- }
+ }*/
pd.name = pdVO.getName().trim();
pd.seq = Short.valueOf(pdVO.getSeq().trim());
pd.desc = pdVO.getDescription();
- pd.plType = Short.parseShort(pdVO.getTemplateType());
+ pd.plType = (short) pdVO.getType();
d.setName(pdVO.getName().trim());
d.setUiParser(pdVO.getUiParser().trim());
@@ -478,15 +609,15 @@
newPLDefinationIsOk(pdVO, false);
// 妫�鏌ュ悇涓被鍨嬩笅鐨勬暟鎹槸鍚﹁緭鍏ユ垨鏈夋晥,涓�鍏�6绉嶇被鍨嬫寜绫诲瀷妫�楠�
- short plType = pd.plType;
- switch (plType){
+ String templateType = pdVO.getTemplateType();
+ switch (templateType){
//Table(琛ㄦ牸)
- case 1:
+ case "1":
//From(琛ㄥ崟)
- case 4:
+ case "4":
TableComptCheckInput tci = new TableComptCheckInput(
pdVO.getSearchTarger()
- ,pdVO.getBtmType()
+ ,pdVO.getShowType()
,pdVO.getLinkType()
,pdVO.getTemplateId()
,pdVO.getQueryTemplateName()
@@ -497,7 +628,7 @@
d = tci.getNewPLDefination(d);
break;
//Custom(鑷畾涔夋ā鏉�)
- case 2:
+ case "2":
//鍙鏌ユ帶鍒惰矾寰勪笉鑳戒负绌�,鏈夐棶棰樹細鐩存帴鎶ラ敊
CustomComptCheckInput ccci = new CustomComptCheckInput(pdVO.getControlPath());
if(!ccci.checkInputIsOk()){
@@ -506,10 +637,10 @@
d = ccci.getNewPLDefination(d);
break;
//TreeTable(鏍戣〃)
- case 3:
+ case "3":
TreeTableComptCheckInput ttcci = new TreeTableComptCheckInput(
pdVO.getSearchTarger()
- ,pdVO.getBtmType()
+ ,pdVO.getShowType()
,pdVO.getLinkType()
,pdVO.getTemplateId()
,pdVO.getQueryTemplateName()
@@ -522,9 +653,9 @@
d = ttcci.getNewPLDefination(d);
break;
//Tree(鏍�)
- case 5:
+ case "5":
TreeComptCheckInput tcci = new TreeComptCheckInput(
- pdVO.getBtmType(),
+ pdVO.getShowType(),
pdVO.getLinkType(),
pdVO.getQueryTemplateName(),
pdVO.getShowExpressionRoot(),
@@ -539,10 +670,10 @@
d = tcci.getNewPLDefination(d);
break;
//UILayout(UI瀹氫箟)
- case 6:
+ case "6":
UILayoutComptCheckInput ulci = new UILayoutComptCheckInput(
pdVO.getSearchTarger(),
- pdVO.getBtmType(),
+ pdVO.getShowType(),
pdVO.getUiLayout(),
pdVO.getQueryTemplateName(),
pdVO.getQryType()
@@ -576,14 +707,17 @@
BeanUtil.copy(pdVO,d);
//涓嶈兘涓虹┖灞炴�ф鏌�
- if(!this.baseInfoIsOk(pd,true)){
+ /*if(!this.baseInfoIsOk(pd,true)){
return false;
- }
+ }*/
+ pd.plOId = pdVO.getId();
+ pd.plTabPageOId = pdVO.getTabPageOId();
pd.name = pdVO.getName().trim();
pd.seq = Short.valueOf(pdVO.getSeq().trim());
pd.desc = pdVO.getDescription();
- pd.plType = Short.parseShort(pdVO.getTemplateType());
+ pd.plType = (short) pdVO.getType();
+ d.setId(pdVO.getId());
d.setName(pdVO.getName().trim());
d.setUiParser(pdVO.getUiParser().trim());
d.setExtAttr(pdVO.getExtAttr().trim());
@@ -592,15 +726,15 @@
this.newPLDefinationIsOk(pdVO, true);
// 妫�鏌ュ悇涓粍浠跺唴閮ㄧ殑鏁版嵁鏄惁鏈夋晥
- int plType = pdVO.getType();
- switch (plType){
+ String templateType = pdVO.getTemplateType();
+ switch (templateType){
//Table(琛ㄦ牸)
- case 1:
+ case "1":
//From(琛ㄥ崟)
- case 4:
+ case "4":
TableComptCheckInput tci = new TableComptCheckInput(
pdVO.getSearchTarger()
- ,pdVO.getBtmType()
+ ,pdVO.getShowType()
,pdVO.getLinkType()
,pdVO.getTemplateId()
,pdVO.getQueryTemplateName()
@@ -611,7 +745,7 @@
d = tci.getNewPLDefination(d);
break;
//Custom(鑷畾涔夋ā鏉�)
- case 2:
+ case "2":
//鍙鏌ユ帶鍒惰矾寰勪笉鑳戒负绌�,鏈夐棶棰樹細鐩存帴鎶ラ敊
CustomComptCheckInput ccci = new CustomComptCheckInput(pdVO.getControlPath());
if(!ccci.checkInputIsOk()){
@@ -620,10 +754,10 @@
d = ccci.getNewPLDefination(d);
break;
//TreeTable(鏍戣〃)
- case 3:
+ case "3":
TreeTableComptCheckInput ttcci = new TreeTableComptCheckInput(
pdVO.getSearchTarger()
- ,pdVO.getBtmType()
+ ,pdVO.getShowType()
,pdVO.getLinkType()
,pdVO.getTemplateId()
,pdVO.getQueryTemplateName()
@@ -636,9 +770,9 @@
d = ttcci.getNewPLDefination(d);
break;
//Tree(鏍�)
- case 5:
+ case "5":
TreeComptCheckInput tcci = new TreeComptCheckInput(
- pdVO.getBtmType(),
+ pdVO.getShowType(),
pdVO.getLinkType(),
pdVO.getQueryTemplateName(),
pdVO.getShowExpressionRoot(),
@@ -653,10 +787,10 @@
d = tcci.getNewPLDefination(d);
break;
//UILayout(UI瀹氫箟)
- case 6:
+ case "6":
UILayoutComptCheckInput ulci = new UILayoutComptCheckInput(
pdVO.getSearchTarger(),
- pdVO.getBtmType(),
+ pdVO.getShowType(),
pdVO.getUiLayout(),
pdVO.getQueryTemplateName(),
pdVO.getQryType()
@@ -682,7 +816,7 @@
@Override
public boolean delPageDefination(String[] oids) throws PLException {
VciBaseUtil.alertNotNull(oids,"鍒犻櫎鐨勯〉闈㈠畾涔変富閿�");
- boolean res = platformClientUtil.getUIService().deletePLUILayoutByOidsForCascade(oids);
+ boolean res = platformClientUtil.getUIService().deletePLPageDefinationByOidsForCascade(oids);
return res;
}
@@ -734,7 +868,6 @@
logger.error(errorLog);
throw new VciBaseException(errorLog);
}
-
});
return plTabButtonVOList;
}
@@ -770,7 +903,13 @@
//鍙傛暟淇℃伅鍥炲～
PLCommandParameter[] parameters = platformClientUtil.getUIService().getPLCommandParametersByCommandOId(tabButtonDO.plOId);
if(Func.isNotEmpty(parameters)){
- LinkedHashMap<String, String> parameterMap = (LinkedHashMap<String, String>)Arrays.stream(parameters).collect(Collectors.toMap(parm -> parm.plKey, parm -> parm.plValue));
+ LinkedHashMap<String, String> parameterMap = Arrays.stream(parameters)
+ .collect(Collectors.toMap(
+ parm -> parm.plKey,
+ parm -> parm.plValue,
+ (existing, replacement) -> existing, // 澶勭悊閲嶅閿殑鎯呭喌
+ LinkedHashMap::new // 鎸囧畾浣跨敤 LinkedHashMap
+ ));
plTabButtonVO.setButtonParams(parameterMap);
}
return plTabButtonVO;
@@ -900,7 +1039,7 @@
}
LinkedHashMap<String, String> buttonParams = tabButtonVO.getButtonParams();
- if(!buttonParams.isEmpty()) {
+ if(Func.isNotEmpty(buttonParams)) {
Iterator<Map.Entry<String, String>> iterator = buttonParams.entrySet().iterator();
while(iterator.hasNext()){
Map.Entry<String, String> next = iterator.next();
@@ -908,23 +1047,21 @@
iterator.remove();
}
}
- if(!buttonParams.isEmpty()){
- Iterator<Map.Entry<String, String>> kvItor = buttonParams.entrySet().iterator();
- while(kvItor.hasNext()){
- Map.Entry<String, String> next = kvItor.next();
- PLCommandParameter plCommandParameter = new PLCommandParameter();
- plCommandParameter.plOId = ObjectUtility.getNewObjectID36();
- plCommandParameter.plCommandOId = plTabButton.plOId;
- plCommandParameter.plKey = next.getKey();
- plCommandParameter.plValue = next.getValue();
- plCommandParameter.plCreateUser = sessionInfo.getUserId();
- plCommandParameter.plModifyUser = sessionInfo.getUserId();
- try {
- platformClientUtil.getUIService().savePLCommandParameter(plCommandParameter);
- } catch (PLException e) {
- e.printStackTrace();
- throw new VciBaseException("淇濆瓨鎸夐挳淇℃伅鏃跺彂鐢熷紓甯革細"+ e.getMessage());
- }
+ Iterator<Map.Entry<String, String>> kvItor = buttonParams.entrySet().iterator();
+ while(kvItor.hasNext()){
+ Map.Entry<String, String> next = kvItor.next();
+ PLCommandParameter plCommandParameter = new PLCommandParameter();
+ plCommandParameter.plOId = ObjectUtility.getNewObjectID36();
+ plCommandParameter.plCommandOId = plTabButton.plOId;
+ plCommandParameter.plKey = next.getKey();
+ plCommandParameter.plValue = next.getValue();
+ plCommandParameter.plCreateUser = sessionInfo.getUserId();
+ plCommandParameter.plModifyUser = sessionInfo.getUserId();
+ try {
+ platformClientUtil.getUIService().savePLCommandParameter(plCommandParameter);
+ } catch (PLException e) {
+ e.printStackTrace();
+ throw new VciBaseException("淇濆瓨鎸夐挳淇℃伅鏃跺彂鐢熷紓甯革細"+ e.getMessage());
}
}
}
@@ -933,36 +1070,36 @@
/**
* 鍒犻櫎鍗曚釜鎸夐挳閰嶇疆
- * @param tabButton
+ * @param tabButtonVO
* @return
*/
@Override
- public boolean deleteTapButton(PLTabButton tabButton) throws PLException {
- VciBaseUtil.alertNotNull(tabButton,"鍒犻櫎鐨勬寜閽厤缃璞�");
- boolean success = UITools.getService().deletePLTabButton(tabButton);
- if(success == false){
- throw new VciBaseException("璇ユ湁瀛愮骇鎸夐挳锛屼笉鑳藉垹闄わ紒");
- }
- return true;
+ public boolean deleteTapButton(PLTabButtonVO tabButtonVO) throws PLException {
+ VciBaseUtil.alertNotNull(tabButtonVO,"鍒犻櫎鐨勬寜閽厤缃璞�");
+ boolean success = platformClientUtil.getUIService().deletePLTabButton(this.tabButtonVO2TabButton(new PLTabButton(),tabButtonVO));
+ if(success == false){
+ throw new VciBaseException("璇ユ湁瀛愮骇鎸夐挳锛屼笉鑳藉垹闄わ紒");
+ }
+ return true;
}
/**
* 璋冩暣涓轰笅绾ф寜閽�
- * @param plTabButton
+ * @param tabButtonVO
* @return
*/
@Override
- public BaseResult joinBtn(PLTabButton plTabButton) throws PLException {
- VciBaseUtil.alertNotNull(plTabButton,"闇�璋冩暣涓轰笅绾ф寜閽�",plTabButton.plTableOId,"褰撳墠鎸夐挳閰嶇疆鎵�鍦ㄧ殑椤甸潰涓婚敭");
+ public BaseResult joinBtn(PLTabButtonVO tabButtonVO) throws PLException {
+ VciBaseUtil.alertNotNull(tabButtonVO,"闇�璋冩暣涓轰笅绾ф寜閽�",tabButtonVO.getTableOId(),"褰撳墠鎸夐挳閰嶇疆鎵�鍦ㄧ殑椤甸潰涓婚敭");
//鍚屼竴椤甸潰涓嬬殑鎸夐挳
- List<PLTabButtonVO> plTabButtons = this.getTabButtons(plTabButton.plTableOId);
+ List<PLTabButtonVO> plTabButtons = this.getTabButtons(tabButtonVO.getTableOId());
if(Func.isEmpty(plTabButtons)){
return BaseResult.fail("鏈幏鍙栧埌鎸夐挳閰嶇疆淇℃伅锛�");
}
//鑾峰彇褰撳墠瑕佺Щ鍔ㄧ殑鎸夐挳鐨勪笅鏍�
int index = 0;
for (int i = 0; i < plTabButtons.size(); i++) {
- if (plTabButtons.get(i).getOId().equals(plTabButton.plOId)) {
+ if (plTabButtons.get(i).getOId().equals(tabButtonVO.getOId())) {
index = i; // 鎵惧埌鍚庤褰曚笅鏍�
break; // 鎵惧埌鍚庨��鍑哄惊鐜�
}
@@ -972,8 +1109,8 @@
return BaseResult.fail("褰撳墠鑺傜偣涓嶅瓨鍦ㄥ厔鑺傜偣锛屾棤娉曡皟鏁翠负涓嬬骇鎸夐挳锛�");
}
//璁剧疆鐖秈d涓轰笂涓�涓妭鐐圭殑
- plTabButton.plParentOid = plTabButtons.get(index-1).getOId();
-
+ tabButtonVO.setParentOid(plTabButtons.get(index-1).getOId());
+ PLTabButton plTabButton = this.tabButtonVO2TabButton(new PLTabButton(), tabButtonVO);
boolean success = platformClientUtil.getUIService().updatePLTabButton(plTabButton);
if(success == false) {
return BaseResult.fail("淇敼澶辫触锛�");
@@ -983,13 +1120,13 @@
/**
* 璋冩暣涓轰笂绾ф寜閽�
- * @param plTabButton
+ * @param tabButtonVO
* @return
*/
@Override
- public BaseResult exitBtn(PLTabButton plTabButton) throws PLException {
- plTabButton.plParentOid = "";
-
+ public BaseResult exitBtn(PLTabButtonVO tabButtonVO) throws PLException {
+ tabButtonVO.setParentOid("");
+ PLTabButton plTabButton = this.tabButtonVO2TabButton(new PLTabButton(), tabButtonVO);
boolean success = platformClientUtil.getUIService().updatePLTabButton(plTabButton);
if(success == false) {
BaseResult.fail("鎾ら攢澶辫触锛�");
@@ -1047,7 +1184,6 @@
* @throws PLException
*/
private void newPLDefinationIsOk(PLDefinationVO pd, boolean isEdit) throws PLException{
- boolean res = false;
boolean nameExist = false;
boolean seqExist = false;
PLPageDefination[] pds = platformClientUtil.getUIService().getPLPageDefinationsByPageContextOId(pd.getTabPageOId());
@@ -1694,13 +1830,14 @@
/**
* 闈炵┖妫�鏌�
- * @param tip
- * @param txt
+ * @param tip 鎻愮ず淇℃伅
+ * @param txt 鏍￠獙鐨勫唴瀹�
+ * @param isRequired 鏄惁蹇呭～
* @return
*/
- protected boolean checkRequiredIsOk(String tip, String txt){
+ protected boolean checkRequiredIsOk(String tip, String txt,boolean isRequired/*鏄惁蹇呭～*/){
boolean res = false;
- if(Func.isBlank(txt)){
+ if(Func.isBlank(txt) && isRequired){
throw new VciBaseException(tip + " 涓嶈兘涓虹┖锛�");
} else {
res = true;
@@ -1714,11 +1851,11 @@
* @param btmName 涓氬姟绫诲瀷鍚�
* @return
*/
- protected boolean checkBtmTypeTxtIsOk(String tipName, String btmName) throws PLException {
+ protected boolean checkBtmTypeTxtIsOk(String tipName, String btmName,boolean isRequired) throws PLException {
boolean res = false;
if(tipName == null) return true;
if(btmName == null) return true;
- if(!checkRequiredIsOk(tipName, btmName)){
+ if(!checkRequiredIsOk(tipName, btmName, isRequired)){
res = false;
} else if(!checkBtmNameIsExist(tipName, btmName)){
res = false;
@@ -1770,11 +1907,11 @@
* @param btmLinkType
* @return
*/
- protected boolean checkPortalVITxtIsOk(String tip, String txtVIName, String btmLinkType) throws PLException {
+ protected boolean checkPortalVITxtIsOk(String tip, String txtVIName, String btmLinkType, boolean isRequired) throws PLException {
boolean res = false;
if(tip == null) return true;
if(txtVIName == null) return true;
- if(!checkRequiredIsOk(tip, txtVIName)){
+ if(!checkRequiredIsOk(tip, txtVIName,isRequired)){
res = false;
} else if(!checkPortalVIIsExist(tip, txtVIName, btmLinkType)){
res = false;
@@ -1813,13 +1950,13 @@
* @param btmLinkType
* @return
*/
- protected boolean checkQTNameTxtIsOk(String tip, String txtQTName, String btmLinkType) throws PLException {
+ protected boolean checkQTNameTxtIsOk(String tip, String txtQTName, String btmLinkType, boolean isRequired) throws PLException {
boolean res = false;
if(tip == null) return true;
if(txtQTName == null) return true;
- if(!checkRequiredIsOk(tip, txtQTName)){
+ if(!checkRequiredIsOk(tip, txtQTName, isRequired)){
res = false;
- } else if(Func.isBlank(txtQTName) && !checkQTIsExist(tip, txtQTName, btmLinkType)){
+ } else if(Func.isNotBlank(txtQTName) && !checkQTIsExist(tip, txtQTName, btmLinkType)){
res = false;
} else {
res = true;
@@ -1834,11 +1971,11 @@
* @param btmLinkType
* @return
*/
- protected boolean checkUILayoutTxtIsOk(String tip, String uiName, String btmLinkType) throws PLException {
+ protected boolean checkUILayoutTxtIsOk(String tip, String uiName, String btmLinkType, boolean isRequired) throws PLException {
boolean res = false;
if(tip == null) return true;
if(uiName == null) return true;
- if(!checkRequiredIsOk(tip, uiName)){
+ if(!checkRequiredIsOk(tip, uiName,isRequired)){
res = false;
} else if(!checkUILayoutIsExist(tip, uiName, btmLinkType)){
res = false;
@@ -1892,11 +2029,11 @@
* @param linkTypeName
* @return
*/
- protected boolean checkLinkTypeTxtIsOk(String tip, String linkTypeName) throws PLException {
+ protected boolean checkLinkTypeTxtIsOk(String tip, String linkTypeName, boolean isRequired) throws PLException {
boolean res = false;
if(tip == null) return true;
if(linkTypeName == null) return true;
- if(!checkRequiredIsOk(tip, linkTypeName)){
+ if(!checkRequiredIsOk(tip, linkTypeName,isRequired)){
res = false;
} else if(!checkLinkTypeIsExist(tip, linkTypeName)){
res = false;
@@ -2040,11 +2177,11 @@
*/
private boolean checkBtmTypeInputIsOk(String btmType,String txtVIName/*閫夋嫨妯℃澘*/,String txtQTName/*鏌ヨ妯℃澘*/) throws PLException {
boolean res = false;
- if(!super.checkBtmTypeTxtIsOk("涓氬姟绫诲瀷", btmType)){
+ if(!super.checkBtmTypeTxtIsOk("涓氬姟绫诲瀷", btmType,true)){
res = false;
- } else if(!super.checkPortalVITxtIsOk("閫夋嫨妯℃澘", txtVIName, btmType)){
+ } else if(!super.checkPortalVITxtIsOk("閫夋嫨妯℃澘", txtVIName, btmType,true)){
res = false;
- } else if(!super.checkQTNameTxtIsOk("鏌ヨ妯℃澘", txtQTName, btmType)){
+ } else if(!super.checkQTNameTxtIsOk("鏌ヨ妯℃澘", txtQTName, btmType,false)){
res = false;
} else {
res = true;
@@ -2061,11 +2198,11 @@
*/
private boolean checkLinkTypeInputIsOk(String txtVIName/*閫夋嫨鐨勬ā鏉�*/,String txtQTName/*鏌ヨ妯℃澘*/,String btmType) throws PLException {
boolean res = false;
- if(!(this.checkBtmTypeTxtIsOk("鐩爣瀵硅薄", linkType))){
+ if(!(this.checkBtmTypeTxtIsOk("鐩爣瀵硅薄", linkType,true))){
res = false;
- } else if(!(this.checkPortalVITxtIsOk("閫夋嫨妯℃澘", txtVIName, linkType))){
+ } else if(!(this.checkPortalVITxtIsOk("閫夋嫨妯℃澘", txtVIName, linkType,true))){
res = false;
- } else if(!(this.checkQTNameTxtIsOk("鏌ヨ妯℃澘", txtQTName, linkType))){
+ } else if(!(this.checkQTNameTxtIsOk("鏌ヨ妯℃澘", txtQTName, linkType,false))){
res = false;
} else {
res = true;
@@ -2145,11 +2282,11 @@
private boolean checkBtmTypeInputIsOk() throws PLException {
boolean res = false;
- if(!(super.checkBtmTypeTxtIsOk("椤剁骇鑺傜偣鏄剧ず绫诲瀷", btmType))){
+ if(!(super.checkBtmTypeTxtIsOk("椤剁骇鑺傜偣鏄剧ず绫诲瀷", btmType,true))){
res = false;
- } else if(!(super.checkPortalVITxtIsOk("閫夋嫨妯℃澘", txtVIName, btmType))){
+ } else if(!(super.checkPortalVITxtIsOk("閫夋嫨妯℃澘", txtVIName, btmType,true))){
res = false;
- } else if(!(super.checkQTNameTxtIsOk("鏌ヨ妯℃澘", txtQTName , btmType))){
+ } else if(!(super.checkQTNameTxtIsOk("鏌ヨ妯℃澘", txtQTName , btmType,false))){
res = false;
} else {
res = true;
@@ -2159,11 +2296,11 @@
private boolean checkLinkTypeInputIsOk() throws PLException {
boolean res = false;
- if(!(super.checkBtmTypeTxtIsOk("椤剁骇鑺傜偣鏄剧ず绫诲瀷", linkType))){
+ if(!(super.checkBtmTypeTxtIsOk("椤剁骇鑺傜偣鏄剧ず绫诲瀷", linkType,true))){
res = false;
- } else if(!(super.checkPortalVITxtIsOk("閫夋嫨妯℃澘", txtVIName, linkType))){
+ } else if(!(super.checkPortalVITxtIsOk("閫夋嫨妯℃澘", txtVIName, linkType,true))){
res = false;
- } else if(!(super.checkQTNameTxtIsOk("鏌ヨ妯℃澘", txtQTName, linkType))){
+ } else if(!(super.checkQTNameTxtIsOk("鏌ヨ妯℃澘", txtQTName, linkType,false))){
res = false;
} else {
res = true;
@@ -2241,34 +2378,34 @@
private boolean checkBtmTypeInputIsOk() throws PLException {
boolean res = false;
- if(!(super.checkBtmTypeTxtIsOk("涓氬姟绫诲瀷", btmType))){
+ if(!(super.checkBtmTypeTxtIsOk("涓氬姟绫诲瀷", btmType,true))){
res = false;
return res;
}
// 閾炬帴绫诲瀷涓嶄负绌烘椂锛岄渶瑕佸悓鏃舵鏌ラ摼鎺ョ被鍨嬪強閾炬帴绫诲瀷涓嬬殑鏌ヨ妯℃澘鏄惁鏈夋晥
if(Func.isBlank(linkType)){
- if(!(super.checkLinkTypeTxtIsOk("閾炬帴绫诲瀷", linkType))){
+ if(!(super.checkLinkTypeTxtIsOk("閾炬帴绫诲瀷", linkType,false))){
res = false;
return res;
- } else if(!(super.checkQTNameTxtIsOk("鏌ヨ妯℃澘", queryTemplateName, linkType))){
+ } else if(!(super.checkQTNameTxtIsOk("鏌ヨ妯℃澘", queryTemplateName, linkType,true))){
res = false;
return res;
}
} else {
// 閾炬帴绫诲瀷涓虹┖鏃讹紝鍙渶瑕佹鏌ヤ笟鍔＄被鍨嬩笅鐨勬煡璇㈡ā鏉挎槸鍚︽湁鏁�
- if(!(super.checkQTNameTxtIsOk("鏌ヨ妯℃澘", queryTemplateName, btmType))){
+ if(!(super.checkQTNameTxtIsOk("鏌ヨ妯℃澘", queryTemplateName, btmType,true))){
res = false;
return res;
}
}
- if(!super.checkRequiredIsOk("鏍硅妭鐐规樉绀鸿〃杈惧紡", showExpressionRoot)){
+ if(!super.checkRequiredIsOk("鏍硅妭鐐规樉绀鸿〃杈惧紡", showExpressionRoot,true)){
res = false;
}
- else if(!super.checkRequiredIsOk("鏍戣妭鐐规樉绀鸿〃杈惧紡", showExpression)){
+ else if(!super.checkRequiredIsOk("鏍戣妭鐐规樉绀鸿〃杈惧紡", showExpression,true)){
res = false;
}
- else if(!super.checkRequiredIsOk("鍙傜収鏍戣缃�", refTreeSet)){
+ else if(!super.checkRequiredIsOk("鍙傜収鏍戣缃�", refTreeSet,true)){
res = false;
}
else {
@@ -2336,11 +2473,11 @@
private boolean checkUILayoutInputIsOk() throws PLException {
boolean res = false;
- if (!(super.checkBtmTypeTxtIsOk("瀵硅薄绫诲瀷", uiBtmType))) {
+ if (!(super.checkBtmTypeTxtIsOk("瀵硅薄绫诲瀷", uiBtmType,true))) {
res = false;
- } else if (!(super.checkUILayoutTxtIsOk("UI瀹氫箟", uiLayout, uiBtmType))) {
+ } else if (!(super.checkUILayoutTxtIsOk("UI瀹氫箟", uiLayout, uiBtmType,true))) {
res = false;
- } else if (!(super.checkQTNameTxtIsOk("鏌ヨ妯℃澘", queryTemplateName, qryType))) {
+ } else if (!(super.checkQTNameTxtIsOk("鏌ヨ妯℃澘", queryTemplateName, qryType,false))) {
res = false;
} else {
res = true;
--
Gitblit v1.9.3