From 29d2aabc6a07be091d7b52ba51e12a6baf16f7ac Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期二, 06 六月 2023 17:40:18 +0800
Subject: [PATCH] 接口配置冲突
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java
index 59526d8..eafa258 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java
@@ -8,9 +8,15 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.core.tool.utils.StringPool;
-
+<<<<<<< Updated upstream
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+=======
+
+import java.util.*;
+import java.util.stream.Collectors;
+>>>>>>> Stashed changes
/**
* Description:
@@ -21,8 +27,6 @@
public class BtmTypeCache {
private static final String BTM_DETAIL = "btm:id";
-
- private static final String BTM_REF = "btm:list";
private static final String BTM_TYPE_CACHE = "ubcs:btm";
@@ -73,7 +77,7 @@
public static List<BtmTypeVO> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) {
String keyPrefix = BTM_IDS.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
return CacheUtil.get(BTM_TYPE_CACHE,keyPrefix,Func.toStr(pkBtmTypeCollection.stream().map(s -> s.substring(0,5))),() ->{
- R<List<BtmTypeVO>> result = getBtmTypeClient().listBtmTypeByOidCollection(pkBtmTypeCollection);
+ R<List<BtmTypeVO>> result = getBtmTypeClient().listBtmTypeByOidCollection(new ArrayList<>(pkBtmTypeCollection));
return result.getData();
});
}
--
Gitblit v1.9.3