From ac3f3629a261770f573f27e5e23f7ec19d096c2a Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期三, 04 九月 2024 18:29:05 +0800
Subject: [PATCH] UI授权功能查询

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java |  122 +++++++++++++++++++++++++++-------------
 1 files changed, 83 insertions(+), 39 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
index e81815d..00c2d6b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
@@ -1,12 +1,15 @@
 package com.vci.web.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.vci.client.common.providers.ClientServiceProvider;
 import com.vci.corba.common.PLException;
+import com.vci.corba.omd.atm.AttributeDef;
 import com.vci.corba.omd.data.BusinessObject;
 import com.vci.corba.omd.etm.EnumItem;
 import com.vci.corba.omd.etm.EnumType;
 import com.vci.dto.OsEnumDTO;
 import com.vci.dto.OsEnumItemDTO;
+import com.vci.omd.objects.OtherInfo;
 import com.vci.omd.utils.ObjectTool;
 import com.vci.pagemodel.*;
 import com.vci.po.OsEnumPO;
@@ -86,7 +89,7 @@
 	/**
 	 * 蹇呭~鍒�
 	 */
-	private ArrayList<Integer> ColumnNameisRed = new ArrayList<Integer>();
+	private List<Integer> ColumnNameisRed = new ArrayList<Integer>();
 
 	/**
 	 * 鏃ュ織
@@ -385,14 +388,14 @@
 	 * @return
 	 */
 	@Override
