Added regex search in UserManagement

Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/UserController.java

@@ -65,11 +65,11 @@ public class UserController {
     @GetMapping
     @PreAuthorize("hasAuthority('system:user:get')")
     @Operation(summary = "获取所有用户（权限管理相关）")
-    public ResponseResult<IPage<User>> getAllUser(Long currentPage, Long pageSize, String searchName, String searchRole, String searchGroup, Integer searchEnable) {
+    public ResponseResult<IPage<User>> getAllUser(Long currentPage, Long pageSize, String searchName, String searchRole, String searchGroup, Integer searchEnable, Integer searchRegex) {
         List<Long> searchRoleList = WebUtil.convertStringToList(searchRole, Long.class);
         List<Long> searchGroupList = WebUtil.convertStringToList(searchGroup, Long.class);
 
-        IPage<User> users = userService.getAllUser(currentPage, pageSize, searchName, searchRoleList, searchGroupList, searchEnable);
+        IPage<User> users = userService.getAllUser(currentPage, pageSize, searchName, searchRoleList, searchGroupList, searchEnable, searchRegex);
         return ResponseResult.databaseSelectSuccess(users);
     }
 

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 @Mapper
 public interface UserMapper extends BaseMapper<User> {
-    List<Long> filterUserByRoleIdAndGroupId(@Param("userList") List<Long> userList, @Param("roleId") Long roleId, @Param("groupId") Long groupId, String searchName, Integer searchEnable);
+    List<Long> filterUserByRoleIdAndGroupId(@Param("userList") List<Long> userList, @Param("roleId") Long roleId, @Param("groupId") Long groupId, @Param("searchName") String searchName, @Param("searchEnable") Integer searchEnable, @Param("searchRegex") Integer searchRegex);
 
     List<User> getAllWithRoleAndGroup(@Param("userList") List<User> userList);
 

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IUserService.java

@@ -24,7 +24,7 @@ public interface IUserService extends IService<User> {
 
     List<User> getNoticeUser();
 
-    IPage<User> getAllUser(Long currentPage, Long pageSize, String searchName, List<Long> searchRole, List<Long> searchGroup, Integer searchEnable);
+    IPage<User> getAllUser(Long currentPage, Long pageSize, String searchName, List<Long> searchRole, List<Long> searchGroup, Integer searchEnable, Integer searchRegex);
 
     User getUser(long id);
 

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java

@@ -96,13 +96,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
 
     @Override
-    public IPage<User> getAllUser(Long currentPage, Long pageSize, String searchName, List<Long> searchRole, List<Long> searchGroup, Integer searchEnable) {
+    public IPage<User> getAllUser(Long currentPage, Long pageSize, String searchName, List<Long> searchRole, List<Long> searchGroup, Integer searchEnable, Integer searchRegex) {
         IPage<User> userIPage = PageDTO.of(currentPage, pageSize);
         searchName = searchName.trim();
-        List<Long> userList = userMapper.filterUserByRoleIdAndGroupId(null, null, null, searchName, searchEnable);
+        List<Long> userList = userMapper.filterUserByRoleIdAndGroupId(null, null, null, searchName, searchEnable, searchRegex);
         if (userList.size() > 0) {
             for (Long roleId : searchRole) {
-                userList = userMapper.filterUserByRoleIdAndGroupId(userList, roleId, null, null, null);
+                userList = userMapper.filterUserByRoleIdAndGroupId(userList, roleId, null, null, null, null);
                 if (userList.size() == 0) {
                     break;
                 }
@@ -110,7 +110,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         if (userList.size() > 0) {
             for (Long groupId : searchGroup) {
-                userList = userMapper.filterUserByRoleIdAndGroupId(userList, null, groupId, null, null);
+                userList = userMapper.filterUserByRoleIdAndGroupId(userList, null, groupId, null, null, null);
                 if (userList.size() == 0) {
                     break;
                 }

Pinnacle/src/main/resources/mapper/permission/UserMapper.xml

@@ -22,8 +22,13 @@
                 #{item}
             </foreach>
             <if test="searchName != null and searchName != ''">
+                <if test="searchRegex == 1">
+                    and t_user.username regexp #{searchName}
+                </if>
+                <if test="searchRegex != 1">
                     and instr(t_user.username, #{searchName}) > 0
                 </if>
+            </if>
             <if test="searchEnable != null and searchEnable != -1">
                 and t_user.enable = #{searchEnable}
             </if>

ui/src/pages/power/GroupManagement.vue

@@ -31,7 +31,6 @@
             >
                 <el-input
                     v-model="inputName"
-                    maxlength="30"
                     show-word-limit
                     placeholder="请输入内容"
                     @keyup.enter="handleQuery"

ui/src/pages/power/RoleManagement.vue

@@ -31,7 +31,6 @@
             >
                 <el-input
                     v-model="inputName"
-                    maxlength="20"
                     show-word-limit
                     placeholder="请输入内容"
                     @keyup.enter="handleQuery"

ui/src/pages/power/UserManagement.vue

@@ -23,18 +23,33 @@
                 </template>
             </el-button>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="6">
-            <el-form-item label="名称" class="fill-with">
+            <el-form-item
+                label="名称"
+                class="fill-with"
+                :error="isRegexLegal ? '' : '非法正则表达式'"
+            >
                 <el-input
                     v-model="inputName"
-                    maxlength="20"
                     show-word-limit
                     placeholder="请输入内容"
                     @keyup.enter="handleQuery"
+                    @change="handleInputChange"
+                >
+                    <template #suffix>
+                        <el-tooltip content="正则表达式">
+                            <el-checkbox
+                                v-model="checkedRegex"
+                                label=".*"
+                                :true-label="1"
+                                @change="handleInputChange"
                             />
+                        </el-tooltip>
+                    </template>
+                </el-input>
             </el-form-item>
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4">
             <el-select
                 v-model="selectedRole"
                 class="fill-with"
@@ -52,7 +67,7 @@
                 />
             </el-select>
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4">
             <el-select
                 v-model="selectedGroup"
                 class="fill-with"
@@ -200,6 +215,7 @@ import {
     DATABASE_UPDATE_OK
 } from '@/constants/Common.constants.js'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import _ from 'lodash'
 
 export default {
     name: 'UserManagement',
@@ -218,12 +234,15 @@ export default {
             roleOptions: [],
             groupOptions: [],
             searchName: '',
-            searchRole: [],
-            searchGroup: [],
-            searchEnable: -1,
             inputName: '',
+            searchRegex: 0,
+            checkedRegex: 0,
+            isRegexLegal: true,
+            searchRole: [],
             selectedRole: [],
+            searchGroup: [],
             selectedGroup: [],
+            searchEnable: -1,
             selectedEnable: -1,
             currentPage: 1,
             pageSize: 50,
@@ -269,6 +288,13 @@ export default {
     },
     methods: {
         loadUserTable() {
+            if (!this.isRegexLegal) {
+                ElMessage.error({
+                    dangerouslyUseHTMLString: true,
+                    message: '<strong>非法正则表达式</strong>，请重新输入'
+                })
+                return
+            }
             this.tableLoading = true
             request
                 .get('/user', {
@@ -277,7 +303,8 @@ export default {
                     searchName: this.searchName,
                     searchRole: this.searchRole + '',
                     searchGroup: this.searchGroup + '',
-                    searchEnable: this.searchEnable
+                    searchEnable: this.searchEnable,
+                    searchRegex: this.searchRegex ?? 0
                 })
                 .then((res) => {
                     const response = res.data
@@ -494,18 +521,35 @@ export default {
         },
         handleQuery() {
             this.searchName = this.inputName
+            this.searchRegex = _.cloneDeep(this.checkedRegex)
             this.searchRole = this.selectedRole
             this.searchGroup = this.selectedGroup
             this.searchEnable = this.selectedEnable
             this.currentPage = 1
+            this.handleInputChange()
             this.loadUserTable()
         },
         handleClear() {
             this.inputName = ''
+            this.checkedRegex = 0
             this.selectedRole = []
             this.selectedGroup = []
             this.selectedEnable = -1
             this.handleQuery()
+        },
+        handleInputChange() {
+            if (this.checkedRegex) {
+                try {
+                    RegExp(this.inputName)
+                    this.isRegexLegal = !(
+                        this.inputName.includes('{}') || this.inputName.includes('[]')
+                    )
+                } catch (e) {
+                    this.isRegexLegal = false
+                }
+            } else {
+                this.isRegexLegal = true
+            }
         }
     },
     mounted() {