From 4e8a899e4e84486e35845a6cc640572115420a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Wed, 3 Jul 2024 19:54:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=B9=E9=87=8F=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/UserController.java     | 39 +++++++++++++++++--
 .../common/system/mapper/xml/TenantMapper.xml |  2 +-
 .../common/system/mapper/xml/UserMapper.xml   |  6 +++
 .../common/system/param/UserParam.java        |  4 ++
 4 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
index 2f531f0..4d7f07c 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
@@ -28,10 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -93,6 +90,40 @@ public class UserController extends BaseController {
         return fail("添加失败");
     }
 
+    @PreAuthorize("hasAuthority('sys:user:save')")
+    @ApiOperation("批量添加用户")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<User> userList) {
+      userList.forEach(d -> {
+        d.setStatus(0);
+        d.setPassword(userService.encodePassword(d.getPassword()));
+      });
+      if (userService.saveBatch(userList)) {
+        return success("添加成功");
+      }
+      return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('sys:user:save')")
+    @ApiOperation("批量添加用户并返回userId")
+    @PostMapping("/batchBackUserId")
+    public ApiResult<?> saveBatchBackUserId(@RequestBody List<User> userList) {
+      userList.forEach(d -> {
+        d.setStatus(0);
+        d.setPassword(userService.encodePassword(d.getPassword()));
+      });
+      final Set<String> phones = userList.stream().map(User::getPhone).collect(Collectors.toSet());
+      if (userService.saveBatch(userList)) {
+        final UserParam userParam = new UserParam();
+        userParam.setPhones(phones);
+        userParam.setLimit(500L);
+        final PageResult<User> result = userService.pageRel(userParam);
+        final Set<Integer> collect = result.getList().stream().map(User::getUserId).collect(Collectors.toSet());
+        return success("添加成功",collect);
+      }
+      return fail("添加失败");
+    }
+
     @PreAuthorize("hasAuthority('sys:user:update')")
     @OperationLog
     @ApiOperation("修改用户")
diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml
index d0bb9c5..b0a0cd9 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml
@@ -4,7 +4,7 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*,b.company_name,b.company_logo
+        SELECT a.*,b.company_name,b.company_logo as logo
         FROM sys_tenant a
         LEFT JOIN sys_company b ON a.tenant_id = b.tenant_id
         <where>
diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
index a51c7df..d701f0e 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
@@ -124,6 +124,12 @@
                 #{item}
               </foreach>
             </if>
+            <if test="param.phones != null">
+              AND a.phones IN
+              <foreach collection="param.phones" item="item" separator="," open="(" close=")">
+                #{item}
+              </foreach>
+            </if>
             <if test="param.province != null">
               AND a.province LIKE CONCAT('%', #{param.province}, '%')
             </if>
diff --git a/src/main/java/com/gxwebsoft/common/system/param/UserParam.java b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
index 68dedca..36493ca 100644
--- a/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
+++ b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
@@ -214,6 +214,10 @@ public class UserParam extends BaseParam {
     @TableField(exist = false)
     private Set<Integer> userIds;
 
+    @ApiModelProperty("用户手机号码集合")
+    @TableField(exist = false)
+    private Set<String> phones;
+
     @ApiModelProperty("是否查询用户详细资料表")
     @TableField(exist = false)
     private Boolean showProfile;