From 42f057e9543939da6dbb94fff5f86849048fdfcb Mon Sep 17 00:00:00 2001
From: wangbing <Wb295490665>
Date: Mon, 9 Nov 2020 17:26:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/frame/schedule/RunTask.java          | 32 +++++++++++++++++--
 .../module/wsys/req/LogtaskFindRequest.java   |  2 +-
 .../resources/templates/control/nav.ftl       |  2 +-
 .../templates/screen/module/wsys/logtask.ftl  | 25 +++++++--------
 4 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/modules/SpringBoot/java/frame/schedule/RunTask.java b/src/main/resources/modules/SpringBoot/java/frame/schedule/RunTask.java
index 2298163e..5325d095 100644
--- a/src/main/resources/modules/SpringBoot/java/frame/schedule/RunTask.java
+++ b/src/main/resources/modules/SpringBoot/java/frame/schedule/RunTask.java
@@ -1,7 +1,12 @@
 package ${domain}.frame.schedule;
 
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import ${domain}.frame.auth.LocalData;
+import ${domain}.frame.utils.LogUtil;
+import ${domain}.module.wsys.mgr.LogtaskManager;
+import ${domain}.module.wsys.req.LogtaskCreateRequest;
 
+import java.util.Date;
 import java.util.concurrent.ScheduledFuture;
 
 /**
@@ -27,14 +32,38 @@ public abstract class RunTask implements Runnable {
 
     @Override
     public void run() {
+        LogtaskCreateRequest request = new LogtaskCreateRequest();
+        request.setTaskId(taskId());
+        request.setTaskName(taskName());
+        request.setStartTime(new Date());
         try {
             boolean before = before();
             if (before) {
                 task();
             }
             after();
+            request.setExecState("1");
+            request.setExecResult("成功");
+            request.setEndTime(new Date());
         } catch (Exception e) {
             exception(e);
+            // 保证异常信息不会超过字段长度
+            String trace = LogUtil.getTrace(e);
+            if (trace.length() > 500) {
+                trace = trace.substring(0, 500);
+            }
+            request.setExecState("0");
+            request.setExecResult(String.format("失败[%s]", trace));
+            request.setEndTime(new Date());
+        }
+        try {
+
+            request.setExecTime((int) (request.getEndTime().getTime() - request.getStartTime().getTime()));
+            LogtaskManager logtaskManager = LocalData.getBean(LogtaskManager.class);
+            assert logtaskManager != null;
+            logtaskManager.create(request, LocalData.getSysToken());
+        } catch (Exception ignored) {
+
         }
     }
 
@@ -61,5 +90,4 @@ public abstract class RunTask implements Runnable {
     }
 
     public abstract ScheduledFuture<?> schedule(ThreadPoolTaskScheduler poolTaskScheduler);
-}
-
+}
\ No newline at end of file
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogtaskFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogtaskFindRequest.java
index 173bca08..9062f4a5 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogtaskFindRequest.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogtaskFindRequest.java
@@ -41,7 +41,7 @@ public class LogtaskFindRequest extends BaseFindRequest {
     /**
      * 执行状态精确查询.
      */
-    @Select()
+    @Select({"1", "0"})
     private String execState;
 
     /**
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl b/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl
index 5704e0b1..302c5be3 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl
@@ -999,7 +999,7 @@
         ' :split-button="splitButton" ' +
         ' @click="onCommand(0)" ' +
         ' @command="onCommand"><i :class="items[0].icon"></i>{{items[0].value}}' +
-        '  <el-dropdown-menu slot="dropdown">' +
+        '  <el-dropdown-menu slot="dropdown" style="white-space: nowrap">' +
         '    <el-dropdown-item v-for="(item,index) in items" :key="index" v-if="index != 0" :command="index" :icon="item.icon">' +
         '      {{item.value}}' +
         '    </el-dropdown-item>' +
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl
index f06b8ae5..4d188d14 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl
@@ -88,13 +88,7 @@
             </el-table-column>
             <el-table-column
                     align="center"
-                    width="140"
-                    prop="id"
-                    label="主键">
-            </el-table-column>
-            <el-table-column
-                    align="center"
-                    min-width="180"
+                    min-width="120"
                     prop="taskId"
                     label="任务ID">
             </el-table-column>
@@ -104,6 +98,16 @@
                     prop="taskName"
                     label="任务名称">
             </el-table-column>
+            <el-table-column
+                    align="center"
+                    min-width="100"
+                    prop="execState"
+                    label="执行状态">
+                <template slot-scope="scope">
+                    <el-tag size="mini" v-if="scope.row.execState == '1'">成功</el-tag>
+                    <el-tag size="mini" v-if="scope.row.execState == '0'">失败</el-tag>
+                </template>
+            </el-table-column>
             <el-table-column
                     align="center"
                     min-width="140"
@@ -121,13 +125,8 @@
                     min-width="80"
                     prop="execTime"
                     label="执行耗时">
-            </el-table-column>
-            <el-table-column
-                    align="center"
-                    min-width="100"
-                    prop="execState"
-                    label="执行状态">
                 <template slot-scope="scope">
+                    <span>{{scope.row.execTime}}ms</span>
                 </template>
             </el-table-column>
             <el-table-column