-	public String exportEnumTypes(String exportFileName,String enumNames) throws PLException {
+	public String exportEnumTypes(String exportFileName,String enumNames,boolean flag/*鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷�*/) throws PLException {
 		if(Func.isBlank(enumNames)){
 			throw new PLException("500",new String[]{"璇峰嬀閫夎瀵煎嚭鐨勬灇涓�!"});
 		}
 		//鐣岄潰娌′紶鍚嶇О锛屼娇鐢ㄩ粯璁ゅ鍑哄悕绉�
 		exportFileName = Func.isBlank(exportFileName) ?  "鏋氫妇绫诲瀷瀵煎嚭_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss"):exportFileName;
 		//璁剧疆鍒楀悕
-		List<String> columns = new ArrayList<>(Arrays.asList("鏋氫妇鍚嶇О", "鏍囩", "杩斿洖绫诲瀷", "闀垮害", "鏋氫妇椤瑰悕绉�", "鏋氫妇鍊�", "鎻忚堪"));
+		List<String> columns = this.getCloumns(flag);
 
 		//鍐檈xcel
 		String excelPath = LocalFileUtil.getDefaultTempFolder() + File.separator + exportFileName +  ".xls";
@@ -418,39 +421,54 @@
 			if(Func.isEmpty(osEnumVO) && Func.isBlank(osEnumVO.getOid())){
 				throw new PLException("500",new String[]{"鏈煡璇㈠埌鏋氫妇鍚嶄负銆�" + enumNameList.get(i) + "銆戠殑鏋氫妇锛岃鍒锋柊鍚庨噸鏂板鍑�!"});
 			}
-			//鏋氫妇椤逛笉涓虹┖鏃堕渶瑕佽�冭檻鍚堝苟琛岄棶棰�
+			//鎸夌収瀵煎嚭鍒楀悕鎺у埗鍙橀噺鍜屾灇涓鹃」涓嶄负绌烘椂鍐冲畾鏄惁闇�瑕佽�冭檻鍚堝苟琛岄棶棰�
 			List<OsEnumItemVO> enumVOItems = osEnumVO.getItems();
-			//鏋氫妇椤逛笉涓虹┖鏃堕渶瑕佽繘琛屽悎骞惰澶勭悊
-			if(Func.isNotEmpty(enumVOItems) || enumVOItems.size() > 1){
-				//excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,0, osEnumVO.getOid()));
-				excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,0, osEnumVO.getId()));
-				excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,1, osEnumVO.getName()));
-				excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,2, osEnumVO.getEnumValueDataType()+"("+osEnumVO.getEnumValueDataTypeText()+")"));
-				excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,3, osEnumVO.getLength()));
-				//excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,5, osEnumVO.getCreator()));
-				excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,4, Func.format(osEnumVO.getCreateTime(),"yyyy骞碝M鏈坉d鏃� hh:mm:ss")));
-
-				//澶勭悊鏋氫妇椤瑰啓鍏�
+			//鍒ゆ柇鏄寜鐓т粈涔堝垪鍚嶅鍑�
+			if(flag){
 				for (int j = 0; j < enumVOItems.size(); j++) {
 					OsEnumItemVO osEnumItemVO = enumVOItems.get(j);
-					excelDataList.add(new WriteExcelData(startRow+j,7, true,osEnumItemVO.getName()));
-					excelDataList.add(new WriteExcelData(startRow+j,8, true, osEnumItemVO.getValue()));
-					excelDataList.add(new WriteExcelData(startRow+j,9, true, osEnumItemVO.getDescription()));
-				}
+					excelDataList.add(new WriteExcelData(i+j+1,0, osEnumVO.getId()));
+					excelDataList.add(new WriteExcelData(i+j+1,1, osEnumVO.getName()));
+					excelDataList.add(new WriteExcelData(i+j+1,2, osEnumVO.getEnumValueDataType()));
+					excelDataList.add(new WriteExcelData(i+j+1,3, osEnumVO.getLength()));
 
-				startRow += enumVOItems.size();
+					excelDataList.add(new WriteExcelData(i+j+1,4,osEnumItemVO.getName()));
+					excelDataList.add(new WriteExcelData(i+j+1,5, osEnumItemVO.getValue()));
+					excelDataList.add(new WriteExcelData(i+j+1,6, osEnumItemVO.getDescription()));
+				}
 			}else{
-				//鏋氫妇椤逛负绌烘椂灏变笉闇�瑕佸悎骞惰
-				//excelDataList.add(new WriteExcelData(startRow,0, true,osEnumVO.getOid()));
-				excelDataList.add(new WriteExcelData(startRow,0, true, osEnumVO.getId()));
-				excelDataList.add(new WriteExcelData(startRow,1, true, osEnumVO.getName()));
-				excelDataList.add(new WriteExcelData(startRow,1, true, osEnumVO.getEnumValueDataType()+"("+osEnumVO.getEnumValueDataTypeText()+")"));
-				excelDataList.add(new WriteExcelData(startRow,3, true, osEnumVO.getLength()));
-				//excelDataList.add(new WriteExcelData(startRow,5, true, osEnumVO.getCreator()));
-				excelDataList.add(new WriteExcelData(startRow,4, true, Func.format(osEnumVO.getCreateTime(),"yyyy骞碝M鏈坉d鏃� hh:mm:ss")));
+				//鏋氫妇椤逛笉涓虹┖鏃堕渶瑕佽繘琛屽悎骞惰澶勭悊
+				if(Func.isNotEmpty(enumVOItems) || enumVOItems.size() > 1){
+					//excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,0, osEnumVO.getOid()));
+					excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,0, osEnumVO.getId()));
+					excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,1, osEnumVO.getName()));
+					excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,2, osEnumVO.getEnumValueDataType()+"("+osEnumVO.getEnumValueDataTypeText()+")"));
+					excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,3, osEnumVO.getLength()));
+					//excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,5, osEnumVO.getCreator()));
+					excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,4, Func.format(osEnumVO.getCreateTime(),"yyyy骞碝M鏈坉d鏃� hh:mm:ss")));
+
+					//澶勭悊鏋氫妇椤瑰啓鍏�
+					for (int j = 0; j < enumVOItems.size(); j++) {
+						OsEnumItemVO osEnumItemVO = enumVOItems.get(j);
+						excelDataList.add(new WriteExcelData(startRow+j,5, true,osEnumItemVO.getName()));
+						excelDataList.add(new WriteExcelData(startRow+j,6, true, osEnumItemVO.getValue()));
+						excelDataList.add(new WriteExcelData(startRow+j,7, true, osEnumItemVO.getDescription()));
+					}
+
+					startRow += enumVOItems.size();
+				}else{
+					//鏋氫妇椤逛负绌烘椂灏变笉闇�瑕佸悎骞惰
+					//excelDataList.add(new WriteExcelData(startRow,0, true,osEnumVO.getOid()));
+					excelDataList.add(new WriteExcelData(startRow,0, true, osEnumVO.getId()));
+					excelDataList.add(new WriteExcelData(startRow,1, true, osEnumVO.getName()));
+					excelDataList.add(new WriteExcelData(startRow,1, true, osEnumVO.getEnumValueDataType()+"("+osEnumVO.getEnumValueDataTypeText()+")"));
+					excelDataList.add(new WriteExcelData(startRow,3, true, osEnumVO.getLength()));
+					//excelDataList.add(new WriteExcelData(startRow,5, true, osEnumVO.getCreator()));
+					excelDataList.add(new WriteExcelData(startRow,4, true, Func.format(osEnumVO.getCreateTime(),"yyyy骞碝M鏈坉d鏃� hh:mm:ss")));
+				}
+				//璁板綍涓嬩笂涓�缁勬暟鎹粨鏉熸椂鐨勮鍙凤紝鏂逛究鐢ㄥ仛鍚堝苟琛岀殑璧峰琛�
+				startRow += 1;
 			}
