From d5894106a09ea9bc900bad176c177763a1df0568 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期五, 27 十二月 2024 14:29:07 +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/OsEnumServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 00c2d6b..e4c7ff6 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,17 +1,18 @@
package com.vci.web.service.impl;
import com.alibaba.fastjson.JSON;
-import com.vci.client.common.providers.ClientServiceProvider;
+import com.vci.constant.EnumIdConstant;
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.pagemodel.KeyValue;
+import com.vci.pagemodel.OsEnumItemVO;
+import com.vci.pagemodel.OsEnumVO;
+import com.vci.pagemodel.OsStatusVO;
import com.vci.po.OsEnumPO;
import com.vci.starter.poi.bo.ReadExcelOption;
import com.vci.starter.poi.bo.WriteExcelData;
@@ -25,11 +26,11 @@
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.*;
-import com.vci.constant.EnumIdConstant;
+import com.vci.web.other.AllOsEnumVOMapThreadLocal;
import com.vci.web.service.OsEnumServiceI;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.Func;
+import com.vci.starter.web.util.Lcm.Func;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -197,7 +198,10 @@
if(StringUtils.isBlank(enumCode)){
return null;
}
- Map<String, OsEnumVO> enumVOMap = self.selectAllEnumMap();
+ Map<String, OsEnumVO> enumVOMap = AllOsEnumVOMapThreadLocal.get();
+ if(enumVOMap == null){
+ enumVOMap = self.selectAllEnumMap();
+ }
if(MY_DATA_SECRET.equalsIgnoreCase(enumCode)){
//褰撳墠鐢ㄦ埛
OsEnumVO enumVO = enumVOMap.getOrDefault(EnumIdConstant.DATASECRET_ENUMNAME, null);
@@ -700,9 +704,8 @@
*/
private EnumType osEnumDTO2EnumType(OsEnumDTO osEnumDTO){
EnumType enumType = new EnumType();
- //enumType.oid = osEnumDTO.getOid();
- //鏋氫妇鍚嶇粺涓�杞垚灏忓啓锛岄伩鍏嶅悗鏈熷嚭鐜板叾浠栭棶棰�
- enumType.name = osEnumDTO.getId().toLowerCase(Locale.ROOT);
+ enumType.oid = osEnumDTO.getOid();
+ enumType.name = osEnumDTO.getId();//osEnumDTO.getId().toLowerCase(Locale.ROOT);
enumType.label = osEnumDTO.getName();
enumType.length = osEnumDTO.getLength();
enumType.creator = osEnumDTO.getCreator();
--
Gitblit v1.9.3