From 6db3a32e0444965a66b247a5c271e9f4c22efc7d Mon Sep 17 00:00:00 2001
From: Guava <gongdexing@oxyzgroup.com>
Date: Wed, 5 Jul 2023 10:25:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=E5=91=98=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CasesRecommendPushRecordServiceImpl.java  | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java
index fd2f4544..3e456a92 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java
@@ -28,10 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -79,7 +76,7 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR
             List<String> caseIdList = importDataList.stream().filter(casesRecommendLaunchImportData -> casesRecommendLaunchImportData.getStatus() == 1).map(CasesRecommendLaunchImportData::getCaseId).collect(Collectors.toList());
             caseIds.addAll(caseIdList);
         }
-        List<String> userIds = new ArrayList<>();
+        Set<String> userIds = new HashSet<>();
         if (CollectionUtil.isNotEmpty(casesRecommendLaunch.getPushUserIdList())) {
             userIds.addAll(casesRecommendLaunch.getPushUserIdList());
         }
@@ -87,21 +84,29 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR
         if (CollectionUtil.isNotEmpty(casesRecommendLaunch.getDeptIds())) {
             long tt = System.currentTimeMillis();
             for (String orgId : casesRecommendLaunch.getDeptIds()) {
-                long ts = System.currentTimeMillis();
-                List<OrgRootBean.ResultData> orgChildTree = thirdApi.getOrgChildTree(orgId, token);
-                log.info("查询组织数据耗时 {}秒", (System.currentTimeMillis() - tt) / 1000);
-                if (CollectionUtil.isNotEmpty(orgChildTree)) {
-                    for (OrgRootBean.ResultData result : orgChildTree) {
-                        UserListParam build = UserListParam.builder().departId(result.getId()).pageSize(100).build();
-                        List<UserInfoList> allUserList = thirdApi.getAllUserList(build, token);
-                        if (CollectionUtil.isNotEmpty(allUserList)) {
-                            for (UserInfoList userInfo : allUserList) {
-                                userIds.add(String.valueOf(userInfo.getId()));
-                            }
-                        }
+                UserListParam build = UserListParam.builder().departId(orgId).pageSize(100).build();
+                List<UserInfoList> allUserList = thirdApi.getAllUserList(build, token);
+                if (CollectionUtil.isNotEmpty(allUserList)) {
+                    for (UserInfoList userInfo : allUserList) {
+                        userIds.add(String.valueOf(userInfo.getId()));
                     }
                 }
-                log.info("{} 机构查询耗时 {}秒", orgId, (System.currentTimeMillis() - ts) / 1000);
+
+//                long ts = System.currentTimeMillis();
+//                List<OrgRootBean.ResultData> orgChildTree = thirdApi.getOrgChildTree(orgId, token);
+//                log.info("查询组织数据耗时 {}秒", (System.currentTimeMillis() - tt) / 1000);
+//                if (CollectionUtil.isNotEmpty(orgChildTree)) {
+//                    for (OrgRootBean.ResultData result : orgChildTree) {
+//                        UserListParam build = UserListParam.builder().departId(result.getId()).pageSize(100).build();
+//                        List<UserInfoList> allUserList = thirdApi.getAllUserList(build, token);
+//                        if (CollectionUtil.isNotEmpty(allUserList)) {
+//                            for (UserInfoList userInfo : allUserList) {
+//                                userIds.add(String.valueOf(userInfo.getId()));
+//                            }
+//                        }
+//                    }
+//                }
+//                log.info("{} 机构查询耗时 {}秒", orgId, (System.currentTimeMillis() - ts) / 1000);
             }
             log.info("组织查询耗时 {}秒", (System.currentTimeMillis() - tt) / 1000);
         }
@@ -155,7 +160,6 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR
             casesRecommendPushRecordDao.saveList(pushRecords);
         }
         try {
-
             //发送推送案例消息
             asyncSendCasesRecommendService.sendCasesRecommend(casesRecommend);
             log.info("执行完成耗时 {} 秒 ", (System.currentTimeMillis() - t1) / 1000);