添加用户审核开关

ad-platform-pojo/src/main/java/com/baiye/model/dto/UserDto.java

@@ -79,4 +79,7 @@ public class UserDto extends BaseDTO implements Serializable {
 
     private Date expirationTime;
 
+    private Boolean isReview;
+
+
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/User.java

@@ -113,6 +113,11 @@ public class User extends BaseEntity implements Serializable {
     private Date expirationTime;
 
 
+    @Column(name = "is_review")
+    @ApiModelProperty(value = "是否审核")
+    private Boolean isReview;
+
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/UserController.java

@@ -16,7 +16,6 @@
 package com.baiye.modules.system.rest;
 
 import cn.hutool.json.JSONUtil;
-import com.alibaba.excel.EasyExcelFactory;
 import com.baiye.annotation.Inner;
 import com.baiye.config.properties.RsaProperties;
 import com.baiye.constant.DefaultNumberConstants;
@@ -25,10 +24,11 @@ import com.baiye.exception.BadRequestException;
 import com.baiye.model.dto.RoleSmallDto;
 import com.baiye.model.dto.UserDto;
 import com.baiye.model.dto.UserFavorOfExcel;
-import com.baiye.model.enums.ResponseCode;
 import com.baiye.modules.system.domain.User;
 import com.baiye.modules.system.domain.vo.UserPassVo;
-import com.baiye.modules.system.service.*;
+import com.baiye.modules.system.service.DataService;
+import com.baiye.modules.system.service.RoleService;
+import com.baiye.modules.system.service.UserService;
 import com.baiye.modules.system.service.dto.CreateUserDTO;
 import com.baiye.modules.system.service.dto.UserQueryCriteria;
 import com.baiye.util.ReadExcelUtils;

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/CreateUserDTO.java

@@ -77,7 +77,8 @@ public class CreateUserDTO {
     @ApiModelProperty(value = "文件地址")
     private MultipartFile file;
 
-
+    @ApiModelProperty(value = "是否审核")
+    private Boolean isReview;
 
 
 

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

@@ -22,7 +22,6 @@ import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.http.CommonResponse;
 import com.baiye.modules.system.domain.MessageNotification;
 import com.baiye.modules.system.domain.UserMessage;
-import com.baiye.modules.system.repository.MessageNotificationRepository;
 import com.baiye.modules.system.repository.UserMessageRepository;
 import com.baiye.modules.system.service.AutoReminderService;
 import com.baiye.modules.system.service.UserMessageService;

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

@@ -21,7 +21,6 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.StrPool;
-import com.alibaba.excel.EasyExcelFactory;
 import com.baiye.config.properties.FileProperties;
 import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.exception.BadRequestException;
@@ -182,6 +181,10 @@ public class UserServiceImpl implements UserService {
             companyDto.setStatus(DefaultNumberConstants.ZERO_NUMBER);
             companyId = companyService.createCompany(companyDto).getId();
         }
+        if (userDTO.getIsReview() != null
+                && user.getIsReview().equals(Boolean.TRUE) && !flag){
+            throw new BadRequestException("非管理角色无需设置审核");
+        }
         companyId = companyId != null ? companyId :
                 SecurityUtils.getCompanyId();
         userDTO.setPassword(passwordEncoder.encode("123456"));

manage/ad-platform-management/src/main/java/com/baiye/socket/WebSocketServer.java

@@ -10,7 +10,6 @@ import com.baiye.model.enums.WebSocketEnums;
 import com.baiye.modules.system.service.MessageNotificationService;
 import com.baiye.modules.system.service.UserMessageService;
 import com.baiye.modules.system.service.dto.UserMessageDto;
-import com.baiye.util.RedisUtils;
 import com.baiye.util.SpringContextHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -22,7 +21,6 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**