From f1f404c45bde9b290d68ac0ebe0b03987f3f3472 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Tue, 21 Jun 2022 18:28:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/resource/service/impl/ResourceServiceImpl.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
index a4e6ba43..8968d673 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
@@ -230,7 +230,8 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         Page<ResourceDTO> resultPage = new Page<>(pageNum, pageSize);
         switch (Constant.ProjectPlace.getByFlag(projectPlace)) {
             case TSINGTAO:
-            case BAOTOU: { // 包头、青岛西海岸
+            case BAOTOU: { // 包头、青岛
+                logger.error("包头、青岛");
                 if (resourceDTO.getInfoList().isEmpty()) {
                     List<ResourceDTO> resourceDTOS = resourceDao.selectDTOPage(resourceDTO, (pageNum - 1) * pageSize, pageSize, orderField, orderType);
                     resultPage.setRecords(resourceDTOS);
@@ -254,8 +255,8 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
             break;
             case TSINGTAO_XHA: {
                 if ("基础设施".equals(resourceDTO.getType())) { // 基础设施
+                    logger.error("西海岸基础设施");
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                    List<Long> result_ = new CopyOnWriteArrayList<>();
                     CompletableFuture cloud =
                             CompletableFuture.runAsync(() -> { // 云脑专网
                                 OkHttpClient client = new OkHttpClient();
@@ -339,8 +340,8 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                                 }
                             });
                     CompletableFuture.allOf(cloud, local);
-
                 } else {
+                    logger.error("西海岸基普通");
                     if (resourceDTO.getInfoList().isEmpty()) {
                         List<ResourceDTO> resourceDTOS = resourceDao.selectDTOPage(resourceDTO, (pageNum - 1) * pageSize, pageSize, orderField, orderType);
                         resultPage.setRecords(resourceDTOS);