From 43967bc23e6c995207b544540306fb23edd8f404 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Sat, 25 Mar 2023 17:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/log/clientConnectLog.vue        | 13 +++++++-
 .../src/views/log/loginLog.vue                | 33 +++++++++++++++----
 .../req/ClientConnectRecordListReq.java       |  5 ++-
 .../req/UserLoginRecordListReq.java           |  5 ++-
 .../service/ClientConnectRecordService.java   |  1 +
 .../service/UserLoginRecordService.java       |  1 +
 6 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/neutrino-proxy-admin/src/views/log/clientConnectLog.vue b/neutrino-proxy-admin/src/views/log/clientConnectLog.vue
index 45d3731f..0a607eab 100644
--- a/neutrino-proxy-admin/src/views/log/clientConnectLog.vue
+++ b/neutrino-proxy-admin/src/views/log/clientConnectLog.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="app-container calendar-list-container">
     <div class="filter-container">
+      <el-select v-model="listQuery.licenseId" placeholder="请选择license" clearable style="margin-right:10px">
+        <el-option v-for="item in licenseList" :key="item.key" :label="item.name" :value="item.id" />
+      </el-select>
       <el-button type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{$t('table.search')}}</el-button>
     </div>
 
@@ -66,6 +69,7 @@
 
 <script>
 import { fetchList } from '@/api/clientConnectLog'
+import { licenseList } from '@/api/license'
 import waves from '@/directive/waves' // 水波纹指令
 
 export default {
@@ -85,7 +89,8 @@ export default {
         jobId: undefined
       },
       dialogVisible: false,
-      selectRow: {}
+      selectRow: {},
+      licenseList: []
     }
   },
   filters: {
@@ -112,6 +117,7 @@ export default {
     }
   },
   created() {
+    this.getLicenseList()
     this.getList()
   },
   methods: {
@@ -123,6 +129,11 @@ export default {
         this.listLoading = false
       })
     },
+    getLicenseList() {
+      licenseList().then(response => {
+        this.licenseList = response.data.data
+      })
+    },
     handleFilter() {
       this.listQuery.current = 1
       this.getList()
diff --git a/neutrino-proxy-admin/src/views/log/loginLog.vue b/neutrino-proxy-admin/src/views/log/loginLog.vue
index d4ace377..ac20f029 100644
--- a/neutrino-proxy-admin/src/views/log/loginLog.vue
+++ b/neutrino-proxy-admin/src/views/log/loginLog.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="app-container calendar-list-container">
     <div class="filter-container">
+      <el-select v-model="listQuery.userId" placeholder="请选择用户" clearable>
+        <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"/>
+      </el-select>
       <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{$t('table.search')}}</el-button>
     </div>
 
@@ -37,6 +40,7 @@
 
 <script>
 import { fetchList } from '@/api/loginLog'
+import { userList } from '@/api/user'
 import waves from '@/directive/waves' // 水波纹指令
 
 export default {
@@ -53,8 +57,9 @@ export default {
       listQuery: {
         current: 1,
         size: 10,
-        jobId: undefined
-      }
+        userId: null
+      },
+      userList: []
     }
   },
   filters: {
@@ -98,13 +103,11 @@ export default {
   },
   created() {
     this.getList()
+    this.getDataList()
   },
   activated() {
-    if (this.$route.query.jobId) {
-      this.listQuery.jobId = this.$route.query.jobId
-      console.log(this.listQuery.jobId, this.$route.query.jobId)
-      this.getList()
-    }
+    this.getUserList()
+    this.getList()
   },
   methods: {
     getList() {
@@ -115,6 +118,22 @@ export default {
         this.listLoading = false
       })
     },
+    getUserList() {
+      userList().then(response => {
+        this.userList = response.data.data
+      })
+    },
+    getDataList() {
+      const loginName = this.$store.state.user.loginName
+      userList().then(response => {
+        this.userList = response.data.data
+        const curUser = this.userList.find((val) => val.loginName === loginName)
+        if (curUser) {
+          this.listQuery.userId = curUser.id
+        }
+        this.getList()
+      })
+    },
     handleFilter() {
       this.listQuery.current = 1
       this.getList()
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/ClientConnectRecordListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/ClientConnectRecordListReq.java
index a0e3caf9..f3854409 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/ClientConnectRecordListReq.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/ClientConnectRecordListReq.java
@@ -29,5 +29,8 @@ import lombok.Data;
  */
 @Data
 public class ClientConnectRecordListReq {
-
+    /**
+     * licenseId
+     */
+    private Integer licenseId;
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserLoginRecordListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserLoginRecordListReq.java
index 82c11c7e..5dc4c32c 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserLoginRecordListReq.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserLoginRecordListReq.java
@@ -30,5 +30,8 @@ import lombok.Data;
  */
 @Data
 public class UserLoginRecordListReq {
-
+    /**
+     * 用户ID
+     */
+    private Integer userId;
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java
index d04eed96..66f46d4d 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java
@@ -51,6 +51,7 @@ public class ClientConnectRecordService {
     public PageInfo<ClientConnectRecordListRes> page(PageQuery pageQuery, ClientConnectRecordListReq req) {
         Page<ClientConnectRecordListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
         List<ClientConnectRecordDO> list = clientConnectRecordMapper.selectList(new LambdaQueryWrapper<ClientConnectRecordDO>()
+                        .eq(null != req.getLicenseId(), ClientConnectRecordDO::getLicenseId, req.getLicenseId())
                 .orderByDesc(ClientConnectRecordDO::getId)
         );
         List<ClientConnectRecordListRes> respList = mapperFacade.mapAsList(list, ClientConnectRecordListRes.class);
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java
index bf55ac33..1670b3df 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java
@@ -41,6 +41,7 @@ public class UserLoginRecordService {
     public PageInfo<UserLoginRecordListRes> page(PageQuery pageQuery, UserLoginRecordListReq req) {
         Page<UserLoginRecordListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
         List<UserLoginRecordDO> list = userLoginRecordMapper.selectList(new LambdaQueryWrapper<UserLoginRecordDO>()
+                        .eq(null != req.getUserId(), UserLoginRecordDO::getUserId, req.getUserId())
                 .orderByDesc(UserLoginRecordDO::getCreateTime)
         );
         List<UserLoginRecordListRes> respList = mapperFacade.mapAsList(list, UserLoginRecordListRes.class);