From 10eea85347df00e1635b0c03ae86ceea7dabd373 Mon Sep 17 00:00:00 2001
From: 777 <123@qwe.com>
Date: Tue, 12 Aug 2025 10:01:54 +0800
Subject: [PATCH] V13

---
 doc/2025-08-12.sql                                        | 2 ++
 .../src/main/java/com/ruoyi/cai/domain/BatchAddUser.java  | 4 ++++
 .../ruoyi/cai/service/impl/BatchAddUserServiceImpl.java   | 8 +++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 doc/2025-08-12.sql

diff --git a/doc/2025-08-12.sql b/doc/2025-08-12.sql
new file mode 100644
index 00000000..96e2bdbe
--- /dev/null
+++ b/doc/2025-08-12.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `cai_batch_add_user`
+ADD COLUMN `password_type` int NOT NULL DEFAULT 1 COMMENT '1=规则生成 2-随机密码';
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/BatchAddUser.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/BatchAddUser.java
index 381a6f28..92b338b0 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/BatchAddUser.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/BatchAddUser.java
@@ -49,6 +49,10 @@ public class BatchAddUser implements Serializable {
      * 手机后缀起点(后4位)
      */
     private Integer phoneSuffixStart;
+    /**
+     * 1-规则生成 2-随机密码
+     */
+    private Integer passwordType;
     /**
      * 密码前缀
      */
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/BatchAddUserServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/BatchAddUserServiceImpl.java
index dbf50ded..6cfbcf50 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/BatchAddUserServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/BatchAddUserServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.cai.service.impl;
 
+import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -82,7 +83,12 @@ public class BatchAddUserServiceImpl extends ServiceImpl<BatchAddUserMapper,Batc
                 log.error("新增用户：手机号非法 mobile={}",phone);
                 continue;
             }
-            String password = String.format("%s%s", batchAddUser.getPasswordPrefix(), batchAddUser.getPasswordSuffixStart()+i);
+            String password = null;
+            if(batchAddUser.getPasswordType() == null || batchAddUser.getPasswordType() == 1){
+                password = String.format("%s%s", batchAddUser.getPasswordPrefix(), batchAddUser.getPasswordSuffixStart()+i);
+            }else{
+                password = RandomUtil.randomNumbers(8);
+            }
             String code = systemConfigManager.getSystemConfig(SystemConfigEnum.SMS_CODE_ADMIN);
             CaiRegisterUser registerUser = new CaiRegisterUser();
             registerUser.setUsername(phone);