From d9183aa80ae17d36b79dda48c6b1d7fa22a80ee3 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期三, 22 一月 2025 11:20:41 +0800
Subject: [PATCH] 现场型号代号/人员/组织接口调试
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/gennerAttrMapUtil.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/gennerAttrMapUtil.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/gennerAttrMapUtil.java
index 695bc04..b6b05d8 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/gennerAttrMapUtil.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/gennerAttrMapUtil.java
@@ -4,12 +4,16 @@
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
import com.vci.ubcs.code.vo.webserviceModel.attrmap.LibraryDO;
+import com.vci.ubcs.code.webService.config.AttributeMapConfig;
import com.vci.ubcs.starter.util.LocalFileUtil;
-import com.vci.ubcs.webservice.config.AttributeMapConfig;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import java.util.Locale;
import java.util.Map;
+@Slf4j
public class gennerAttrMapUtil {
@Autowired(required = false)
private AttributeMapConfig attributeMapConfig;
@@ -27,17 +31,23 @@
* @param systemId
*/
public LibraryDO gennerAttrMapBySystem(String systemId, Map<String, String> system_attrmap) throws Throwable{
+ log.info("绯荤粺鏍囪瘑->"+systemId);
if(StringUtils.isBlank(systemId)){
throw new Throwable("绯荤粺鏍囪瘑涓虹┖");
}
LibraryDO rootDataVO=new LibraryDO();
- if(system_attrmap.containsKey(systemId)){
- String path=system_attrmap.get(systemId);
+ if(system_attrmap.containsKey(systemId.toLowerCase(Locale.ROOT)) || system_attrmap.containsKey(systemId.toUpperCase(Locale.ROOT))){
+ //String path = system_attrmap.get(systemId);
+ String path = VciBaseUtil.getMapStrValueIgnoreCase(system_attrmap,systemId);
+ log.info("绯荤粺鏍囪瘑->"+systemId+"锛涙枃浠跺睘鎬ч厤缃枃浠惰矾寰�->"+path);
String attributeMapData= LocalFileUtil.readContentForFile(path);
+ log.info("璇诲彇鍚庣殑灞炴�ф槧灏勫唴瀹�"+attributeMapData);
XStream xStream = new XStream(new DomDriver());
xStream.processAnnotations(LibraryDO.class);
xStream.autodetectAnnotations(true);
- rootDataVO = (LibraryDO) xStream.fromXML(attributeMapData);
+ log.info("杞崲鎴愬璞tart");
+ rootDataVO = (LibraryDO) xStream.fromXML(attributeMapData);
+ log.info("杞崲鎴愬璞nd");
}
return rootDataVO;
--
Gitblit v1.9.3