首页 发现 帮助
注册 登录
usoft
/
sso-parent
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

添加用户认证状态的筛选

huxz 7 年之前
父节点
a4731974a0
当前提交
46993177fc
共有 6 个文件被更改，包括 30 次插入 和 9 次删除
合并视图 显示文件统计
  1. 2 2
      sso-manage-console-web/config/index.js
  2. 1 1
      sso-manage-console-web/index.html
  3. 14 0
      sso-manage-console-web/src/components/accounts/users/UserHome.vue
  4. 2 1
      sso-manage-console/src/main/java/com/uas/sso/sso/backend/api/UserManageController.java
  5. 4 3
      sso-manage-console/src/main/java/com/uas/sso/sso/backend/service/UserBackendService.java
  6. 7 2
      sso-manage-console/src/main/java/com/uas/sso/sso/backend/service/impl/UserBackendServiceImpl.java

+ 2 - 2
sso-manage-console-web/config/index.js
查看文件 

@@ -17,11 +17,11 @@ module.exports = {
 
     proxyTable: {
 
     proxyTable: {
 
       // proxy all backend requests to backend server
 
       // proxy all backend requests to backend server
 
       '/api': {
 
       '/api': {
 
-        target: 'http://localhost:8090',
 
+        target: 'http://localhost:8082',
 
         changeOrigin: true
 
         changeOrigin: true
 
       },
 
       },
 
       '/login': {
 
       '/login': {
 
-        target: 'http://localhost:8090',
 
+        target: 'http://localhost:8082',
 
         changeOrigin: true
 
         changeOrigin: true
 
       }
 
       }
 
     },
 
     },

+ 1 - 1
sso-manage-console-web/index.html
查看文件 

@@ -3,7 +3,7 @@
 
   <head>
 
   <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
-    <title>sso-manage-console-web</title>
 
+    <title>账户中心管理后台</title>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <div id="app"></div>
 
     <div id="app"></div>

+ 14 - 0
sso-manage-console-web/src/components/accounts/users/UserHome.vue
查看文件 

@@ -21,6 +21,17 @@
 
           </el-option>
 
           </el-option>
 
         </el-select>
 
         </el-select>
 
 
 
+        <!-- 身份认证状态 -->
 
+        <label>用户认证状态</label>
 
+        <el-select v-model="pageParams.identityValidCode" clearable placeholder="不限" @change="handleRefreshData">
 
+          <el-option
 
+            v-for="item in identityValidCodeOptions"
 
+            :key="item.value"
 
+            :label="item.label"
 
+            :value="item.value">
 
+          </el-option>
 
+        </el-select>
 
+
 
         <!-- 手机认证状态 -->
 
         <!-- 手机认证状态 -->
 
         <label>手机认证状态</label>
 
         <label>手机认证状态</label>
 
         <el-select v-model="pageParams.mobileValidCode" clearable placeholder="不限" @change="handleRefreshData">
 
         <el-select v-model="pageParams.mobileValidCode" clearable placeholder="不限" @change="handleRefreshData">
 
@@ -191,12 +202,14 @@
 
           size: 8,
 
           size: 8,
 
           fromApp: null,
 
           fromApp: null,
 
           mobileValidCode: null,
 
           mobileValidCode: null,
 
+          identityValidCode: null,
 
           key: 'vipName',
 
           key: 'vipName',
 
           keyword: null
 
           keyword: null
 
         },
 
         },
 
         pageContent: [],
 
         pageContent: [],
 
         total: 0,
 
         total: 0,
 
         mobileValidCodeOptions: ValidCode,
 
         mobileValidCodeOptions: ValidCode,
 
+        identityValidCodeOptions: ValidCode,
 
         searchKeys: searchKeys,
 
         searchKeys: searchKeys,
 
         isAddNewUser: false,
 
         isAddNewUser: false,
 
         newUserInfo: {}
 
         newUserInfo: {}
 
@@ -240,6 +253,7 @@
 
         this.fetchData()
 
         this.fetchData()
 
       },
 
       },
 
       handleRefreshData () {
 
       handleRefreshData () {
 
+        console.log('我要刷新数据')
 
         console.log(this.pageParams)
 
         console.log(this.pageParams)
 
         this.fetchData()
 
         this.fetchData()
 
       },
 
       },

+ 2 - 1
sso-manage-console/src/main/java/com/uas/sso/sso/backend/api/UserManageController.java
查看文件 

