From 51542c2d2272cfe19db8e7dbc07cccc1c448d22a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 20 九月 2024 15:17:05 +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/UIManagerServiceImpl.java | 1105 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 882 insertions(+), 223 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 408a5c2..3ef9a19 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
@@ -2,27 +2,29 @@
import com.vci.common.utility.ObjectUtility;
import com.vci.corba.common.PLException;
+import com.vci.corba.common.data.UserEntityInfo;
import com.vci.corba.framework.data.RoleRightInfo;
import com.vci.corba.omd.btm.BizType;
import com.vci.corba.portal.PortalService;
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.*;
+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.redis.RedisService;
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;
@@ -33,13 +35,11 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
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.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import java.util.regex.Pattern;
@@ -57,6 +57,12 @@
@Resource
private PlatformClientUtil platformClientUtil;
+ /**
+ * 缂撳瓨宸ュ叿
+ */
+ @Resource
+ private RedisService redisService;
+
/***
* 鏄惁鏄鐞嗗憳
*/
@@ -73,6 +79,11 @@
* 鏃ュ織
*/
private Logger logger = LoggerFactory.getLogger(getClass());
+
+ /**
+ * 瀵煎叆鏁版嵁鐨剆heet闆嗗悎
+ */
+ private final String IMPORTUIKEY = "importUIKey:";
/**
* 鎺掑簭姣旇緝鍣�
@@ -136,7 +147,7 @@
public List<PLUILayout> getUIContextDataByBtName(String btemName,String context) throws PLException {
VciBaseUtil.alertNotNull(btemName,"涓氬姟绫诲瀷");
List<PLUILayout> pluiLayoutList=new ArrayList<>();
- List<String> contextList= VciBaseUtil.str2List(context);
+ List<String> contextList= new ArrayList<>();
if(StringUtils.isNotBlank(context)){
contextList=VciBaseUtil.str2List(context);
}else{
@@ -313,23 +324,526 @@
}
/**
+ * 鏍规嵁鍕鹃�夌殑鏉′欢鑾峰彇闇�瑕佸鍑虹殑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> pldDataList = new ArrayList<>();
+ List<WriteExcelData> tpDataList = new ArrayList<>();
+ List<WriteExcelData> pdDataList = new ArrayList<>();
+ List<WriteExcelData> tbDataList = new ArrayList<>();
+ List<WriteExcelData> cpDataList = new ArrayList<>();
+ //璁剧疆鍒楀ご
+ /*for (int index = 0; index < columns.size(); index++) {
+ excelDataList.add(new WriteExcelData(0,index, columns.get(index)));
+ }*/
+ AtomicInteger pldRow = new AtomicInteger(0);
+ AtomicInteger tpRow = new AtomicInteger(0);
+ AtomicInteger pdRow = new AtomicInteger(0);
+ AtomicInteger tbRow = new AtomicInteger(0);
+ AtomicInteger cpRow = new AtomicInteger(0);
+
+ expConditionMap.entrySet().stream().forEach(item->{
+ //key瀛樻斁鐨剈i涓婁笅鏂囩殑id
+ try {
+ PLUILayout pluiLayout = platformClientUtil.getUIService().getPLUILayoutById(item.getKey());
+ pldDataList.add(new WriteExcelData(pldRow.get(),0, pluiLayout.plOId));
+ pldDataList.add(new WriteExcelData(pldRow.get(),1, pluiLayout.plCode));
+ pldDataList.add(new WriteExcelData(pldRow.get(),2, pluiLayout.plName));
+ pldDataList.add(new WriteExcelData(pldRow.get(),3, pluiLayout.plRelatedType));
+ pldDataList.add(new WriteExcelData(pldRow.get(),4, pluiLayout.plIsShowForm));
+ pldDataList.add(new WriteExcelData(pldRow.get(),5, pluiLayout.plIsShowNavigator));
+ pldDataList.add(new WriteExcelData(pldRow.get(),6, pluiLayout.plIsShowTab));
+ pldRow.getAndIncrement();
+
+ //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->{
+ //鍖哄煙瀹氫箟
+ tpDataList.add(new WriteExcelData(tpRow.get(),0, tabPage.plOId));
+ tpDataList.add(new WriteExcelData(tpRow.get(),1, tabPage.plSeq));
+ tpDataList.add(new WriteExcelData(tpRow.get(),2, tabPage.plCode));
+ tpDataList.add(new WriteExcelData(tpRow.get(),3, tabPage.plLabel));
+ tpDataList.add(new WriteExcelData(tpRow.get(),4, tabPage.plName));
+ tpDataList.add(new WriteExcelData(tpRow.get(),5, tabPage.plContextOId));
+ tpDataList.add(new WriteExcelData(tpRow.get(),6, tabPage.plAreaType));
+ tpDataList.add(new WriteExcelData(tpRow.get(),7, tabPage.plIsOpen));
+ tpDataList.add(new WriteExcelData(tpRow.get(),8, tabPage.plOpenExpression));
+ tpDataList.add(new WriteExcelData(tpRow.get(),9, tabPage.plUIParser));
+ tpDataList.add(new WriteExcelData(tpRow.get(),10, tabPage.plExtAttr));
+ tpDataList.add(new WriteExcelData(tpRow.get(),11, tabPage.plDesc));
+ tpDataList.add(new WriteExcelData(tpRow.get(),12, tabPage.plLicensOrs));
+ tpRow.getAndIncrement();
+ try {
+ PLPageDefination[] plPageDefinations = platformClientUtil.getUIService().getPLPageDefinationsByPageContextOId(tabPage.plOId);
+ if(Func.isNotEmpty(plPageDefinations)){
+ //List<PLTabButtonVO> tabButtonsTotal = new ArrayList<>();
+ Arrays.stream(plPageDefinations).forEach(plPageDefination->{
+ pdDataList.add(new WriteExcelData(pdRow.get(),0, plPageDefination.plOId));
+ pdDataList.add(new WriteExcelData(pdRow.get(),1, plPageDefination.plTabPageOId));
+ pdDataList.add(new WriteExcelData(pdRow.get(),2, plPageDefination.plType));
+ pdDataList.add(new WriteExcelData(pdRow.get(),3, plPageDefination.name));
+ pdDataList.add(new WriteExcelData(pdRow.get(),4, plPageDefination.desc));
+ pdDataList.add(new WriteExcelData(pdRow.get(),5, plPageDefination.seq));
+ pdDataList.add(new WriteExcelData(pdRow.get(),6, plPageDefination.plDefination));
+ pdRow.getAndIncrement();
+ //鏌ヨ鎸夐挳
+ try {
+ PLTabButton[] tabButtons = platformClientUtil.getUIService().getPLTabButtonsByTableOId(plPageDefination.plOId);
+ for (PLTabButton tabButton:tabButtons){
+ tbDataList.add(new WriteExcelData(tbRow.get(),0, tabButton.plOId));
+ tbDataList.add(new WriteExcelData(tbRow.get(),1, tabButton.plTableOId));
+ tbDataList.add(new WriteExcelData(tbRow.get(),2, tabButton.plPageOId));
+ tbDataList.add(new WriteExcelData(tbRow.get(),3, tabButton.plActionOId));
+ tbDataList.add(new WriteExcelData(tbRow.get(),4, tabButton.plLabel));
+ tbDataList.add(new WriteExcelData(tbRow.get(),5, tabButton.plAreaType));
+ tbDataList.add(new WriteExcelData(tbRow.get(),6, tabButton.plDesc));
+ tbDataList.add(new WriteExcelData(tbRow.get(),7, tabButton.plSeq));
+ tbDataList.add(new WriteExcelData(tbRow.get(),8, tabButton.plParentOid));
+ tbDataList.add(new WriteExcelData(tbRow.get(),9, tabButton.displayMode));
+ tbDataList.add(new WriteExcelData(tbRow.get(),10, tabButton.iconPath));
+ tbDataList.add(new WriteExcelData(tbRow.get(),11, tabButton.authorization));
+ tbDataList.add(new WriteExcelData(tbRow.get(),12, tabButton.show));
+ tbRow.getAndIncrement();
+ PLCommandParameter[] parameters = platformClientUtil.getUIService().getPLCommandParametersByCommandOId(tabButton.plOId);
+ if(Func.isNotEmpty(parameters)){
+ Arrays.stream(parameters).forEach(param->{
+ cpDataList.add(new WriteExcelData(cpRow.get(),0, param.plOId));
+ cpDataList.add(new WriteExcelData(cpRow.get(),1, param.plCommandOId));
+ cpDataList.add(new WriteExcelData(cpRow.get(),2, param.plKey));
+ cpDataList.add(new WriteExcelData(cpRow.get(),3, param.plValue));
+ cpRow.getAndIncrement();
+ });
+ }
+ }
+ } catch (PLException e) {
+ e.printStackTrace();
+ }
+ });
+ }
+ } catch (PLException e) {
+ e.printStackTrace();
+ }
+ });
+ }
+ } catch (PLException e) {
+ e.printStackTrace();
+ }
+ });
+ WriteExcelOption excelOption = new WriteExcelOption();
+ excelOption.addSheetDataList("PlpageLayoutDefnation",pldDataList);
+ excelOption.addSheetDataList("Pltabpage",tpDataList);
+ excelOption.addSheetDataList("Plpagedefination",pdDataList);
+ excelOption.addSheetDataList("Pltabbutton",tbDataList);
+ excelOption.addSheetDataList("PlcommondParam",cpDataList);
+ ExcelUtil.writeDataToFile(excelPath, excelOption);
+ return excelPath;
}
/**
* 瀵煎叆UI涓婁笅鏂�
* @param file
+ * @param isCovered 鏄惁瑕嗙洊
+ * @param selectBtm 閫夋嫨鐨勪笟鍔＄被鍨�
* @return
*/
@Override
- public BaseResult impUIContextData(MultipartFile file) {
- return null;
+ public BaseResult impUIContextData(File file,boolean isCovered,String selectBtm) {
+ if(!isCovered){
+ VciBaseUtil.alertNotNull(file,"excel鏂囦欢");
+ if(!file.exists()){
+ throw new VciBaseException("瀵煎叆鐨別xcel鏂囦欢涓嶅瓨鍦�,{0}",new String[]{file.getPath()});
+ }
+ }
+
+ try {
+ List<SheetDataSet> sheetDataSets = null;
+ SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
+ //鏄鐩栨搷浣滐紝鎵�浠ョ洿鎺ヨ鍙�
+ if(isCovered){
+ sheetDataSets = redisService.getCacheList(IMPORTUIKEY + sessionInfo.getUserId());
+ if(Func.isEmpty(sheetDataSets)){
+ throw new VciBaseException("浠庣紦瀛樹腑鏈幏鍙栧埌瀵煎叆鐨勬暟鎹紝璇峰埛鏂板悗閲嶈瘯锛侊紒");
+ }
+ }else{
+ //璇诲彇excel琛�
+ ReadExcelOption readExcelOption = new ReadExcelOption();
+ readExcelOption.setReadAllSheet(true); //璇诲彇鍏ㄩ儴鐨剆heet
+ sheetDataSets = ExcelUtil.readDataObjectFromExcel(file,SheetDataSet.class,readExcelOption);
+ }
+
+ PLUILayout[] plpagelayoutdefinations = null;
+
+ SheetDataSet plpagelayoutdefnationsheet = sheetDataSets.get(0);
+ SheetDataSet pltabpagesheet = sheetDataSets.get(1);
+ SheetDataSet plpagedefinationsheet = sheetDataSets.get(2);
+ SheetDataSet pltabbuttonsheet = sheetDataSets.get(3);
+ SheetDataSet plcommondparamsheet = sheetDataSets.get(4);
+
+ Map<PLUILayout,List<PLTabPage>> pdMap = new HashMap<>();
+ Map<PLTabPage,List<PLPageDefination>> tdMap = new HashMap<>();
+ Map<PLPageDefination,List<PLTabButton>> dbMap = new HashMap<>();
+ Map<PLTabButton,List<PLCommandParameter>> bcMap = new HashMap<>();
+
+ List<PLUILayout> plpagelayoutdefinationList = new ArrayList<>();
+ List<PLTabPage> pltabpagelist = new ArrayList<>();
+ List<PLPageDefination> plpagedefinationlist = new ArrayList<>();
+ List<PLTabButton> pltabbuttonlist = new ArrayList<>();
+ List<PLCommandParameter> plcommandparameterlist = new ArrayList<>();
+
+ /*StringBuffer checkplpagelayoutdefination = new StringBuffer();
+ StringBuffer checkplpagelayoutdefinationPlcode = new StringBuffer();*/
+ StringBuffer plActionIDNulls = new StringBuffer();
+
+ //add by caill start 鍒濆鍖栨爣璁�
+ int count=0;
+ int preCount=0;
+ String preOID="";
+ String doublePreOID="";
+ String plpageLayoutDefinationId="";
+ String plPageContextOId="";
+ String plCommandOId="";
+ String plTableOId="";
+
+ //add by caill end
+ PLAction[] allPLAction = platformClientUtil.getUIService().getAllPLAction();
+ Map<String,String> relation = null;
+ List<SheetRowData> rowData = plpagelayoutdefnationsheet.getRowData();
+ for(int i=0; i<rowData.size(); i++){
+ pltabpagelist = new ArrayList<PLTabPage>();
+ PLUILayout p = new PLUILayout();
+ //HSSFRow readrow = plpagelayoutdefnationsheet.getRowData();
+ Map<Integer, String> dataMap = rowData.get(i).getData();
+ if(Func.isEmpty(dataMap)){
+ break;
+ }
+ //鏍规嵁涓氬姟绫诲瀷鏌ヨui涓婁笅鏂�
+ plpagelayoutdefinations = platformClientUtil.getUIService().getPLUILayoutsByRelatedType(selectBtm);
+
+ p.plOId = ObjectUtility.getNewObjectID36();
+ p.plCode = dataMap.get(1);
+ p.plName = dataMap.get(2);
+ //add by caill start
+ //閬嶅巻UI鍚嶇О
+ for(PLUILayout pd : plpagelayoutdefinations){
+ if(pd.plName.equals(p.plName) && !isCovered){
+ //濡傛灉鐢ㄦ埛閫夋嫨瑕嗙洊锛岀浜屾璋冪敤灏变笉浼氫紶瀵煎叆鏂囦欢锛屾墍浠ヨ繖閲屽瓨鍏ョ紦瀛�
+ redisService.setCacheList(IMPORTUIKEY+sessionInfo.getUserId(),sheetDataSets);
+ //璁剧疆杩囨湡鏃堕棿涓�5鍒嗛挓锛屽洜涓轰竴鑸儏鍐典笅涓嶄細璇存槸绛夊お涔�
+ redisService.expire(IMPORTUIKEY+sessionInfo.getUserId(),5, TimeUnit.MINUTES);
+ throw new VciBaseException(pd.plName+"鍚嶇О宸茬粡瀛樺湪,鏄惁瑕嗙洊?");
+ }
+ //鏍规嵁UI涓婁笅鏂囧仛鍒ゆ柇
+ if(pd.plCode.equals(p.plCode)){
+ count=1;
+ preOID=pd.plOId; //濡傛灉UI涓婁笅鏂囩浉鍚岋紝灏辨妸绯荤粺涓殑id璧嬪�肩粰鏂板鍏ョ殑id
+ p.plOId=pd.plOId;
+ }
+ }
+ //add by caill end
+ plpageLayoutDefinationId = dataMap.get(0);
+ String name = dataMap.get(3);
+ p.plRelatedType = dataMap.get(3);
+ p.plIsShowNavigator = Short.parseShort(dataMap.get(4));
+ p.plIsShowTab = Short.parseShort(dataMap.get(5));
+ p.plIsShowForm = Short.parseShort(dataMap.get(6));
+ //閫夋嫨鐨勫拰瀵煎叆鐨勪笟鍔＄被鍨嬭妭鐐逛笉涓�鑷�
+ if(!selectBtm.equals(name)){
+ throw new VciBaseException("璇烽�夋嫨瑕佸鍏ョ殑绫诲瀷鑺傜偣鍚嶇О锛�");
+ }
+
+ plpagelayoutdefinationList.add(p);
+
+ //鍖哄煙瀹氫箟sheet澶勭悊
+ List<SheetRowData> tabPageRowData = pltabpagesheet.getRowData();
+ if(Func.isNotEmpty(tabPageRowData)){
+ for(int j=0; j<tabPageRowData.size(); j++){
+ plpagedefinationlist = new ArrayList<PLPageDefination>();
+ PLTabPage pt = new PLTabPage();
+ Map<Integer, String> tabPageDataMap = tabPageRowData.get(j).getData();
+ if(Func.isEmpty(tabPageDataMap)){
+ break;
+ }
+ pt.plOId = ObjectUtility.getNewObjectID36();
+ pt.plCode = tabPageDataMap.get(2);
+ pt.plName = tabPageDataMap.get(4);
+ //add by caill start
+ if(count==1) {
+ PLTabPage[] PLTabPages = platformClientUtil.getUIService().getPLTabPagesByPageDefinationOId(preOID);
+ //閬嶅巻鎺у埗鍖鸿〃鏍�
+ for(PLTabPage pl : PLTabPages){
+ if(pl.plCode.equals(pt.plCode)){
+ pt.plOId=pl.plOId; //濡傛灉鎺у埗鍖鸿〃鏍肩殑缂栫爜鍜屽鍏ョ殑缂栫爜涓�鏍凤紝灏辨妸鎺у埗鍖篿d璧嬪�肩粰鏂板鍏ョ殑id
+ preCount=1;
+ doublePreOID=pl.plOId;
+ }
+ }
+ }
+ //add by caill end
+ pt.plSeq = Short.parseShort(tabPageDataMap.get(1));
+ pt.plLabel = tabPageDataMap.get(3);
+ pt.plContextOId = tabPageDataMap.get(5);
+ pt.plAreaType = Short.parseShort(tabPageDataMap.get(6));
+ pt.plIsOpen = Short.parseShort(tabPageDataMap.get(7));
+ pt.plOpenExpression = tabPageDataMap.get(8);
+ pt.plUIParser = tabPageDataMap.get(9);
+ pt.plExtAttr = tabPageDataMap.get(10);
+ pt.plDesc = tabPageDataMap.get(11);
+ pt.plLicensOrs = tabPageDataMap.get(12);
+ plPageContextOId = tabPageDataMap.get(5);
+ if(pt.plContextOId.equals(plpageLayoutDefinationId)){
+ pt.plContextOId = p.plOId;
+ pltabpagelist.add(pt);
+ //椤甸潰璁捐澶勭悊
+ List<SheetRowData> pagedefinationRowData = plpagedefinationsheet.getRowData();
+ if(Func.isNotEmpty(pagedefinationRowData)){
+ for(int k=0;k<pagedefinationRowData.size();k++){
+ pltabbuttonlist = new ArrayList<>();
+ PLPageDefination plpagedefination = new PLPageDefination();
+ Map<Integer, String> pagedefinationDataMap = pagedefinationRowData.get(k).getData();
+
+ if(Func.isEmpty(pagedefinationDataMap)){
+ break;
+ }
+ plpagedefination.plOId = ObjectUtility.getNewObjectID36();
+ plpagedefination.name = pagedefinationDataMap.get(3);
+ //add by caill start
+ //鏈�鍚庝竴绾х殑鍒ゆ柇
+ if(preCount==1) {
+ PLPageDefination[] PLPageDefinations = platformClientUtil.getUIService().getPLPageDefinationsByPageContextOId(doublePreOID);
+ for(PLPageDefination plp : PLPageDefinations) {
+ if(plp.name.equals(plpagedefination.name)) {
+ plpagedefination.plOId=plp.plOId;
+
+ }
+
+ }
+ }
+ //add by caill end
+ plpagedefination.plDefination = pagedefinationDataMap.get(6);
+ plpagedefination.seq = Short.parseShort(pagedefinationDataMap.get(5));
+ plpagedefination.plTabPageOId = pagedefinationDataMap.get(1);
+ plpagedefination.desc = pagedefinationDataMap.get(4);
+ plpagedefination.plType = Short.parseShort(pagedefinationDataMap.get(2));
+ plTableOId = pagedefinationDataMap.get(1);
+ if(plpagedefination.plTabPageOId.equals(plPageContextOId)){
+ plpagedefination.plTabPageOId = pt.plOId;
+ plpagedefinationlist.add(plpagedefination);
+ //淇濆瓨鏂版棫oid鐨勫叧绯伙紝鍦ㄧ‘瀹氬眰绾у叧绯绘椂浣跨敤
+ relation = new HashMap<String,String>();
+ List<SheetRowData> tabbuttonRowData = pltabbuttonsheet.getRowData();
+ if(Func.isNotEmpty(tabbuttonRowData)){
+ for(int a=0;a<tabbuttonRowData.size();a++){
+ Map<Integer, String> tabbuttonDataMap = tabbuttonRowData.get(a).getData();
+ if(Func.isNotEmpty(tabbuttonDataMap)){
+ plCommandOId = tabbuttonDataMap.get(1);
+ String newOId = ObjectUtility.getNewObjectID36();
+ relation.put(plCommandOId, newOId);
+ }
+ }
+ for(int a=0;a<tabbuttonRowData.size();a++){
+ plcommandparameterlist = new ArrayList<PLCommandParameter>();
+ PLTabButton plTabButton = new PLTabButton();
+ Map<Integer, String> tabbuttonDataMap = tabbuttonRowData.get(a).getData();
+ if(Func.isEmpty(tabbuttonDataMap)){
+ break;
+ }
+ plTabButton.plOId = ObjectUtility.getNewObjectID36();
+ plTabButton.plLabel = tabbuttonDataMap.get(4);
+ plTabButton.plAreaType = tabbuttonDataMap.get(5);
+ plTabButton.plTableOId = tabbuttonDataMap.get(1);
+ plTabButton.plSeq = Short.parseShort(tabbuttonDataMap.get(7));
+ String plActionId = "";
+ //PLAction[] allPLAction = Tool.getService().getAllPLAction();
+ for(PLAction action : allPLAction){
+ if((tabbuttonDataMap.get(3)!=null&&!"".equals(tabbuttonDataMap.get(3))
+ )&&(tabbuttonDataMap.get(3).trim().equals(action.plCode.trim()))
+ ){
+ plActionId = action.plOId;
+ break;
+ }
+ }
+ if(plActionId==null||"".equals(plActionId)){
+ if(!plActionIDNulls.toString().contains(tabbuttonDataMap.get(3))){
+ plActionIDNulls.append("\n\tAction缂栧彿:"+tabbuttonDataMap.get(3));
+ }
+ }
+ plTabButton.plActionOId = plActionId;
+ plTabButton.plAreaType = tabbuttonDataMap.get(5);
+ plTabButton.plDesc = tabbuttonDataMap.get(6);
+ String parentOid = tabbuttonDataMap.get(8);//鐖秓id
+ plCommandOId = tabbuttonDataMap.get(1);
+ plTabButton.displayMode = tabbuttonDataMap.get(9);
+ plTabButton.iconPath = tabbuttonDataMap.get(10);
+ plTabButton.authorization = tabbuttonDataMap.get(11);
+ plTabButton.show = tabbuttonDataMap.get(12);
+
+ //璧嬩簣淇濆瓨濂界殑鍊硷紝鏉ヤ繚璇佸眰绾у叧绯讳笉浼氫涪澶�
+ plTabButton.plOId = relation.get(plCommandOId);
+ if(parentOid != null && parentOid.length() > 0) {
+ plTabButton.plParentOid =
+ relation.get(parentOid) == null ? "" : relation.get(parentOid);
+ }
+ if(plTabButton.plTableOId.equals(plTableOId)){
+ plTabButton.plTableOId = plpagedefination.plOId;
+ pltabbuttonlist.add(plTabButton);
+ List<SheetRowData> commondparamsRowData = plcommondparamsheet.getRowData();
+ if(Func.isNotEmpty(commondparamsRowData)){
+ for(int b=0;b<commondparamsRowData.size();b++){
+ PLCommandParameter plCommandParameter = new PLCommandParameter();
+ Map<Integer, String> commandParameterDataMap = commondparamsRowData.get(b).getData();
+ if(Func.isEmpty(commandParameterDataMap)){
+ break;
+ }
+ plCommandParameter.plOId = ObjectUtility.getNewObjectID36();
+ plCommandParameter.plCommandOId = commandParameterDataMap.get(1);
+ plCommandParameter.plKey = commandParameterDataMap.get(2);
+ plCommandParameter.plValue = commandParameterDataMap.get(3);
+ if(plCommandParameter.plCommandOId.equals(plCommandOId)){
+ plCommandParameter.plCommandOId = plTabButton.plOId;
+ plcommandparameterlist.add(plCommandParameter);
+ }
+ }
+ bcMap.put(plTabButton, plcommandparameterlist);
+ }
+ }
+ }
+ dbMap.put(plpagedefination, pltabbuttonlist);
+ }
+ }
+ }
+ tdMap.put(pt, plpagedefinationlist);
+ }
+ }
+ }
+ pdMap.put(p, pltabpagelist);
+ }
+ }
+
+ if(plActionIDNulls.length()>0){
+ throw new VciBaseException(plActionIDNulls.toString()+"涓嶅瓨鍦紒");
+ }
+
+ //鍒犻櫎鍘熸湁button鏁版嵁
+ if(tdMap.size() > 0) {
+ for(List<PLPageDefination> list : tdMap.values()) {
+ for(PLPageDefination ppd : list) {
+ if(ppd.plOId != null && ppd.plOId.length() > 0) {
+ PLTabButton[] buttons = platformClientUtil.getUIService().getPLTabButtonsByTableOId(ppd.plOId);
+ if(buttons != null && buttons.length > 0) {
+ for(PLTabButton ptb : buttons) {
+ platformClientUtil.getUIService().deletePLTabButtonByID(ptb.plOId);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ for(PLUILayout plPageLayoutDefination : plpagelayoutdefinationList){
+ List<PLTabPage> pltabpagelists = pdMap.get(plPageLayoutDefination);
+ for(PLTabPage pltabpage:pltabpagelists){
+ List<PLPageDefination> plpagedefinationlists = tdMap.get(pltabpage);
+ for(PLPageDefination plpagedefination : plpagedefinationlists){
+ List<PLTabButton> pltabbuttons = dbMap.get(plpagedefination);
+ for(PLTabButton pltabbutton : pltabbuttons){
+ List<PLCommandParameter> plcommandParams = bcMap.get(pltabbutton);
+ for(PLCommandParameter plcommandparameter : plcommandParams){
+ plcommandparameter.plCreateUser = sessionInfo.getUserId();
+ plcommandparameter.plModifyUser = sessionInfo.getUserId();
+ platformClientUtil.getUIService().savePLCommandParameter(plcommandparameter);
+ }
+ pltabbutton.plCreateUser = sessionInfo.getUserId();
+ pltabbutton.plModifyUser = sessionInfo.getUserId();
+ platformClientUtil.getUIService().savePLTabButton(pltabbutton);
+ }
+ platformClientUtil.getUIService().savePLPageDefination(plpagedefination);
+ }
+ pltabpage.plCreateUser = sessionInfo.getUserId();
+ pltabpage.plModifyUser = sessionInfo.getUserId();
+ platformClientUtil.getUIService().savePLTabPage(pltabpage);
+ }
+ plPageLayoutDefination.plCreateUser = sessionInfo.getUserId();
+ plPageLayoutDefination.plModifyUser = sessionInfo.getUserId();
+ platformClientUtil.getUIService().savePLUILayout(plPageLayoutDefination);
+ }
+ return BaseResult.success("UI涓婁笅鏂囧鍏ユ垚鍔燂紒");
+ } catch (PLException e) {
+ e.printStackTrace();
+ return BaseResult.success("UI涓婁笅鏂囧鍏ュけ璐�,鍘熷洜锛�"+VciBaseUtil.getExceptionMessage(e));
+ }
}
/**
@@ -436,6 +950,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 +981,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 +999,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 +1018,7 @@
d = tci.getNewPLDefination(d);
break;
//Custom(鑷畾涔夋ā鏉�)
- case 2:
+ case "2":
//鍙鏌ユ帶鍒惰矾寰勪笉鑳戒负绌�,鏈夐棶棰樹細鐩存帴鎶ラ敊
CustomComptCheckInput ccci = new CustomComptCheckInput(pdVO.getControlPath());
if(!ccci.checkInputIsOk()){
@@ -506,10 +1027,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 +1043,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 +1060,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 +1097,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 +1116,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 +1135,7 @@
d = tci.getNewPLDefination(d);
break;
//Custom(鑷畾涔夋ā鏉�)
- case 2:
+ case "2":
//鍙鏌ユ帶鍒惰矾寰勪笉鑳戒负绌�,鏈夐棶棰樹細鐩存帴鎶ラ敊
CustomComptCheckInput ccci = new CustomComptCheckInput(pdVO.getControlPath());
if(!ccci.checkInputIsOk()){
@@ -620,10 +1144,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 +1160,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 +1177,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 +1206,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 +1258,6 @@
logger.error(errorLog);
throw new VciBaseException(errorLog);
}
-
});
return plTabButtonVOList;
}
@@ -770,7 +1293,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 +1429,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 +1437,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 +1460,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 +1499,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 +1510,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 +1574,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());
@@ -1162,7 +1688,7 @@
String userName= WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
RoleRightInfo[] rightInfos= platformClientUtil.getFrameworkService().getRoleRightList(roleId,userName);
List<RoleRightVO> roleRightVOList=roleRightDOO2VOS(Arrays.asList(rightInfos));
- roleRightVOMap=roleRightVOList.stream().collect(Collectors.toMap(RoleRightVO::getFuncId,roleRightVO ->roleRightVO));
+ roleRightVOMap=roleRightVOList.stream().collect(Collectors.toMap(RoleRightVO::getFuncId,roleRightVO ->roleRightVO,(oldValue,newOldValue)->oldValue));
}
BizType[] bizTypes=osBtmServiceI.getBizTypes(type);
List<Tree> treeList=new ArrayList<>();
@@ -1180,12 +1706,10 @@
bizTypeTree.setShowCheckbox(true);
bizTypeTree.setParentBtmName(bizTypes[i].name);
childList.add(bizTypeTree);
- if(roleRightVOMap.containsKey(bizTypes[i].oid)){
- List<PLUILayout>contextList=getUIContextDataByBtName(bizTypes[i].name,context);
- List<Tree> btmChildList=new ArrayList<>();
- btmChildList.add(bizTypeTree);
- setChildNode(btmChildList,contextList,roleRightVOMap,showCheckBox);
- }
+ List<PLUILayout>contextList=getUIContextDataByBtName(bizTypes[i].name,context);
+ List<Tree> btmChildList=new ArrayList<>();
+ btmChildList.add(bizTypeTree);
+ setChildNode(btmChildList,contextList,roleRightVOMap,showCheckBox);
}
rootNode.setChildren(childList);
treeList.add(rootNode);
@@ -1213,48 +1737,96 @@
treeQueryObject.setConditionMap(conditionMap);
List<Tree> treeList=this.getUIAuthor(treeQueryObject);
HashMap<String,Tree> allTreeMap=new HashMap<>();
- Map<String,RoleRightVO> roleRightVOMap=new HashMap<>();
+ Map<String,RoleRightDTO> roleRightVOMap=new HashMap<>();
if(!CollectionUtil.isEmpty(treeList)){
if(StringUtils.isNotBlank(uiAuthorDTO.getRoleId())){
String userName= WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
RoleRightInfo[] rightInfos= platformClientUtil.getFrameworkService().getRoleRightList(uiAuthorDTO.getRoleId(),userName);
List<RoleRightVO> roleRightVOList=roleRightDOO2VOS(Arrays.asList(rightInfos));
- roleRightVOMap=roleRightVOList.stream().collect(Collectors.toMap(RoleRightVO::getFuncId,roleRightVO ->roleRightVO));
+ roleRightVOMap=roleRightVOList.stream().collect(Collectors.toMap(RoleRightVO::getFuncId,roleRightVO ->roleRightVOO2DTO(roleRightVO),(oldValue,newValue)->oldValue));
}
convertTreeDOO2Map(treeList,allTreeMap);
List<RoleRightDTO> roleRightDTOList=new ArrayList<>();
List<Tree> selectTreeList= uiAuthorDTO.getSelectTreeList();
- getSelectedRoleRightObjs(uiAuthorDTO.getRoleId(),selectTreeList,allTreeMap,roleRightDTOList);
+ getSelectedRoleRightObjs(uiAuthorDTO.getRoleId(),selectTreeList,allTreeMap,roleRightVOMap,roleRightDTOList);
+ SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
+ String currentUserName = sessionInfo.getUserId();
+ boolean isDeveloper= rightControlUtil.isDeveloper(currentUserName);
+ List<RoleRightInfo> roleRightInfoList= roleRightDTOO2InfoS(roleRightDTOList);
+ UserEntityInfo info=new UserEntityInfo();
+ info.modules="UI鎺堟潈";
+ info.userName=currentUserName;
+ try {
+ res= platformClientUtil.getFrameworkService().saveRoleRight(roleRightInfoList.toArray(new RoleRightInfo[]{}),uiAuthorDTO.getRoleId(),currentUserName,info);
+ }catch (PLException e){
+ throw new Exception("淇濆瓨澶辫触锛�"+e.getMessage());
+ }
}
return res;
}
/**
- *
+ *鏍规嵁鏉冮檺璁＄畻涓婁笅鏉冮檺
* @param roleOid
* @param selectTreeList
* @param allTreeMap
* @param roleRightDTOList
*/
- private void getSelectedRoleRightObjs(String roleOid,List<Tree> selectTreeList,HashMap<String,Tree> allTreeMap, List<RoleRightDTO> roleRightDTOList){
+ private void getSelectedRoleRightObjs(String roleOid,List<Tree> selectTreeList,HashMap<String,Tree> allTreeMap,Map<String,RoleRightDTO> allRoleRightDTOMap, List<RoleRightDTO> roleRightDTOList){
Date date=new Date();
Map<String,RoleRightDTO> roleRightDTOMap=new HashMap<>();
- selectTreeList.stream().forEach(tree -> {
- RoleRightDTO roleRightDTO=new RoleRightDTO();
- String id=ObjectUtility.getNewObjectID36();
- Object data= tree.getData();
- if(data instanceof String){
- getRightValue(roleOid,tree,allTreeMap,false,roleRightDTOMap);//鍚戜笅鑾峰彇鎵�鏈夋ā鍧楃殑鏉冮檺鍊�
- }else if (!(data instanceof PLTabButton)) {//涓氬姟绫诲瀷
- getRightValue(roleOid,tree,allTreeMap,true,roleRightDTOMap);//鍚戜笂澶勭悊
- getRightValue(roleOid,tree,allTreeMap,false,roleRightDTOMap);//鍚戜笅澶勭悊锛堝寘鍚綋鍓嶈妭鐐癸級
- }else if (data instanceof PLTabButton) {//鎸夐挳
+ if(!CollectionUtil.isEmpty(selectTreeList)){
+ selectTreeList.stream().forEach(tree -> {
+ String oid=tree.getOid();
+ if(allTreeMap.containsKey(oid)){
+ tree= allTreeMap.get(oid);
+ Object data= tree.getData();
+ if (data instanceof String) {
+ getRightValue(roleOid, tree, allTreeMap, false, roleRightDTOMap);//鍚戜笅鑾峰彇鎵�鏈夋ā鍧楃殑鏉冮檺鍊�
+ } else if (!(data instanceof PLTabButton)) {//涓氬姟绫诲瀷
+ getRightValue(roleOid, tree, allTreeMap, true, roleRightDTOMap);//鍚戜笂澶勭悊
+ getRightValue(roleOid, tree, allTreeMap, false, roleRightDTOMap);//鍚戜笅澶勭悊锛堝寘鍚綋鍓嶈妭鐐癸級
+ } else if (data instanceof PLTabButton) {//鎸夐挳
+ String parrentId=tree.getParentId();
+ if(allTreeMap.containsKey(parrentId)){
+ SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
+ String currentUserName = sessionInfo.getUserId();
+ boolean isDeveloper= rightControlUtil.isDeveloper(currentUserName);
+ Tree parentNode= allTreeMap.get(parrentId);
+ String funcId = parentNode.getOid();
+ getRightValue(roleOid,tree, allTreeMap, true, roleRightDTOMap);//鍚戜笂澶勭悊璇ユ搷浣滅埗绾х殑涓婄骇妯″潡鏉冮檺(涓嶅寘鍚埗鑺傜偣)
+ if(!roleRightDTOMap.containsKey(funcId)){
+ RoleRightDTO roleRightDTO = new RoleRightDTO();
+ roleRightDTO.setId(ObjectUtility.getNewObjectID36());//涓婚敭
+ roleRightDTO.setFuncId(funcId);
+ if(isDeveloper) {
+ roleRightDTO.setRightType((short) 1);//鏉冮檺绫诲瀷 鏉冮檺绫诲瀷锛岃秴绾х鐞嗗憳缁欑鐞嗗憳鎺堟潈涓�1锛岀鐞嗗憳缁欐櫘閫氱敤鎴锋巿鏉冧负2
+ }else{
+ roleRightDTO.setRightType((short) 2);
+ }
+ roleRightDTO.setRightValue(1);// 鏉冮檺鍊硷紝娌℃湁鎿嶄綔鐨勬ā鍧楁潈闄愬�煎瓨鍌ㄤ负0
+ roleRightDTO.setRoleId(roleOid);//瑙掕壊ID
+ roleRightDTO.setCreateUser(currentUserName);//鍒涘缓鑰�
+ roleRightDTO.setCreateTime(VciDateUtil.date2Str(new Date(),""));//鍒涘缓鏃堕棿
+ roleRightDTO.setModifyUser(currentUserName);//淇敼鑰�
+ roleRightDTO.setModifyTime(VciDateUtil.date2Str(new Date(),""));//淇敼鏃堕棿
+ roleRightDTO.setLicensor("");
+ if(!roleRightDTOMap.containsKey(funcId)){
+ roleRightDTOMap.put(funcId, roleRightDTO);
+ }
+ roleRightDTOMap.put(funcId, roleRightDTO);
+ }
+ }
- }
- });
+ }
-
-
+ }
+ });
+ /* allRoleRightDTOMap.putAll(roleRightDTOMap.entrySet().stream()
+ .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry:: getValue)));*/
+ List<RoleRightDTO> newRoleRightDTOList=Optional.ofNullable(roleRightDTOMap).orElseGet(()->new HashMap<String,RoleRightDTO>()).values().stream().collect(Collectors.toList());
+ roleRightDTOList.addAll(newRoleRightDTOList);
+ }
}
/**
@@ -1265,28 +1837,28 @@
SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
String currentUserName = sessionInfo.getUserId();
boolean isDeveloper= rightControlUtil.isDeveloper(currentUserName);
- String parentOid=node.getParentId();
- if(allTreeMap.containsKey(parentOid)){
- String id=ObjectUtility.getNewObjectID36();
- Tree parentNode =allTreeMap.get(parentOid);
- Object parentData= parentNode.getData();
- if(isUp) {//鍚戜笂鑾峰彇锛屽瓨鍌ㄦ瘡涓笂绾фā鍧楃殑鏉冮檺鍊�
- while (!"root".equals(parentNode.getData())){
+ String id=ObjectUtility.getNewObjectID36();
+ Object data=node.getData();
+ if(isUp) {//鍚戜笂鑾峰彇锛屽瓨鍌ㄦ瘡涓笂绾фā鍧楃殑鏉冮檺鍊�
+ while (!"root".equals(node.getData())){
+ data=node.getData();
+ String oid=node.getOid();
+ if(allTreeMap.containsKey(oid)){
String funcId = "";
- if (parentData instanceof BizType) {
- BizType bizType = (BizType) parentData;
+ if (data instanceof BizType) {
+ BizType bizType = (BizType) data;
funcId = bizType.name;
- } else if (parentData instanceof PLUILayout) {
- PLUILayout context = (PLUILayout)parentData;
+ } else if (data instanceof PLUILayout) {
+ PLUILayout context = (PLUILayout)data;
funcId = context.plOId;
- } else if (parentData instanceof PLTabPage) {
- PLTabPage tab = (PLTabPage) parentData;
+ } else if (data instanceof PLTabPage) {
+ PLTabPage tab = (PLTabPage) data;
funcId = tab.plOId;
- } else if (parentData instanceof PLPageDefination){
- PLPageDefination pageDef = (PLPageDefination) parentData;
+ } else if (data instanceof PLPageDefination){
+ PLPageDefination pageDef = (PLPageDefination) data;
funcId = pageDef.plOId;
- } else if (parentData instanceof PLTabButton) {
- PLTabButton but = (PLTabButton)parentData;
+ } else if (data instanceof PLTabButton) {
+ PLTabButton but = (PLTabButton)data;
funcId = but.plOId;
}
RoleRightDTO roleRightDTO = new RoleRightDTO();
@@ -1300,74 +1872,77 @@
roleRightDTO.setRightValue(1);// 鏉冮檺鍊硷紝娌℃湁鎿嶄綔鐨勬ā鍧楁潈闄愬�煎瓨鍌ㄤ负0
roleRightDTO.setRoleId(roleId);//瑙掕壊ID
roleRightDTO.setCreateUser(currentUserName);//鍒涘缓鑰�
- roleRightDTO.setCreateTime(new Date());//鍒涘缓鏃堕棿
+ roleRightDTO.setCreateTime(VciDateUtil.date2Str(new Date(),""));//鍒涘缓鏃堕棿
roleRightDTO.setModifyUser(currentUserName);//淇敼鑰�
- roleRightDTO.setModifyTime(new Date());//淇敼鏃堕棿
+ roleRightDTO.setModifyTime(VciDateUtil.date2Str(new Date(),""));//淇敼鏃堕棿
roleRightDTO.setLicensor("");
if(!rightMap.containsKey(funcId)){
rightMap.put(funcId, roleRightDTO);
}
- }
- }else{
- String funcId = "";
- if(parentData instanceof String){
- funcId = (String)parentData;
- } else if (parentData instanceof BizType) {
- BizType bizType = (BizType)parentData;
- funcId = bizType.name;
- } else if (parentData instanceof PLUILayout) {
- PLUILayout context = (PLUILayout)parentData;
- funcId = context.plOId;
- } else if (parentData instanceof PLTabPage) {
- PLTabPage tab = (PLTabPage) parentData;
- funcId = tab.plOId;
- } else if (parentData instanceof PLPageDefination){
- PLPageDefination pageDef = (PLPageDefination) parentData;
- funcId = pageDef.plOId;
- } else if (parentData instanceof PLTabButton) {
- PLTabButton but = (PLTabButton)parentData;
- funcId = but.plOId;
- }
- if(!(parentData instanceof PLPageDefination)) {//瀛愯妭鐐逛笉鏄搷浣�
- if(!rightMap.containsKey(funcId)&&!funcId.equals("root")){
- RoleRightDTO roleRightDTO = new RoleRightDTO();
- roleRightDTO.setFuncId(funcId);
- if(isDeveloper) {
- roleRightDTO.setRightType((short) 1);//鏉冮檺绫诲瀷 鏉冮檺绫诲瀷锛岃秴绾х鐞嗗憳缁欑鐞嗗憳鎺堟潈涓�1锛岀鐞嗗憳缁欐櫘閫氱敤鎴锋巿鏉冧负2
- }else{
- roleRightDTO.setRightType((short) 2);
- }
- roleRightDTO.setRightValue(0);//娌℃湁鎿嶄綔鐨勬ā鍧楁潈闄愬�煎瓨鍌ㄤ负0
- roleRightDTO.setRoleId(roleId);
- roleRightDTO.setCreateUser(currentUserName);
- roleRightDTO.setCreateTime(new Date());
- roleRightDTO.setModifyUser(currentUserName);
- roleRightDTO.setModifyTime(new Date());
- roleRightDTO.setLicensor("");
- rightMap.put(funcId, roleRightDTO);
- }
- for(int i = 0;i < parentNode.getChildren().size();i++){
- //瀵规瘡涓瓙鍚戜笅閫掑綊閬嶅巻
- getRightValue(roleId,parentNode.getChildren().get(i),allTreeMap,false,rightMap);
- }
- }else {
- if(!rightMap.containsKey(funcId)){
- RoleRightDTO roleRightDTO = new RoleRightDTO();
- roleRightDTO.setFuncId(funcId);
- roleRightDTO.setRightType((short)2); // 璁剧疆UI鏉冮檺
- roleRightDTO.setRightValue(countRightValue(parentNode,true));//娌℃湁鎿嶄綔鐨勬ā鍧楁潈闄愬�煎瓨鍌ㄤ负0
- roleRightDTO.setRoleId(roleId);
-
- roleRightDTO.setCreateUser(currentUserName);
- roleRightDTO.setCreateTime(new Date());
- roleRightDTO.setModifyUser(currentUserName);
- roleRightDTO.setModifyTime(new Date());
- roleRightDTO.setLicensor("");
- rightMap.put(funcId, roleRightDTO);
+ oid= node.getParentId();
+ if(allTreeMap.containsKey(oid)) {
+ node=allTreeMap.get(oid);
}
}
}
+ }else {
+ String funcId = "";
+ if (data instanceof String) {
+ funcId = (String) data;
+ } else if (data instanceof BizType) {
+ BizType bizType = (BizType) data;
+ funcId = bizType.name;
+ } else if (data instanceof PLUILayout) {
+ PLUILayout context = (PLUILayout) data;
+ funcId = context.plOId;
+ } else if (data instanceof PLTabPage) {
+ PLTabPage tab = (PLTabPage) data;
+ funcId = tab.plOId;
+ } else if (data instanceof PLPageDefination) {
+ PLPageDefination pageDef = (PLPageDefination) data;
+ funcId = pageDef.plOId;
+ } else if (data instanceof PLTabButton) {
+ PLTabButton but = (PLTabButton) data;
+ funcId = but.plOId;
+ }
+ if (!(data instanceof PLPageDefination)) {//瀛愯妭鐐逛笉鏄搷浣�
+ if (!rightMap.containsKey(funcId) && !funcId.equals("root")) {
+ RoleRightDTO roleRightDTO = new RoleRightDTO();
+ roleRightDTO.setFuncId(funcId);
+ if (isDeveloper) {
+ roleRightDTO.setRightType((short) 1);//鏉冮檺绫诲瀷 鏉冮檺绫诲瀷锛岃秴绾х鐞嗗憳缁欑鐞嗗憳鎺堟潈涓�1锛岀鐞嗗憳缁欐櫘閫氱敤鎴锋巿鏉冧负2
+ } else {
+ roleRightDTO.setRightType((short) 2);
+ }
+ roleRightDTO.setRightValue(0);//娌℃湁鎿嶄綔鐨勬ā鍧楁潈闄愬�煎瓨鍌ㄤ负0
+ roleRightDTO.setRoleId(roleId);
+ roleRightDTO.setCreateUser(currentUserName);
+ roleRightDTO.setCreateTime(VciDateUtil.date2Str(new Date(),""));
+ roleRightDTO.setModifyUser(currentUserName);
+ roleRightDTO.setModifyTime(VciDateUtil.date2Str(new Date(),""));
+ roleRightDTO.setLicensor("");
+ rightMap.put(funcId, roleRightDTO);
+ }
+ for (int i = 0; i < node.getChildren().size(); i++) {
+ //瀵规瘡涓瓙鍚戜笅閫掑綊閬嶅巻
+ getRightValue(roleId, node.getChildren().get(i), allTreeMap, false, rightMap);
+ }
+ } else {
+ if (!rightMap.containsKey(funcId)) {
+ RoleRightDTO roleRightDTO = new RoleRightDTO();
+ roleRightDTO.setFuncId(funcId);
+ roleRightDTO.setRightType((short) 2); // 璁剧疆UI鏉冮檺
+ roleRightDTO.setRightValue(countRightValue(node, true));//娌℃湁鎿嶄綔鐨勬ā鍧楁潈闄愬�煎瓨鍌ㄤ负0
+ roleRightDTO.setRoleId(roleId);
+ roleRightDTO.setCreateUser(currentUserName);
+ roleRightDTO.setCreateTime(VciDateUtil.date2Str(new Date(),""));
+ roleRightDTO.setModifyUser(currentUserName);
+ roleRightDTO.setModifyTime(VciDateUtil.date2Str(new Date(),""));
+ roleRightDTO.setLicensor("");
+ rightMap.put(funcId, roleRightDTO);
+ }
+ }
}
}
@@ -1404,6 +1979,13 @@
});
}
+ /***
+ * 閬嶅巻瀛愯妭鐐�
+ * @param parentTree
+ * @param contextList
+ * @param roleRightVOMap
+ * @param isShowCheckBox
+ */
private void setChildNode(List<Tree> parentTree, List<PLUILayout>contextList,Map<String,RoleRightVO> roleRightVOMap,boolean isShowCheckBox){
Optional.ofNullable(parentTree).orElseGet(()->new ArrayList<Tree>()).stream().forEach(pTree -> {
Object funcObj= pTree.getData();
@@ -1523,6 +2105,22 @@
/**
* UI瑙掕壊瀵硅薄杞崲
+ * @param vos
+ * @return
+ */
+ private List<RoleRightDTO> roleRightVOO2DTOS(List<RoleRightVO> vos){
+ List<RoleRightDTO> roleRightVOS=new ArrayList<>();
+ Optional.ofNullable(vos).orElseGet(()->new ArrayList<>()).stream().forEach(vo -> {
+ RoleRightDTO dto=roleRightVOO2DTO(vo);
+ roleRightVOS.add(dto);
+ });
+
+ return roleRightVOS;
+ }
+
+
+ /**
+ * UI瑙掕壊瀵硅薄杞崲
* @param infos
* @return
*/
@@ -1534,6 +2132,26 @@
});
return roleRightVOS;
+ }
+
+ /**
+ * UI瑙掕壊瀵硅薄杞崲
+ * @param dtos
+ * @return
+ */
+ private List<RoleRightInfo> roleRightDTOO2InfoS(List<RoleRightDTO> dtos){
+ List<RoleRightInfo> roleRightInfoList=new ArrayList<>();
+ Optional.ofNullable(dtos).orElseGet(()->new ArrayList<>()).stream().forEach(dto -> {
+ RoleRightInfo info= null;
+ try {
+ info = roleRightDTOO2Info(dto);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ roleRightInfoList.add(info);
+ });
+
+ return roleRightInfoList;
}
/**
@@ -1554,6 +2172,46 @@
vo.setModifyTime(VciDateUtil.date2Str(VciDateUtil.long2Date(info.modifyTime),""));
vo.setModifyUser(info.modifyUser);
return vo;
+ }
+
+ /**
+ * UI瑙掕壊瀵硅薄杞崲
+ * @param vo
+ * @return
+ */
+ private RoleRightDTO roleRightVOO2DTO(RoleRightVO vo){
+ RoleRightDTO dto=new RoleRightDTO();
+ dto.setId(vo.getId());
+ dto.setCreateTime(vo.getCreateTime());
+ dto.setCreateUser(vo.getCreateUser());
+ dto.setRoleId(vo.getRoleId());
+ dto.setRightType(vo.getRightType());
+ dto.setLicensor(vo.getLicensor());
+ dto.setRightValue(vo.getRightValue());
+ dto.setFuncId(vo.getFuncId());
+ dto.setModifyTime(vo.getModifyTime());
+ dto.setModifyUser(vo.getModifyUser());
+ return dto;
+ }
+
+ /**
+ * UI瑙掕壊瀵硅薄杞崲
+ * @param dto
+ * @return
+ */
+ private RoleRightInfo roleRightDTOO2Info(RoleRightDTO dto) throws Exception {
+ RoleRightInfo info=new RoleRightInfo();
+ info.id=StringUtils.isBlank(dto.getId())?"":dto.getId();
+ info.createTime=StringUtils.isBlank(dto.getCreateTime())?new Date().getTime():VciDateUtil.getTime(VciDateUtil.str2Date(dto.getCreateTime(),""));
+ info.createUser=StringUtils.isBlank(dto.getCreateUser())?"":dto.getCreateUser();
+ info.roleId=StringUtils.isBlank(dto.getRoleId())?"":dto.getRoleId();
+ info.rightType=dto.getRightType();
+ info.licensor =StringUtils.isBlank(dto.getLicensor())?"":dto.getLicensor();
+ info.rightValue=dto.getRightValue();
+ info.funcId=StringUtils.isBlank(dto.getFuncId())?"":dto.getFuncId();
+ info.modifyTime=StringUtils.isBlank(dto.getModifyTime())? new Date().getTime() :VciDateUtil.getTime(VciDateUtil.str2Date(dto.getModifyTime(),""));
+ info.modifyUser=StringUtils.isBlank(dto.getModifyUser())?"":dto.getModifyUser();
+ return info;
}
/**
@@ -1694,13 +2352,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 +2373,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 +2429,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 +2472,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 +2493,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 +2551,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 +2699,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 +2720,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 +2804,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 +2818,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 +2900,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 +2995,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