From 0dcee95a456833f841c26f12ed990107f60da879 Mon Sep 17 00:00:00 2001
From: wangys <3401275564@qq.com>
Date: Wed, 19 Nov 2025 10:50:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B2=E6=9F=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/dto/crontab/TbCrontabTask.java     | 26 +++++++++++++++++
 .../resources/mapper/CrontabTaskMapper.xml    | 28 ++++++++++++++++++-
 schoolNewsWeb/src/types/crontab/index.ts      |  4 +++
 .../admin/manage/crontab/NewsCrawlerView.vue  | 12 ++++----
 4 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabTask.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabTask.java
index ce1a447..a884bf7 100644
--- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabTask.java
+++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabTask.java
@@ -176,6 +176,32 @@ public class TbCrontabTask extends BaseDTO {
         this.description = description;
     }
 
+    /**
+     * @description 元数据名称（来自 tb_crontab_task_meta.name）
+     */
+    private String metaName;
+
+    /**
+     * @description 元数据描述（来自 tb_crontab_task_meta.description）
+     */
+    private String metaDescription;
+
+    public String getMetaName() {
+        return metaName;
+    }
+
+    public void setMetaName(String metaName) {
+        this.metaName = metaName;
+    }
+
+    public String getMetaDescription() {
+        return metaDescription;
+    }
+
+    public void setMetaDescription(String metaDescription) {
+        this.metaDescription = metaDescription;
+    }
+
     public Integer getConcurrent() {
         return concurrent;
     }
diff --git a/schoolNewsServ/crontab/src/main/resources/mapper/CrontabTaskMapper.xml b/schoolNewsServ/crontab/src/main/resources/mapper/CrontabTaskMapper.xml
index ad3b592..c0eea02 100644
--- a/schoolNewsServ/crontab/src/main/resources/mapper/CrontabTaskMapper.xml
+++ b/schoolNewsServ/crontab/src/main/resources/mapper/CrontabTaskMapper.xml
@@ -24,6 +24,8 @@
         <result column="update_time" property="updateTime" />
         <result column="delete_time" property="deleteTime" />
         <result column="deleted" property="deleted" />
+        <result column="meta_name" property="metaName" />
+        <result column="meta_description" property="metaDescription" />
     </resultMap>
 
     <!-- 字段列表 -->
@@ -233,9 +235,33 @@
 
     <!-- 分页查询任务列表 -->
     <select id="selectTaskPage" resultMap="BaseResultMap">
-        SELECT DISTINCT ct.*
+        SELECT DISTINCT
+            ct.id,
+            ct.task_id,
+            ct.task_name,
+            ct.task_group,
+            ct.bean_name,
+            ct.method_name,
+            ct.method_params,
+            ct.meta_id,
+            ct.default_recipient,
+            ct.cron_expression,
+            ct.status,
+            ct.description,
+            ct.concurrent,
+            ct.misfire_policy,
+            ct.creator,
+            ct.updater,
+            ct.create_time,
+            ct.update_time,
+            ct.delete_time,
+            ct.deleted,
+            m.name        AS meta_name,
+            m.description AS meta_description
         FROM tb_crontab_task ct
         <include refid="Permission_Filter" />
+        LEFT JOIN tb_crontab_task_meta m
+            ON ct.meta_id = m.meta_id AND m.deleted = 0
         WHERE ct.deleted = 0
             <if test="filter != null">
                 <if test="filter.ID != null and filter.ID != ''">
diff --git a/schoolNewsWeb/src/types/crontab/index.ts b/schoolNewsWeb/src/types/crontab/index.ts
index 47f0c77..b8056d8 100644
--- a/schoolNewsWeb/src/types/crontab/index.ts
+++ b/schoolNewsWeb/src/types/crontab/index.ts
@@ -40,6 +40,10 @@ export interface CrontabTask extends BaseDTO {
   creator?: string;
   /** 更新者 */
   updater?: string;
+  /** 元数据名称（tb_crontab_task_meta.name） */
+  metaName?: string;
+  /** 元数据描述（tb_crontab_task_meta.description） */
+  metaDescription?: string;
 }
 
 /**
diff --git a/schoolNewsWeb/src/views/admin/manage/crontab/NewsCrawlerView.vue b/schoolNewsWeb/src/views/admin/manage/crontab/NewsCrawlerView.vue
index d76d251..080c28f 100644
--- a/schoolNewsWeb/src/views/admin/manage/crontab/NewsCrawlerView.vue
+++ b/schoolNewsWeb/src/views/admin/manage/crontab/NewsCrawlerView.vue
@@ -83,20 +83,20 @@
 
               <div class="card-content">
                 <div class="info-item">
-                  <span class="info-label">Bean名称：</span>
-                  <span class="info-value">{{ crawler.beanName }}</span>
+                  <span class="info-label">定时任务类型：</span>
+                  <span class="info-value">{{ crawler.taskGroup }}</span>
                 </div>
                 <div class="info-item">
-                  <span class="info-label">方法名称：</span>
-                  <span class="info-value">{{ crawler.methodName }}</span>
+                  <span class="info-label">定时任务：</span>
+                  <span class="info-value">{{ crawler.metaName }}</span>
                 </div>
                 <div class="info-item">
                   <span class="info-label">执行周期：</span>
                   <span class="info-value">{{ crawler.cronExpression }}</span>
                 </div>
-                <div class="info-item" v-if="crawler.description">
+                <div class="info-item" v-if="crawler.description || crawler.metaDescription">
                   <span class="info-label">描述：</span>
-                  <span class="info-value">{{ crawler.description }}</span>
+                  <span class="info-value">{{ crawler.description || crawler.metaDescription }}</span>
                 </div>
               </div>