-			//璁板綍涓嬩笂涓�缁勬暟鎹粨鏉熸椂鐨勮鍙凤紝鏂逛究鐢ㄥ仛鍚堝苟琛岀殑璧峰琛�
-			startRow += 1;
 		}
 		WriteExcelOption excelOption = new WriteExcelOption(excelDataList);
 		ExcelUtil.writeDataToFile(excelPath, excelOption);
@@ -467,7 +485,7 @@
 		//鐣岄潰娌′紶鍚嶇О锛屼娇鐢ㄩ粯璁ゅ鍑哄悕绉�
 		exportFileName = Func.isBlank(exportFileName) ?  "鏋氫妇瀵煎叆妯℃澘_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss"):exportFileName;
 		//璁剧疆鍒楀悕
-		List<String> columns = new ArrayList<>(Arrays.asList("鏋氫妇鍚嶇О", "鏍囩", "杩斿洖绫诲瀷", "闀垮害", "鏋氫妇椤瑰悕绉�(褰撳墠鏋氫妇涓嬫湁鏋氫妇椤规椂蹇呭~)", "鏋氫妇鍊�(褰撳墠鏋氫妇涓嬫湁鏋氫妇椤规椂蹇呭~)", "鎻忚堪","*娉ㄦ剰*:绗簩琛屽紑濮嬬殑鏁版嵁涓虹ず渚嬫暟鎹紝瀵煎叆鍓嶈灏嗗叾鍒犻櫎锛屽綋瀵煎叆鐨勬灇涓句笅鍏峰澶氫釜鏋氫妇椤规椂锛屽簲鎸夌収绀轰緥enum2鐨勫啓娉�"));
+		List<String> columns = this.getCloumns(true);
 		//鍐檈xcel
 		String excelPath = LocalFileUtil.getDefaultTempFolder() + File.separator + exportFileName +  ".xls";
 		//璁剧疆蹇呭~鍒�
@@ -514,6 +532,27 @@
 		WriteExcelOption excelOption = new WriteExcelOption(excelDataList);
 		ExcelUtil.writeDataToFile(excelPath, excelOption);
 		return excelPath;