@@ -39,11 +39,12 @@ public class UserManageController {
 
     public ResultBean<org.springframework.data.domain.Page<User>> showUserByPagination(Pageable page,
 
     public ResultBean<org.springframework.data.domain.Page<User>> showUserByPagination(Pageable page,
 
             @RequestParam(required = false) String fromApp,
 
             @RequestParam(required = false) String fromApp,
 
             @RequestParam(required = false) Short mobileValidCode,
 
             @RequestParam(required = false) Short mobileValidCode,
 
+            @RequestParam(required = false) Short identityValidCode,
 
             @RequestParam(required = false) String key,
 
             @RequestParam(required = false) String key,
 
             @RequestParam(required = false) String keyword) {
 
             @RequestParam(required = false) String keyword) {
 
         // Controller中的Pageable类型参数默认根据查询参数 page 和 size 注入并实例化
 
         // Controller中的Pageable类型参数默认根据查询参数 page 和 size 注入并实例化
 
         return new ResultBean<>(
 
         return new ResultBean<>(
 
-                userBackendService.showUserByPagination(page, fromApp, mobileValidCode, key, keyword));
 
+                userBackendService.showUserByPagination(page, fromApp, mobileValidCode, identityValidCode, key, keyword));
 
     }
 
     }
 
 
 
     @RequestMapping(method = RequestMethod.GET, path = "//showEnUserByPagination",
 
     @RequestMapping(method = RequestMethod.GET, path = "//showEnUserByPagination",

+ 4 - 3
sso-manage-console/src/main/java/com/uas/sso/sso/backend/service/UserBackendService.java
查看文件 

@@ -21,13 +21,14 @@ public interface UserBackendService {
 
      *
 
      *
 
      * @param page  分页参数
 
      * @param page  分页参数
 
      * @param fromApp   注册来源
 
      * @param fromApp   注册来源
 
-     * @param mobileValidCode   收集认证状态
 
+     * @param identityValidCode 用户认证状态
 
+     * @param mobileValidCode   手机认证状态
 
      * @param key   搜索字段
 
      * @param key   搜索字段
 
      * @param keyword   搜索关键字
 
      * @param keyword   搜索关键字
 
      * @return  获取用户分页数据
 
      * @return  获取用户分页数据
 
      */
 
      */
 
-    Page<User> showUserByPagination(Pageable page, String fromApp, Short mobileValidCode, String key,
 
-            String keyword);
 
+    Page<User> showUserByPagination(Pageable page, String fromApp, Short mobileValidCode, Short identityValidCode, String key,
 
+                                    String keyword);
 
 
 
     /**
 
     /**
 
      * 分页获取企业用户信息.
 
      * 分页获取企业用户信息.

+ 7 - 2
sso-manage-console/src/main/java/com/uas/sso/sso/backend/service/impl/UserBackendServiceImpl.java
查看文件 

@@ -65,8 +65,8 @@ public class UserBackendServiceImpl implements UserBackendService {
 
     }
 
     }
 
 
 
     @Override
 
     @Override
 
-    public Page<User> showUserByPagination(Pageable page, String fromApp, Short mobileValidCode,
 
-            String key, String keyword) {
 
+    public Page<User> showUserByPagination(Pageable page, String fromApp, Short mobileValidCode, Short identityValidCode,
 
+                                           String key, String keyword) {
 
 
 
         return userDao.findAll(new Specification<User>() {
 
         return userDao.findAll(new Specification<User>() {
 
             @Override
 
             @Override
 
@@ -83,6 +83,11 @@ public class UserBackendServiceImpl implements UserBackendService {
 
                     predicates.add(predicate);
 
                     predicates.add(predicate);
 
                 }
 
                 }
 
 
 
+                if (identityValidCode != null) {
 
+                    Predicate predicate = builder.equal(root.get("identityValidCode"), identityValidCode);
 
+                    predicates.add(predicate);
 
+                }
 
+
 
                 if ("userUU".equals(key) && !StringUtils.isEmpty(keyword)) {
 
                 if ("userUU".equals(key) && !StringUtils.isEmpty(keyword)) {
 
                     Predicate predicate = builder.equal(root.get(key), keyword);
 
                     Predicate predicate = builder.equal(root.get(key), keyword);
 
                     predicates.add(predicate);
 
                     predicates.add(predicate);