Merge remote-tracking branch 'origin/feature/1.7.1' into feature/1.7.1

neutrino-proxy-admin/src/views/proxy/license.vue

@@ -1,6 +1,15 @@
 <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-select v-model="listQuery.isOnline" placeholder="请选择在线状态" clearable>
+        <el-option v-for="item in selectObj.onlineOptions" :key="item.value" :label="item.label" :value="item.value"/>
+      </el-select>
+      <el-select v-model="listQuery.enable" placeholder="请选择启用状态" clearable>
+        <el-option v-for="item in selectObj.statusOptions" :key="item.value" :label="item.label" :value="item.value"/>
+      </el-select>
       <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{$t('table.search')}}</el-button>
       <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="el-icon-edit">{{$t('table.add')}}</el-button>
     </div>
@@ -134,9 +143,9 @@
         listQuery: {
           current: 1,
           size: 10,
-          importance: undefined,
-          title: undefined,
-          type: undefined
+          enable: undefined,
+          isOnline: undefined,
+          userId: null
         },
         importanceOptions: [1, 2, 3],
         calendarTypeOptions,
@@ -165,7 +174,11 @@
           userId: [{ required: true, message: '请选择用户', trigger: 'blur' }],
           name: [{ required: true, message: 'License名称不能为空', trigger: 'blur' }]
         },
-        downloadLoading: false
+        downloadLoading: false,
+        selectObj: {
+          statusOptions: [{ label: '启用', value: 1 }, { label: '禁用', value: 2 }],
+          onlineOptions: [{ label: '在线', value: 1 }, { label: '离线', value: 2 }]
+        }
       }
     },
     filters: {
@@ -195,8 +208,7 @@
       }
     },
     created() {
-      this.getList()
-      this.getUserList()
+      this.getDataList()
     },
     methods: {
       getList() {
@@ -212,6 +224,17 @@
           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()

neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/LicenseListReq.java

@@ -31,4 +31,7 @@ import lombok.Data;
 @Data
 public class LicenseListReq {
 
+    private Integer userId;
+    private Integer isOnline;
+    private Integer enable;
 }

neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java

@@ -51,7 +51,10 @@ public class LicenseService implements Lifecycle {
 	public PageInfo<LicenseListRes> page(PageQuery pageQuery, LicenseListReq req) {
 		Page<LicenseListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
 		List<LicenseDO> list = licenseMapper.selectList(new LambdaQueryWrapper<LicenseDO>()
-				.orderByAsc(LicenseDO::getId)
+						.eq(req.getUserId() != null, LicenseDO::getUserId, req.getUserId())
+						.eq(req.getIsOnline() != null, LicenseDO::getIsOnline, req.getIsOnline())
+						.eq(req.getEnable() != null, LicenseDO::getEnable, req.getEnable())
+				.orderByAsc(Arrays.asList(LicenseDO::getUserId, LicenseDO::getId))
 		);
 		List<LicenseListRes> respList = mapperFacade.mapAsList(list, LicenseListRes.class);
 		if (CollectionUtils.isEmpty(list)) {