From 89204d23f3ffd0a0f33d0eac548ee9c8a64a3446 Mon Sep 17 00:00:00 2001
From: zCans <1224895921@qq.com>
Date: Wed, 28 Sep 2022 23:10:06 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=202=E3=80=81=E8=B0=83=E5=BA=A6=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=A2=9E=E5=8A=A0=E8=B0=83=E5=BA=A6=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/src/api/jobInfo.js       |  7 +++
 .../src/views/system/jobLog.vue               | 56 ++++++++++++++-----
 .../src/views/system/jobManager.vue           |  6 +-
 .../server/constant/AlarmStatusEnum.java      |  1 +
 .../proxy/server/service/JobLogService.java   |  2 +-
 5 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/neutrino-proxy-admin/src/api/jobInfo.js b/neutrino-proxy-admin/src/api/jobInfo.js
index 961935b9..570a0a31 100644
--- a/neutrino-proxy-admin/src/api/jobInfo.js
+++ b/neutrino-proxy-admin/src/api/jobInfo.js
@@ -34,3 +34,10 @@ export function updateJobInfo(data) {
     data: data
   })
 }
+
+export function jobList() {
+  return request({
+    url: '/job-info/findList',
+    method: 'get'
+  })
+}
diff --git a/neutrino-proxy-admin/src/views/system/jobLog.vue b/neutrino-proxy-admin/src/views/system/jobLog.vue
index b1803f23..94340f77 100644
--- a/neutrino-proxy-admin/src/views/system/jobLog.vue
+++ b/neutrino-proxy-admin/src/views/system/jobLog.vue
@@ -1,50 +1,49 @@
 <template>
   <div class="app-container calendar-list-container">
     <div class="filter-container">
+      <el-select v-model="listQuery.jobId" placeholder="请选择" clearable>
+        <el-option v-for="item in jobList" :key="item.id" :label="item.desc" :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>
 
     <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row style="width: 100%">
-      <el-table-column align="center" :label="$t('table.id')" width="100">
-        <template slot-scope="scope">
-          <span>{{scope.row.id}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" :label="$t('table.handler')" width="200">
+      <el-table-column type="index" width="100" :label="$t('table.id')"></el-table-column>
+      <el-table-column align="center" :label="$t('table.handler')" min-width="200">
         <template slot-scope="scope">
           <span>{{scope.row.handler}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.jobParam')" width="200">
+      <el-table-column align="center" :label="$t('table.jobParam')" min-width="200">
         <template slot-scope="scope">
           <span>{{scope.row.param}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.jobLogCode')" width="120">
+      <el-table-column align="center" :label="$t('table.jobLogCode')" min-width="120">
         <template slot-scope="scope">
           <el-tag :type="scope.row.code | statusFilter">{{scope.row.code | statusName}}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.jobLogMsg')" width="400">
+      <el-table-column align="center" :label="$t('table.jobLogMsg')" min-width="400">
         <template slot-scope="scope">
           <span>{{scope.row.msg}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.alarmStatus')" width="120">
+      <el-table-column align="center" :label="$t('table.alarmStatus')" min-width="120">
         <template slot-scope="scope">
-          <span>{{scope.row.alarmStatus}}</span>
+          <el-tag :type="scope.row.alarmStatus | alarmStatusFilter">{{scope.row.alarmStatus | salarmStatusName}}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.createTime')" width="150">
+      <el-table-column align="center" :label="$t('table.createTime')" min-width="150">
         <template slot-scope="scope">
           <span>{{scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.actions')" min-width="120">
+<!--      <el-table-column align="center" :label="$t('table.actions')" min-width="120">
         <template slot-scope="scope">
           <el-button size="mini" type="primary" @click="handleShowClick(scope.row)">查看日志</el-button>
         </template>
-      </el-table-column>
+      </el-table-column>-->
     </el-table>
     <div class="pagination-container">
       <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.currentPage"
@@ -56,6 +55,7 @@
 
 <script>
 import { fetchList } from '@/api/jobLog'
+import { jobList } from '@/api/jobInfo'
 import waves from '@/directive/waves' // 水波纹指令
 
 export default {
@@ -73,7 +73,8 @@ export default {
         currentPage: 1,
         pageSize: 20,
         jobId: undefined
-      }
+      },
+      jobList: []
     }
   },
   filters: {
@@ -90,12 +91,32 @@ export default {
         1: 'danger'
       }
       return statusMap[status]
+    },
+    salarmStatusName(status) {
+      const statusMap = {
+        0: '-',
+        1: '待发送',
+        2: '发送成功',
+        3: '发送失败'
+      }
+      return statusMap[status]
+    },
+    alarmStatusFilter(status) {
+      const statusMap = {
+        0: 'success',
+        1: 'warning',
+        2: 'success',
+        3: 'danger'
+      }
+      return statusMap[status]
     }
   },
   created() {
     this.getList()
+    this.getJobList()
   },
   activated() {
+    this.getJobList()
     if (this.$route.query.jobId) {
       this.listQuery.jobId = this.$route.query.jobId
       console.log(this.listQuery.jobId, this.$route.query.jobId)
@@ -111,6 +132,11 @@ export default {
         this.listLoading = false
       })
     },
+    getJobList() {
+      jobList().then(response => {
+        this.jobList = response.data.data
+      })
+    },
     handleFilter() {
       this.listQuery.currentPage = 1
       this.getList()
diff --git a/neutrino-proxy-admin/src/views/system/jobManager.vue b/neutrino-proxy-admin/src/views/system/jobManager.vue
index 83266050..1521f03d 100644
--- a/neutrino-proxy-admin/src/views/system/jobManager.vue
+++ b/neutrino-proxy-admin/src/views/system/jobManager.vue
@@ -5,11 +5,7 @@
     </div>
 
     <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row style="width: 100%">
-      <el-table-column align="center" :label="$t('table.id')" width="100">
-        <template slot-scope="scope">
-          <span>{{scope.row.id}}</span>
-        </template>
-      </el-table-column>
+      <el-table-column type="index" width="100" :label="$t('table.id')"></el-table-column>
       <el-table-column align="center" :label="$t('table.desc')" width="200">
         <template slot-scope="scope">
           <span>{{scope.row.desc}}</span>
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/AlarmStatusEnum.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/AlarmStatusEnum.java
index 05d6aa62..e2fdb3e5 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/AlarmStatusEnum.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/AlarmStatusEnum.java
@@ -32,6 +32,7 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum AlarmStatusEnum {
+	NOT(0, "-"),
 	WAIT(1, "待发送"),
 	SUCCESS(2, "发送成功"),
 	ERROR(3, "发送失败");
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java
index 63d14c9b..be71423a 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java
@@ -77,7 +77,7 @@ public class JobLogService implements IJobCallback {
 	public Page<JobLogListRes> page(PageQuery pageQuery, JobLogListReq req) {
 		Page<JobLogListRes> page = Page.create(pageQuery);
 
-		if(req.getJobId() != null){
+		if(req.getJobId() != null && req.getJobId() > 0){
 			jobLogMapper.pageByJobId(page, req);
 		} else {
 			jobLogMapper.page(page, req);