+	}
+
+	/**
+	 * 鑾峰彇瀵煎嚭鎴栧鍏ユā鏉跨殑鍒楀悕
+	 * @param flag 鏄惁鑾峰彇瀵煎叆妯℃澘鍒楀悕
+	 * @return
+	 */
+	private List<String> getCloumns(boolean flag){
+		if(flag){
+			return new ArrayList<>(
+				Arrays.asList("鏋氫妇鍚嶇О", "鏍囩", "杩斿洖绫诲瀷", "闀垮害", "鏋氫妇椤瑰悕绉�(褰撳墠鏋氫妇涓嬫湁鏋氫妇椤规椂蹇呭~)",
+						"鏋氫妇鍊�(褰撳墠鏋氫妇涓嬫湁鏋氫妇椤规椂蹇呭~)", "鎻忚堪","*娉ㄦ剰*:绗簩琛屽紑濮嬬殑鏁版嵁涓虹ず渚嬫暟鎹紝瀵煎叆鍓嶈灏嗗叾鍒犻櫎锛�" +
+								"褰撳鍏ョ殑鏋氫妇涓嬪叿澶囧涓灇涓鹃」鏃讹紝搴旀寜鐓хず渚媏numb鐨勫啓娉�"
+				)
+			);
+		}
+		return new ArrayList<>(
+			Arrays.asList("鏋氫妇鍚嶇О", "鏍囩", "杩斿洖绫诲瀷", "闀垮害",
+				"鍒涘缓鏃堕棿", "鏋氫妇椤瑰悕绉�", "鏋氫妇鍊�", "鎻忚堪"
+			)
+		);
 	}
 
 	/**
@@ -567,9 +606,9 @@
 			if(Func.isNotEmpty(osEnumVOList)){
 				repeatEnumId = osEnumVOList.stream().map(OsEnumVO::getId).collect(Collectors.toList());
 			}
-			//褰撳墠excel涓槸鍚﹂噸澶嶇敤鐨勫垽閲峂ap:锛坘ey锛氳处鍙凤紝value锛氳鍙凤級
+			//褰撳墠excel涓槸鍚﹂噸澶嶇敤鐨勫垽閲峂ap:锛坘ey锛氬垽閲嶅睘鎬э紝value锛氳鍙凤級
 			Map<String, String> excelReapeat = new HashMap<>();
-			//鍒ゆ柇蹇呭~灞炴�ф槸鍚︿负绌猴紝鐢ㄦ埛鏄惁宸插瓨鍦紝浠ュ強閮ㄩ棬鏄惁濉敊绛夋牎楠岄�昏緫
+			//鍒ゆ柇蹇呭~灞炴�ф槸鍚︿负绌虹瓑绛�
 			List<String> finalRepeatEnumId = repeatEnumId;
 			newPOList.stream().forEach(osEnumPO -> {
 				if(Func.isBlank(osEnumPO.getId())){//鏋氫妇鍚�
@@ -582,10 +621,10 @@
 					throw new VciBaseException("绗��"+osEnumPO.getRowIndex()+"銆戣鏁版嵁锛屾灇涓惧悕绉板彧鑳戒负鑻辨枃瀛楁瘝");
 				}else if(excelReapeat.containsKey(osEnumPO.getId())){//鏋氫妇鍚嶈〃鏍间腑鍒ら噸
 					throw new VciBaseException("绗��"+excelReapeat.get(osEnumPO.getId())+"銆戣鍜岀銆�"+osEnumPO.getRowIndex()+"銆戣鏁版嵁锛屾灇涓惧悕閲嶅");
-				}else if (Func.isNotEmpty(osEnumVOList) && finalRepeatEnumId.contains(osEnumPO.getId())){//2銆佸垽鏂灇涓惧悕鏄惁涓庣郴缁熶腑閲嶅
+				}else if (Func.isNotEmpty(finalRepeatEnumId) && finalRepeatEnumId.contains(osEnumPO.getId())){//2銆佸垽鏂灇涓惧悕鏄惁涓庣郴缁熶腑閲嶅
 					throw new VciBaseException("绗��"+osEnumPO.getRowIndex()+"銆戣锛屾灇涓惧悕鍦ㄧ郴缁熶腑宸茬粡瀛樺湪,璇蜂慨鏀�!");
 				}
-				//鍏堝蹇呭~灞炴�у垽绌哄鐞�
+				//鍏堝鏋氫妇鍚峞xcel涓渶瑕佸垽閲嶅鐞�
 				excelReapeat.put(osEnumPO.getId(),osEnumPO.getRowIndex());
 			});
 			//淇濆瓨閫昏緫
@@ -606,7 +645,7 @@
 			}
 		}catch (Exception e){
 			if(logger.isErrorEnabled()){
-				logger.error("璇诲彇excel鍐呭鏃舵垨淇濆瓨鐢ㄦ埛淇℃伅鏃跺嚭鐜颁簡閿欒锛屽叿浣撳師鍥狅細",VciBaseUtil.getExceptionMessage(e));
+				logger.error("璇诲彇excel鍐呭鏃舵垨淇濆瓨鏋氫妇鏃跺嚭鐜颁簡閿欒锛屽叿浣撳師鍥狅細",VciBaseUtil.getExceptionMessage(e));
 			}
 			e.printStackTrace();
 			return BaseResult.fail(VciBaseUtil.getExceptionMessage(e),new String[]{},e);
@@ -619,7 +658,7 @@
 	 * @return
 	 */
 	private List<OsEnumVO> getExportEnumTempExample(){
-		String testJosn = "[{\"enumValueDataType\":\"String\",\"id\":\"enum1\",\"items\":[{\"description\":\"enumitem1.1\",\"name\":\"enumitem1.1\",\"value\":\"1\"},{\"description\":\"enumitem1.2\",\"name\":\"enumitem1.2\",\"value\":\"2\"}],\"length\":2,\"name\":\"enum1\"},{\"enumValueDataType\":\"String\",\"id\":\"enum2\",\"items\":[{\"description\":\"enumitem2.1\",\"name\":\"enumitem2.1\",\"value\":\"1\"},{\"description\":\"enumitem2.2\",\"name\":\"enumitem2.2\",\"value\":\"2\"},{\"description\":\"enumitem2.3\",\"name\":\"enumitem2.3\",\"value\":\"3\"}],\"length\":6,\"name\":\"enum2\"}]";
+		String testJosn = "[{\"enumValueDataType\":\"String\",\"id\":\"enuma\",\"items\":[{\"description\":\"enumitem1.1\",\"name\":\"enumitem1.1\",\"value\":\"1\"},{\"description\":\"enumitem1.2\",\"name\":\"enumitem1.2\",\"value\":\"2\"}],\"length\":2,\"name\":\"enuma\"},{\"enumValueDataType\":\"String\",\"id\":\"enumb\",\"items\":[{\"description\":\"enumitem2.1\",\"name\":\"enumitem2.1\",\"value\":\"1\"},{\"description\":\"enumitem2.2\",\"name\":\"enumitem2.2\",\"value\":\"2\"},{\"description\":\"enumitem2.3\",\"name\":\"enumitem2.3\",\"value\":\"3\"}],\"length\":6,\"name\":\"enumb\"}]";
 		List<OsEnumVO> OsEnumVOs = JSON.parseArray(testJosn,OsEnumVO.class);
 		return OsEnumVOs;
 	}
@@ -661,7 +700,7 @@
 	 */
 	private EnumType osEnumDTO2EnumType(OsEnumDTO osEnumDTO){
 		EnumType enumType = new EnumType();
-		enumType.oid = osEnumDTO.getOid();
+		//enumType.oid = osEnumDTO.getOid();
 		//鏋氫妇鍚嶇粺涓�杞垚灏忓啓锛岄伩鍏嶅悗鏈熷嚭鐜板叾浠栭棶棰�
 		enumType.name = osEnumDTO.getId().toLowerCase(Locale.ROOT);
 		enumType.label = osEnumDTO.getName();
@@ -952,7 +991,12 @@
 			for(int k = 0; k < emChildren.length; k++){
 				EnumItem emChild = emChildren[k];
 				String value = emChild.value;
-				valueList.add(value);
+				String symbol = "";
+				//褰撲负Integer鏃堕渶瑕佸皢鏋氫妇椤瑰�兼嫾鎺ヤ笂=
+				if("Integer".equals(enumType)){
+					symbol = "=";
+				}
+				valueList.add(symbol + value);
 			}
 			Map<String, List<String>> enumMap = new HashMap<>();
 			enumMap.put(emItem.name, valueList);

--
Gitblit v1.9.3