From 34c25ddf37a3eb8da9efb04efedad089f13efe83 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 24 七月 2024 18:20:27 +0800
Subject: [PATCH] 部门导入调整，按照部门名称/实现层级关系。枚举导入功能接口上传，属性池添加新增、查询、修改、导出、查看应用范围等接口。业务类型、链接类型、枚举类型增加等接口属性是否产生数据检查、根据属性名修改业务类型和连接类型中对应属性方法，以及属性池中需要的一些下拉查询接口。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java | 61 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 18 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 05f3a5c..e81815d 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
@@ -2,17 +2,14 @@
import com.alibaba.fastjson.JSON;
import com.vci.corba.common.PLException;
-import com.vci.corba.common.data.UserEntityInfo;
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.dto.SmUserDTO;
import com.vci.omd.utils.ObjectTool;
import com.vci.pagemodel.*;
import com.vci.po.OsEnumPO;
-import com.vci.po.SmUserPO;
import com.vci.starter.poi.bo.ReadExcelOption;
import com.vci.starter.poi.bo.WriteExcelData;
import com.vci.starter.poi.bo.WriteExcelOption;
@@ -253,18 +250,18 @@
if(Func.isBlank(enumName)){
throw new PLException("500",new String[]{"璇烽�夋嫨瑕佹煡璇㈠簲鐢ㄨ寖鍥寸殑鏋氫妇!"});
}
- String[] attrubyteNames = platformClientUtil.getAttributeService().getAttrubyteNamesByEMName(enumName);
- if(Func.isEmpty(attrubyteNames)){
+ String[] attrubuteNames = platformClientUtil.getAttributeService().getAttrubyteNamesByEMName(enumName);
+ if(Func.isEmpty(attrubuteNames)){
return new ArrayList<>();
}
- List<Map<String,String>> attrubyteMapList = new ArrayList<>();
- Arrays.stream(attrubyteNames).forEach(attrName->{
+ List<Map<String,String>> attrubuteMapList = new ArrayList<>();
+ Arrays.stream(attrubuteNames).forEach(attrName->{
Map<String, String> itemMap = new HashMap<>();
itemMap.put("enumName",enumName);
itemMap.put("source",attrName);
- attrubyteMapList.add(itemMap);
+ attrubuteMapList.add(itemMap);
});
- return attrubyteMapList;
+ return attrubuteMapList;
}
/**
@@ -362,12 +359,12 @@
String name = osEnumDTO.getName();
Date ts = osEnumDTO.getTs();
if(Func.isBlank(oid) || Func.isBlank(name) || Func.isEmpty(ts)){
- throw new PLException("500",new String[]{"寰呭垹闄ょ殑鏋氫妇鍒楄〃涓富閿�恛id銆戝拰璋冩暣鏃堕棿銆恡s銆戜笉鑳戒负绌猴紒"});
+ throw new PLException("500",new String[]{"寰呭垹闄ょ殑鏋氫妇鍒楄〃涓富閿�恛id銆戙�佽皟鏁存椂闂淬�恡s銆戙�佸睘鎬у悕銆恘ame銆戜笉鑳戒负绌猴紒"});
}
//鍒ゆ柇鏋氫妇鏄惁鏈夎寮曠敤
List<Map<String, String>> usedEnumList = this.getUsedEnumList(name);
if(Func.isNotEmpty(usedEnumList)){
- throw new PLException("500",new String[]{"鍒犻櫎鐨勬灇涓句腑銆�" + name + "銆�,宸茶寮曠敤锛�"});
+ throw new PLException("500",new String[]{"鍒犻櫎鐨勬灇涓句腑锛屾灇涓惧悕绉颁负锛氥��" + name + "銆�,宸茶寮曠敤锛�"});
}
EnumType enumType = new EnumType();
enumType.oid = oid;
@@ -617,12 +614,6 @@
return BaseResult.success("鏋氫妇瀵煎叆鎴愬姛锛�");
}
- /* private OsEnumVO getTestJson(int i){
- String testJosn = "[{\"createTime\":\"2024-07-17 17:06:30.170\",\"creator\":\"developer\",\"enumValueDataType\":\"String\",\"enumValueDataTypeText\":\"瀛楃涓瞈",\"id\":\"test\",\"items\":[{\"description\":\"\",\"name\":\"1\",\"value\":\"11\"},{\"description\":\"\",\"name\":\"1\",\"value\":\"11\"}],\"lastModifier\":\"developer\",\"lastModifyTime\":\"2024-07-17 17:06:30.170\",\"length\":2,\"name\":\"test1\",\"oid\":\"4F9B4094-A4F5-E3CD-AC7C-1F33AA65F1E7\",\"ts\":\"2024-07-18 09:40:52.512\"},{\"createTime\":\"2024-07-17 09:49:31.592\",\"creator\":\"developer\",\"description\":null,\"enumValueDataType\":\"String\",\"enumValueDataTypeText\":\"瀛楃涓瞈",\"id\":\"testString\",\"items\":[{\"description\":\"11\",\"name\":\"11\",\"value\":\"11\"},{\"description\":\"\",\"name\":\"test1\",\"value\":\"1\"},,{\"description\":\"\",\"name\":\"test1\",\"value\":\"1\"}],\"lastModifier\":\"developer\",\"lastModifyTime\":\"2024-07-17 09:49:31.592\",\"length\":6,\"name\":\"testString\",\"oid\":\"AB3A7718-55C6-555E-A1FD-934763ACA3F2\",\"ts\":\"2024-07-17 16:47:33.038\"}]";
- List<OsEnumVO> OsEnumVOs = JSON.parseArray(testJosn,OsEnumVO.class);
- return OsEnumVOs.get(i);
- }*/
-
/**
* 鑾峰彇瀵煎叆妯℃澘鐨勭ず渚嬫暟鎹�
* @return
@@ -671,7 +662,8 @@
private EnumType osEnumDTO2EnumType(OsEnumDTO osEnumDTO){
EnumType enumType = new EnumType();
enumType.oid = osEnumDTO.getOid();
- enumType.name = osEnumDTO.getId();
+ //鏋氫妇鍚嶇粺涓�杞垚灏忓啓锛岄伩鍏嶅悗鏈熷嚭鐜板叾浠栭棶棰�
+ enumType.name = osEnumDTO.getId().toLowerCase(Locale.ROOT);
enumType.label = osEnumDTO.getName();
enumType.length = osEnumDTO.getLength();
enumType.creator = osEnumDTO.getCreator();
@@ -937,6 +929,39 @@
}
/**
+ * 鏍规嵁鏋氫妇绫诲瀷鏌ヨ鏋氫妇锛氭灇涓惧悕 , 鏋氫妇
+ * @param enumType锛歋tring, Integer
+ * @return
+ */
+ public List<Map<String,List<String>>> getEnumMapByType(String enumType){
+ List<Map<String,List<String>>> enumMapList = new ArrayList<>();
+ EnumType[] emArray = null;
+ try {
+ emArray = platformClientUtil.getEnumService().getEnumTypesByType(enumType);
+ } catch (PLException e) {
+ e.printStackTrace();
+ }
+ if(emArray == null || emArray.length == 0){
+ return null;
+ }
+ EnumType emItem;
+ for(int i = 0; i < emArray.length; i++){
+ emItem = emArray[i];
+ EnumItem[] emChildren = emItem.items;
+ ArrayList<String> valueList = new ArrayList<String>();
+ for(int k = 0; k < emChildren.length; k++){
+ EnumItem emChild = emChildren[k];
+ String value = emChild.value;
+ valueList.add(value);
+ }
+ Map<String, List<String>> enumMap = new HashMap<>();
+ enumMap.put(emItem.name, valueList);
+ enumMapList.add(enumMap);
+ }
+ return enumMapList;
+ }
+
+ /**
* 娓呴櫎缂撳瓨
*/
@Override
--
Gitblit v1.9.3