代码提交

manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/OrganizeUserRepository.java

@@ -7,6 +7,7 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
+import java.util.Set;
 
 public interface OrganizeUserRepository extends JpaRepository<OrganizeUser, Long>, JpaSpecificationExecutor<OrganizeUser> {
 
@@ -77,6 +78,13 @@ public interface OrganizeUserRepository extends JpaRepository<OrganizeUser, Long
      */
     OrganizeUser findByUserId(Long currentUserId);
 
+    /**
+     * userId集合查询
+     * @param userIds
+     * @return
+     */
+    List<OrganizeUser> findByUserIdIn(Set<Long> userIds);
+
     /**
      * 更新组员组长 TODO:2.0版本开发
      *

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java

@@ -32,6 +32,8 @@ import com.baiye.model.dto.UserDto;
 import com.baiye.model.dto.UserFavorOfExcel;
 import com.baiye.modules.security.service.OnlineUserService;
 import com.baiye.modules.system.domain.Company;
+import com.baiye.modules.system.domain.OrganizeUser;
+import com.baiye.modules.system.repository.OrganizeUserRepository;
 import com.baiye.modules.system.service.CompanyService;
 import com.baiye.service.UserCacheClean;
 import com.baiye.modules.system.domain.Role;
@@ -82,6 +84,7 @@ public class UserServiceImpl implements UserService {
     private final UserRepository userRepository;
     private final PasswordEncoder passwordEncoder;
     private final OnlineUserService onlineUserService;
+    private final OrganizeUserRepository organizeUserRepository;
 
 
     @Override
@@ -277,6 +280,11 @@ public class UserServiceImpl implements UserService {
             UserDto user = findById(id);
             delCaches(user.getId(), user.getUsername());
         }
+        //查询是否已经分配到组
+        List<OrganizeUser> organizeUserList = organizeUserRepository.findByUserIdIn(ids);
+        if (organizeUserList != null || organizeUserList.size() > 0){
+            throw new BadRequestException("用户已经分配到组,无法删除");
+        }
         userRepository.deleteAllByIdIn(ids);
     }
 

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/ExtensionNumberServiceImpl.java

@@ -1,6 +1,7 @@
 package com.baiye.modules.telemarkting.service.impl;
 
 import com.baiye.constant.DefaultNumberConstants;
+import com.baiye.exception.BadRequestException;
 import com.baiye.http.CommonResponse;
 import com.baiye.modules.system.domain.Organize;
 import com.baiye.modules.system.repository.OrganizeRepository;
@@ -49,7 +50,7 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
 
             if (numberByMemberId != null) {
                 log.info("用户 ：{}，已经分配分机号", memberId);
-                return CommonResponse.createByErrorMessage("用户已经分配分机号,用户id：" + memberId);
+                throw new BadRequestException("用户已经分配分机号,用户id：" + memberId);
             }
             //查一个分机号
             Integer idByStatus = extensionNumberRepository.findIdByStatus(DefaultNumberConstants.ZERO_NUMBER);
@@ -62,7 +63,7 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
                 extensionNumberRepository.updateStatusById(DefaultNumberConstants.ONE_NUMBER, idByStatus);
             } catch (Exception e) {
                 log.error("分机号分配失败 memberId：{}", memberId);
-                return CommonResponse.createByErrorMessage("分机号分配失败,用户id为：" + memberId);
+                throw new BadRequestException("分机号分配失败,用户id为：" + memberId);
             }
         }
         return CommonResponse.createBySuccess();

services/ad-platform-source/src/main/java/com/baiye/feign/OrganizeClient.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(value = "ad-platform-management-jt",fallback = OrganizeClientFallback.class)
+@FeignClient(value = "ad-platform-management",fallback = OrganizeClientFallback.class)
 public interface OrganizeClient {
 
     String PAY_PREFIX = "/api/organize";

services/ad-platform-source/src/main/java/com/baiye/feign/TaskClient.java

@@ -8,7 +8,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(value = "ad-platform-management-jt",fallback = TaskClientFallback.class)
+@FeignClient(value = "ad-platform-management",fallback = TaskClientFallback.class)
 public interface TaskClient {
 
     String PAY_PREFIX = "/api/task";

services/ad-platform-source/src/main/resources/application.yml

@@ -8,8 +8,7 @@ spring:
   profiles:
     active: prod
   application:
-    name: ad-platform-source-jt
-#    name: ad-platform-source-jt
+    name: @artifactId@
   jackson:
     time-zone: GMT+8
   data:

services/ad-platform-source/src/main/resources/logback.xml

@@ -78,8 +78,8 @@
     <root level="INFO">
         <!-- TODO prod 环境去掉std -->
         <!--fileAppender生成文件===正式环境使用 -->
-<!--        <appender-ref ref="fileAppender"/>-->
+        <appender-ref ref="fileAppender"/>
         <!--stdAppender本地环境日志输出面板打印===本地测试环境使用 -->
-        <appender-ref ref="stdAppender"/>
+<!--        <appender-ref ref="stdAppender"/>-->
     </root>
 </configuration>