From 13934c1da90c0bb7b02607586c898972e97c9617 Mon Sep 17 00:00:00 2001
From: Koi-tsk <337023856@qq.com>
Date: Mon, 29 Aug 2022 10:08:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1-=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=B5=84=E6=BA=90bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fuse/service/impl/TbFuseServiceImpl.java  | 48 ++++++++++++-------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java
index 31bb12d2..a1cd5e16 100644
--- a/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java
@@ -168,31 +168,45 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
         AtomicInteger pageIndex = new AtomicInteger(1);
         AtomicBoolean end = new AtomicBoolean(true);
         List<CompletableFuture> completableFutures=new CopyOnWriteArrayList<>();
-        while(end.get()){
+        do {
             completableFutures.add(CompletableFuture.supplyAsync(()->{
                 Optional<AbstractDataResourceService> factory = DataResourceFactory.build();
                 if (factory.isPresent()) {
-                    GetDataResourceListDto dto=new GetDataResourceListDto().setPageNum(pageIndex.get()).setPageSize(pageSize);
-                    Map<String, Object> dataResource = (Map<String, Object>) factory.get().getDataResource(dto);
-                    if(!dataResource.isEmpty()){
-                        List<Map<String, Object>> list = (List<Map<String, Object>>) dataResource.get("data");
-                        pageIndex.getAndIncrement();
-                        return new HashMap(){{put( list.stream().map(map->{
-                            if (map.containsKey("zyname")) {
-                                return map.get("guid");
-                            } else {
-                                return map.get("serviceId");
-                            }
-                        }), list);}};
+                    try {
+                        GetDataResourceListDto dto=new GetDataResourceListDto().setPageNum(pageIndex.get()).setPageSize(pageSize);
+                        Map<String, Object> dataResource = (Map<String, Object>) factory.get().getDataResource(dto);
+                        if(!dataResource.isEmpty()){
+                            List<Map<String, Object>> list = (List<Map<String, Object>>) dataResource.get("data");
+                            pageIndex.getAndIncrement();
+                            return new HashMap(){{put( list.stream().map(map->{
+                                if (map.containsKey("zyname")) {
+                                    return map.get("guid");
+                                } else {
+                                    return map.get("serviceId");
+                                }
+                            }), list);}};
+                        }
+                    } catch (Exception e) {
+                        logger.info("获取数据资源异常：", e);
+                        end.set(false);
                     }
                 }
-                return null;
+                return new HashMap<>();
             }).thenAcceptAsync(map->{
-                if(map != null){
+                if(!map.isEmpty()){
                     result.putAll(map);
+                }else{
+                    end.set(false);
                 }
             }));
-        }
+
+            try {
+                Thread.sleep(300); // 防止任务运行过快，无法跳出循环
+            } catch (InterruptedException e) {
+                logger.info("获取数据资源异常", e);
+            }
+
+        } while(end.get());
         return result;
     }
 
@@ -204,7 +218,7 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
         List<TbFuseResourceEntity> list = fuseResourceDao.selectList(wrapper);
         Map<String, List<TbFuseResourceEntity>> resourceMap = list.stream().filter(index -> index.getType() != null).collect(Collectors.groupingBy(TbFuseResourceEntity::getType));
         if (resourceMap.containsKey("数据资源")) {
-            //dataResourceMap.putAll(getDataResource());
+            dataResourceMap.putAll(getDataResource());
         }
         resourceMap.forEach((type, value) -> {
             if ("组件服务".equals(type)) {