From 09d0d5ac8f4e239487e61de6fdd60e6012bf2295 Mon Sep 17 00:00:00 2001
From: bynt <ningtao/19960909>
Date: Fri, 14 Apr 2023 16:25:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/service/impl/DownRecordServiceImpl.java | 11 ++++++-----
 .../modules/system/repository/UserRepository.java    | 11 +++++++++++
 .../modules/system/service/impl/UserServiceImpl.java | 12 +++++++++++-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/DownRecordServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/DownRecordServiceImpl.java
index f95c7ef2..cc3ada44 100644
--- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/DownRecordServiceImpl.java
+++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/DownRecordServiceImpl.java
@@ -3,6 +3,7 @@ package com.baiye.modules.platform.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.text.StrPool;
 import cn.hutool.core.text.csv.CsvData;
 import cn.hutool.core.text.csv.CsvReader;
@@ -10,6 +11,7 @@ import cn.hutool.core.text.csv.CsvRow;
 import cn.hutool.core.text.csv.CsvUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
 import com.baiye.config.properties.DeliveryProperties;
@@ -39,6 +41,7 @@ import java.io.File;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * @author Enzo
@@ -120,11 +123,9 @@ public class DownRecordServiceImpl implements DownRecordService {
                             ExcelReader reader = ExcelUtil.getReader(upload);
                             for (List<Object> objects : reader.read()) {
                                 ImeiDTO dto = new ImeiDTO();
-                                String string = objects.toString();
-                                String[] split = string.split(StrPool.COMMA);
-                                if (split.length > DefaultNumberConstants.ONE_NUMBER) {
-                                    dto.setTag(split[DefaultNumberConstants.ONE_NUMBER]);
-                                    dto.setImei(split[DefaultNumberConstants.ZERO_NUMBER]);
+                                if (objects.size() > DefaultNumberConstants.ONE_NUMBER) {
+                                    dto.setTag(objects.get(DefaultNumberConstants.ONE_NUMBER).toString());
+                                    dto.setImei(objects.get(DefaultNumberConstants.ZERO_NUMBER).toString());
                                     dtoList.add(dto);
                                 }
                             }
diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/UserRepository.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/UserRepository.java
index 5ff7e137..c2fd9500 100644
--- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/UserRepository.java
+++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/UserRepository.java
@@ -295,4 +295,15 @@ public interface UserRepository extends JpaRepository<User, Long>, JpaSpecificat
      */
     @Query(value = "SELECT user_id FROM tb_company  c WHERE c.id = (SELECT  u.company_id FROM sys_user u WHERE u.user_id = ?1)", nativeQuery = true)
     Long queryManagementUserId(Long userId);
+
+
+    /**
+     * 根据创建人修改状态
+     * @param flag
+     * @param id
+     */
+    @Modifying
+    @Query(value = "update User set enabled = ?1 where whichUserId = ?2")
+    void updateStatusByWithId(Boolean flag, Long id);
+
 }
diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java
index b937ff67..e44ed251 100644
--- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java
+++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java
@@ -91,7 +91,6 @@ public class UserServiceImpl implements UserService {
     private final UserMapper userMapper;
     private final RedisUtils redisUtils;
 
-    private final CacheManager cacheManager;
     private final RoleRepository repository;
     private final FileProperties properties;
     private final BusinessConfig businessConfig;
@@ -505,6 +504,17 @@ public class UserServiceImpl implements UserService {
         // 如果用户被禁用，则清除用户登录信息
         if (Boolean.FALSE.equals(resources.getEnabled())) {
             this.remoteAuthService.delete(Collections.singleton(resources.getId()));
+            for (Role role : resources.getRoles()) {
+                if (businessConfig.getIds().contains(role.getId())) {
+                    List<User> byWhichUserId = userRepository.findByWhichUserId(user.getId());
+                    if (CollUtil.isNotEmpty(byWhichUserId)) {
+                        Set<Long> userIds = byWhichUserId.stream().map(User::getId).collect(Collectors.toSet());
+                        this.remoteAuthService.delete(userIds);
+                        this.userRepository.updateStatusByWithId(Boolean.FALSE, resources.getId());
+                        break;
+                    }
+                }
+            }
         }
 
         if (!user.getUsername().equals(resources.getUsername()) && user.getCompanyId() != null) {