定时任务

jsconfig.json

@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["src/*"]
+    },
+    "target": "es5",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "allowJs": true,
+    "checkJs": false
+  },
+  "include": ["src/**/*.js", "src/**/*.vue"],
+  "exclude": ["node_modules", "dist"]
+}

src/api/monitor/job.js

@@ -1,80 +0,0 @@
-import request from '@/utils/request'
-
-// 查询定时任务调度列表
-export function listJob(query) {
-  return request({
-    url: '/monitor/job/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询定时任务调度详细
-export function getJob(jobId) {
-  return request({
-    url: '/monitor/job/' + jobId,
-    method: 'get'
-  })
-}
-
-// 新增定时任务调度
-export function addJob(data) {
-  return request({
-    url: '/monitor/job',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改定时任务调度
-export function updateJob(data) {
-  return request({
-    url: '/monitor/job',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除定时任务调度
-export function delJob(jobId) {
-  return request({
-    url: '/monitor/job/' + jobId,
-    method: 'delete'
-  })
-}
-
-// 导出定时任务调度
-export function exportJob(query) {
-  return request({
-    url: '/monitor/job/export',
-    method: 'get',
-    params: query
-  })
-}
-
-// 任务状态修改
-export function changeJobStatus(jobId, status) {
-  const data = {
-    jobId,
-    status
-  }
-  return request({
-    url: '/monitor/job/changeStatus',
-    method: 'put',
-    data: data
-  })
-}
-
-
-// 定时任务立即执行一次
-export function runJob(jobId, jobGroup) {
-  const data = {
-    jobId,
-    jobGroup
-  }
-  return request({
-    url: '/monitor/job/run',
-    method: 'put',
-    data: data
-  })
-}

src/api/monitor/jobTemplate.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// ��ѯ����ģ���б�
+export function listTemplate(query) {
+  return request({
+    url: '/monitor/tenantJob/template/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// ��ѯ����ģ����ϸ
+export function getTemplate(templateId) {
+  return request({
+    url: '/monitor/tenantJob/template/' + templateId,
+    method: 'get'
+  })
+}
+
+// ��������ģ��
+export function addTemplate(data) {
+  return request({
+    url: '/monitor/tenantJob/template',
+    method: 'post',
+    data: data
+  })
+}
+
+// �޸�����ģ��
+export function updateTemplate(data) {
+  return request({
+    url: '/monitor/tenantJob/template',
+    method: 'put',
+    data: data
+  })
+}
+
+// ɾ������ģ��
+export function delTemplate(templateIds) {
+  return request({
+    url: '/monitor/tenantJob/template/' + templateIds,
+    method: 'delete'
+  })
+}

src/api/monitor/taskRegistry.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// Bean registry list (paginated)
+export function listTaskRegistry(query) {
+  return request({
+    url: '/monitor/taskRegistry/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// Refresh Bean registry cache
+export function refreshTaskRegistry() {
+  return request({
+    url: '/monitor/taskRegistry/refresh',
+    method: 'post'
+  })
+}

src/api/monitor/tenantJob.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+export function listJobTemplate(query) {
+  return request({
+    url: '/monitor/tenantJob/template/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listTenantScopeTemplates() {
+  return request({
+    url: '/monitor/tenantJob/template/tenantScope',
+    method: 'get'
+  })
+}
+
+export function getTenantJobConfig(tenantId) {
+  return request({
+    url: '/monitor/tenantJob/config/' + tenantId,
+    method: 'get'
+  })
+}
+
+export function saveTenantJobConfig(data) {
+  return request({
+    url: '/monitor/tenantJob/config',
+    method: 'put',
+    data: data
+  })
+}
+
+export function syncTenantJob(tenantId) {
+  return request({
+    url: '/monitor/tenantJob/sync/' + tenantId,
+    method: 'post'
+  })
+}
+
+export function syncAllTenantJob() {
+  return request({
+    url: '/monitor/tenantJob/syncAll',
+    method: 'post'
+  })
+}
+
+export function updateTenantJobStatus(configId, status) {
+  return request({
+    url: '/monitor/tenantJob/config/status',
+    method: 'put',
+    params: { configId, status }
+  })
+}

src/views/monitor/job/index.vue

@@ -1,33 +1,22 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="模板编码" prop="templateCode">
+        <el-input v-model="queryParams.templateCode" placeholder="请输入模板编码" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item label="任务名称" prop="jobName">
-        <el-input
-          v-model="queryParams.jobName"
-          placeholder="请输入任务名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.jobName" placeholder="请输入任务名称" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="任务组名" prop="jobGroup">
-        <el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable size="small">
-          <el-option
-            v-for="dict in jobGroupOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
+      <el-form-item label="作用域" prop="scope">
+        <el-select v-model="queryParams.scope" placeholder="请选择" clearable size="small">
+          <el-option label="租户级" value="TENANT" />
+          <el-option label="平台级" value="PLATFORM" />
         </el-select>
       </el-form-item>
-      <el-form-item label="任务状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable size="small">
-          <el-option
-            v-for="dict in statusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
+          <el-option label="启用" value="0" />
+          <el-option label="停用" value="1" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -38,127 +27,73 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['monitor:job:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['monitor:job:add']">新增模板</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['monitor:job:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['monitor:job:edit']"
-        >修改</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['monitor:job:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['monitor:job:remove']"
-        >删除</el-button>
+        <el-button type="info" plain icon="el-icon-notebook-2" size="mini" @click="handleTaskRegistry" v-hasPermi="['monitor:job:add']">Bean注册表</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['monitor:job:export']"
-        >导出</el-button>
+        <el-button type="primary" plain icon="el-icon-user" size="mini" @click="handleTenantJobConfig" v-hasPermi="['monitor:job:edit']">租户任务配置</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-s-operation"
-          size="mini"
-          @click="handleJobLog"
-          v-hasPermi="['monitor:job:query']"
-        >日志</el-button>
+        <el-button type="info" plain icon="el-icon-s-operation" size="mini" @click="handleJobLog" v-hasPermi="['monitor:job:query']">任务日志</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="templateList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务编号" width="100" align="center" prop="jobId" />
+      <el-table-column label="模板编码" width="140" align="center" prop="templateCode" :show-overflow-tooltip="true" />
       <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
       <el-table-column label="任务组名" align="center" prop="jobGroup">
         <template slot-scope="scope">
           <dict-tag :options="jobGroupOptions" :value="scope.row.jobGroup"/>
         </template>
       </el-table-column>
-      <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
-      <el-table-column label="cron执行表达式" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
-      <el-table-column label="状态" align="center">
+      <el-table-column label="调用目标" align="center" prop="invokeTarget" :show-overflow-tooltip="true" min-width="180" />
+      <el-table-column label="cron表达式" align="center" prop="cronExpression" :show-overflow-tooltip="true" width="140" />
+      <el-table-column label="作用域" align="center" width="80">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.scope === 'PLATFORM'" size="mini">平台</el-tag>
+          <el-tag v-else type="success" size="mini">租户</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="默认状态" align="center" width="80">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.defaultStatus === '0'" type="primary" size="mini">运行</el-tag>
+          <el-tag v-else type="warning" size="mini">暂停</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="启用" align="center" width="60">
         <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="0"
-            inactive-value="1"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
+          <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleTemplateStatusChange(scope.row)" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['monitor:job:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['monitor:job:remove']"
-          >删除</el-button>
-          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']">
-            <span class="el-dropdown-link">
-              <i class="el-icon-d-arrow-right el-icon--right"></i>更多
-            </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="handleRun" icon="el-icon-caret-right"
-                v-hasPermi="['monitor:job:changeStatus']">执行一次</el-dropdown-item>
-              <el-dropdown-item command="handleView" icon="el-icon-view"
-                v-hasPermi="['monitor:job:query']">任务详细</el-dropdown-item>
-              <el-dropdown-item command="handleJobLog" icon="el-icon-s-operation"
-                v-hasPermi="['monitor:job:query']">调度日志</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['monitor:job:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['monitor:job:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
-    <!-- 添加或修改定时任务对话框 -->
+    <!-- 添加/修改任务模板对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="模板编码" prop="templateCode">
+              <el-input v-model="form.templateCode" placeholder="请输入模板编码" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="任务名称" prop="jobName">
               <el-input v-model="form.jobName" placeholder="请输入任务名称" />
@@ -167,44 +102,41 @@
           <el-col :span="12">
             <el-form-item label="任务分组" prop="jobGroup">
               <el-select v-model="form.jobGroup" placeholder="请选择">
-                <el-option
-                  v-for="dict in jobGroupOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
+                <el-option v-for="dict in jobGroupOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="模块标签" prop="moduleTag">
+              <el-input v-model="form.moduleTag" placeholder="请输入模块标签" />
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item prop="invokeTarget">
               <span slot="label">
                 调用方法
                 <el-tooltip placement="top">
-                  <div slot="content">
-                    Bean调用示例：Task.Params('fs')
-                    <br />Class类调用示例：com.fs.quartz.task.Task.params('fs')
-                    <br />参数说明：支持字符串，布尔类型，长整型，浮点型，整型
-                  </div>
+                  <div slot="content">Bean调用示例：liveTask.deliveryOp()<br />参数说明：支持无参方法的直接调用</div>
                   <i class="el-icon-question"></i>
                 </el-tooltip>
               </span>
-              <el-input v-model="form.invokeTarget" placeholder="请输入调用目标字符串" />
+              <el-input v-model="form.invokeTarget" placeholder="请输入调用目标字符串">
+                <template slot="append">
+                  <el-button @click="openRegistry = true; initRegistry()">从注册表选择</el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="cron表达式" prop="cronExpression">
               <el-input v-model="form.cronExpression" placeholder="请输入cron执行表达式">
                 <template slot="append">
-                  <el-button type="primary" @click="handleShowCron">
-                    生成表达式
-                    <i class="el-icon-time el-icon--right"></i>
-                  </el-button>
+                  <el-button type="primary" @click="handleShowCron">生成表达式<i class="el-icon-time el-icon--right"></i></el-button>
                 </template>
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="错误策略" prop="misfirePolicy">
               <el-radio-group v-model="form.misfirePolicy" size="small">
                 <el-radio-button label="1">立即执行</el-radio-button>
@@ -222,13 +154,26 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="状态">
+            <el-form-item label="作用域">
+              <el-radio-group v-model="form.scope" size="small">
+                <el-radio-button label="TENANT">租户级</el-radio-button>
+                <el-radio-button label="PLATFORM">平台级</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="默认租户状态">
+              <el-radio-group v-model="form.defaultStatus" size="small">
+                <el-radio-button label="0">运行</el-radio-button>
+                <el-radio-button label="1">暂停</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="模板状态">
               <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in statusOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictValue"
-                >{{dict.dictLabel}}</el-radio>
+                <el-radio-button label="0">启用</el-radio-button>
+                <el-radio-button label="1">停用</el-radio-button>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -240,62 +185,84 @@
       </div>
     </el-dialog>
 
+    <!-- Cron表达式生成器 -->
     <el-dialog title="Cron表达式生成器" :visible.sync="openCron" append-to-body class="scrollbar">
       <crontab @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
     </el-dialog>
 
-    <!-- 任务日志详细 -->
-    <el-dialog title="任务详细" :visible.sync="openView" width="700px" append-to-body>
-      <el-form ref="form" :model="form" label-width="120px" size="mini">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="任务编号：">{{ form.jobId }}</el-form-item>
-            <el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="任务分组：">{{ jobGroupFormat(form) }}</el-form-item>
-            <el-form-item label="创建时间：">{{ form.createTime }}</el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="cron表达式：">{{ form.cronExpression }}</el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="下次执行时间：">{{ parseTime(form.nextValidTime) }}</el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="调用目标方法：">{{ form.invokeTarget }}</el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="任务状态：">
-              <div v-if="form.status == 0">正常</div>
-              <div v-else-if="form.status == 1">失败</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="是否并发：">
-              <div v-if="form.concurrent == 0">允许</div>
-              <div v-else-if="form.concurrent == 1">禁止</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="执行策略：">
-              <div v-if="form.misfirePolicy == 0">默认策略</div>
-              <div v-else-if="form.misfirePolicy == 1">立即执行</div>
-              <div v-else-if="form.misfirePolicy == 2">执行一次</div>
-              <div v-else-if="form.misfirePolicy == 3">放弃执行</div>
-            </el-form-item>
-          </el-col>
-        </el-row>
+    <!-- Bean 注册表 -->
+    <el-dialog title="可调度 Bean 方法（invoke_target 参考）" :visible.sync="openRegistry" width="960px" append-to-body @open="initRegistry">
+      <el-form :model="registryQueryParams" ref="registryQueryForm" :inline="true" size="small">
+        <el-form-item label="Bean" prop="beanName">
+          <el-input v-model="registryQueryParams.beanName" placeholder="Bean 名称" clearable @keyup.enter.native="handleRegistryQuery" />
+        </el-form-item>
+        <el-form-item label="方法" prop="methodName">
+          <el-input v-model="registryQueryParams.methodName" placeholder="方法名" clearable @keyup.enter.native="handleRegistryQuery" />
+        </el-form-item>
+        <el-form-item label="调用目标" prop="invokeTarget">
+          <el-input v-model="registryQueryParams.invokeTarget" placeholder="invoke_target" clearable @keyup.enter.native="handleRegistryQuery" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleRegistryQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetRegistryQuery">重置</el-button>
+        </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="openView = false">关 闭</el-button>
-      </div>
+      <el-table v-loading="registryLoading" :data="registryList" max-height="420">
+        <el-table-column label="Bean" prop="beanName" width="180" show-overflow-tooltip />
+        <el-table-column label="类名" prop="className" width="160" show-overflow-tooltip />
+        <el-table-column label="方法" prop="methodName" width="160" show-overflow-tooltip />
+        <el-table-column label="调用目标" prop="invokeTarget" show-overflow-tooltip />
+        <el-table-column label="操作" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="applyInvokeTarget(scope.row)">选用</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="registryTotal > 0" :total="registryTotal" :page.sync="registryQueryParams.pageNum" :limit.sync="registryQueryParams.pageSize" @pagination="getRegistryList" />
+    </el-dialog>
+
+    <!-- 租户任务配置 -->
+    <el-dialog title="租户定时任务配置" :visible.sync="openTenantJob" width="960px" append-to-body @open="loadTenantJobDialog">
+      <el-form :inline="true" size="small">
+        <el-form-item label="租户">
+          <el-select v-model="tenantJobForm.tenantId" filterable placeholder="选择租户" style="width: 280px" @change="loadTenantJobSelection">
+            <el-option v-for="t in tenantOptions" :key="t.id" :label="t.tenantName + ' (' + t.tenantCode + ')'" :value="t.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="success" size="mini" :disabled="!tenantJobForm.tenantId" @click="doSyncTenantJob">同步到租户库</el-button>
+          <el-button type="warning" size="mini" @click="doSyncAllTenantJob">同步全部租户</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="tenantJobLoading" :data="tenantJobConfigList" max-height="420" v-if="tenantJobForm.tenantId">
+        <el-table-column label="任务名称" prop="jobName" min-width="140" show-overflow-tooltip />
+        <el-table-column label="模板编码" prop="templateCode" width="140" show-overflow-tooltip />
+        <el-table-column label="调用目标" prop="invokeTarget" min-width="180" show-overflow-tooltip />
+        <el-table-column label="cron" prop="defaultCronExpression" width="140" show-overflow-tooltip />
+        <el-table-column label="状态" width="80" align="center">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleTenantJobStatusChange(scope.row)" />
+          </template>
+        </el-table-column>
+        <el-table-column label="同步状态" width="80" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.syncStatus === '1'" type="success" size="mini">已同步</el-tag>
+            <el-tag v-else-if="scope.row.syncStatus === '2'" type="danger" size="mini">失败</el-tag>
+            <el-tag v-else type="info" size="mini">未同步</el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-empty v-if="tenantJobForm.tenantId && !tenantJobLoading && !tenantJobConfigList.length" description="暂未同步，请点击「同步到租户库」按钮" />
+      <el-empty v-if="!tenantJobForm.tenantId" description="请先选择租户" />
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { listJob, getJob, delJob, addJob, updateJob, exportJob, runJob, changeJobStatus } from "@/api/monitor/job";
+import { listTemplate, getTemplate, addTemplate, updateTemplate, delTemplate } from "@/api/monitor/jobTemplate";
+import { listTaskRegistry } from "@/api/monitor/taskRegistry";
+import { getTenantJobConfig, updateTenantJobStatus, syncTenantJob, syncAllTenantJob } from "@/api/monitor/tenantJob";
+import { tenantList } from "@/api/tenant/tenant";
 import Crontab from '@/components/Crontab'
 
 export default {
@@ -303,246 +270,142 @@ export default {
   name: "Job",
   data() {
     return {
-      // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 选中数组
       ids: [],
-      // 非单个禁用
       single: true,
-      // 非多个禁用
       multiple: true,
-      // 显示搜索条件
       showSearch: true,
-      // 总条数
       total: 0,
-      // 定时任务表格数据
-      jobList: [],
-      // 弹出层标题
+      templateList: [],
       title: "",
-      // 是否显示弹出层
       open: false,
-      // 是否显示详细弹出层
-      openView: false,
-      // 是否显示Cron表达式弹出层
       openCron: false,
-      // 传入的表达式
       expression: "",
-      // 任务组名字典
+      // Bean 注册表
+      openRegistry: false,
+      registryLoading: false,
+      registryList: [],
+      registryTotal: 0,
+      registryQueryParams: { pageNum: 1, pageSize: 10, beanName: undefined, methodName: undefined, invokeTarget: undefined },
+      // 租户任务配置
+      openTenantJob: false,
+      tenantJobLoading: false,
+      tenantJobConfigList: [],
+      tenantOptions: [],
+      tenantJobForm: { tenantId: undefined },
+      // 字典
       jobGroupOptions: [],
-      // 状态字典
-      statusOptions: [],
       // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        jobName: undefined,
-        jobGroup: undefined,
-        status: undefined
-      },
-      // 表单参数
+      queryParams: { pageNum: 1, pageSize: 10, templateCode: undefined, jobName: undefined, scope: undefined, status: undefined },
+      // 表单
       form: {},
-      // 表单校验
       rules: {
-        jobName: [
-          { required: true, message: "任务名称不能为空", trigger: "blur" }
-        ],
-        invokeTarget: [
-          { required: true, message: "调用目标字符串不能为空", trigger: "blur" }
-        ],
-        cronExpression: [
-          { required: true, message: "cron执行表达式不能为空", trigger: "blur" }
-        ]
+        templateCode: [{ required: true, message: "模板编码不能为空", trigger: "blur" }],
+        jobName: [{ required: true, message: "任务名称不能为空", trigger: "blur" }],
+        invokeTarget: [{ required: true, message: "调用目标不能为空", trigger: "blur" }],
+        cronExpression: [{ required: true, message: "cron表达式不能为空", trigger: "blur" }]
       }
     };
   },
   created() {
     this.getList();
-    this.getDicts("sys_job_group").then(response => {
-      this.jobGroupOptions = response.data;
-    });
-    this.getDicts("sys_job_status").then(response => {
-      this.statusOptions = response.data;
-    });
+    this.getDicts("sys_job_group").then(response => { this.jobGroupOptions = response.data; });
   },
   methods: {
-    /** 查询定时任务列表 */
     getList() {
       this.loading = true;
-      listJob(this.queryParams).then(response => {
-        this.jobList = response.rows;
+      listTemplate(this.queryParams).then(response => {
+        this.templateList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    // 任务组名字典翻译
-    jobGroupFormat(row, column) {
-      return this.selectDictLabel(this.jobGroupOptions, row.jobGroup);
-    },
-    // 取消按钮
     cancel() {
       this.open = false;
       this.reset();
     },
-    // 表单重置
     reset() {
-      this.form = {
-        jobId: undefined,
-        jobName: undefined,
-        jobGroup: undefined,
-        invokeTarget: undefined,
-        cronExpression: undefined,
-        misfirePolicy: 1,
-        concurrent: 1,
-        status: "0"
-      };
+      this.form = { templateCode: undefined, jobName: undefined, jobGroup: undefined, invokeTarget: undefined, cronExpression: undefined, misfirePolicy: '3', concurrent: '1', scope: 'TENANT', moduleTag: undefined, defaultStatus: '1', status: '0' };
       this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.jobId);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
-    },
-    // 更多操作触发
-    handleCommand(command, row) {
-      switch (command) {
-        case "handleRun":
-          this.handleRun(row);
-          break;
-        case "handleView":
-          this.handleView(row);
-          break;
-        case "handleJobLog":
-          this.handleJobLog(row);
-          break;
-        default:
-          break;
-      }
-    },
-    // 任务状态修改
-    handleStatusChange(row) {
-      let text = row.status === "0" ? "启用" : "停用";
-      this.$confirm('确认要"' + text + '""' + row.jobName + '"任务吗?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return changeJobStatus(row.jobId, row.status);
-        }).then(() => {
-          this.msgSuccess(text + "成功");
-        }).catch(function() {
-          row.status = row.status === "0" ? "1" : "0";
-        });
-    },
-    /* 立即执行一次 */
-    handleRun(row) {
-      this.$confirm('确认要立即执行一次"' + row.jobName + '"任务吗?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return runJob(row.jobId, row.jobGroup);
-        }).then(() => {
-          this.msgSuccess("执行成功");
-        }).catch(() => {});
-    },
-    /** 任务详细信息 */
-    handleView(row) {
-      getJob(row.jobId).then(response => {
-        this.form = response.data;
-        this.openView = true;
-      });
+    handleQuery() { this.queryParams.pageNum = 1; this.getList(); },
+    resetQuery() { this.resetForm("queryForm"); this.handleQuery(); },
+    handleSelectionChange(selection) { this.ids = selection.map(item => item.templateId); this.single = selection.length != 1; this.multiple = !selection.length; },
+    // 模板状态开关
+    handleTemplateStatusChange(row) {
+      const text = row.status === "0" ? "启用" : "停用";
+      this.$confirm('确认"' + text + '"模板"' + row.jobName + '"?', "警告", { type: "warning" }).then(() => {
+        return updateTemplate({ templateId: row.templateId, status: row.status });
+      }).then(() => { this.msgSuccess(text + "成功"); }).catch(() => { row.status = row.status === "0" ? "1" : "0"; });
     },
-    /** cron表达式按钮操作 */
-    handleShowCron() {
-      this.expression = this.form.cronExpression;
-      this.openCron = true;
+    handleShowCron() { this.expression = this.form.cronExpression; this.openCron = true; },
+    crontabFill(value) { this.form.cronExpression = value; },
+    handleJobLog() { this.$router.push({ path: '/monitor/job-log/index' }); },
+    // Bean 注册表
+    handleTaskRegistry() { this.openRegistry = true; },
+    initRegistry() { this.registryQueryParams.pageNum = 1; this.getRegistryList(); },
+    getRegistryList() {
+      this.registryLoading = true;
+      listTaskRegistry(this.registryQueryParams).then(res => { this.registryList = res.rows || []; this.registryTotal = res.total || 0; this.registryLoading = false; }).catch(() => { this.registryLoading = false; });
     },
-    /** 确定后回传值 */
-    crontabFill(value) {
-      this.form.cronExpression = value;
+    handleRegistryQuery() { this.registryQueryParams.pageNum = 1; this.getRegistryList(); },
+    resetRegistryQuery() { this.registryQueryParams = { pageNum: 1, pageSize: 10, beanName: undefined, methodName: undefined, invokeTarget: undefined }; this.getRegistryList(); },
+    applyInvokeTarget(row) {
+      if (!this.open) { this.handleAdd(); }
+      this.form.invokeTarget = row.invokeTarget;
+      this.openRegistry = false;
     },
-    /** 任务日志列表查询 */
-    handleJobLog(row) {
-      const jobId = row.jobId || 0;
-      this.$router.push({ path: '/monitor/job-log/index', query: { jobId: jobId } })
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加任务";
-    },
-    /** 修改按钮操作 */
+    // 模板 CRUD
+    handleAdd() { this.reset(); this.open = true; this.title = "添加任务模板"; },
     handleUpdate(row) {
       this.reset();
-      const jobId = row.jobId || this.ids;
-      getJob(jobId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改任务";
-      });
+      const templateId = row.templateId || this.ids[0];
+      getTemplate(templateId).then(response => { this.form = response.data; this.open = true; this.title = "修改任务模板"; });
     },
-    /** 提交按钮 */
-    submitForm: function() {
+    submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.jobId != undefined) {
-            updateJob(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+          if (this.form.templateId != undefined) {
+            updateTemplate(this.form).then(() => { this.msgSuccess("修改成功"); this.open = false; this.getList(); });
           } else {
-            addJob(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+            addTemplate(this.form).then(() => { this.msgSuccess("新增成功"); this.open = false; this.getList(); });
           }
         }
       });
     },
-    /** 删除按钮操作 */
     handleDelete(row) {
-      const jobIds = row.jobId || this.ids;
-      this.$confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delJob(jobIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
+      const templateIds = row.templateId || this.ids.join(',');
+      this.$confirm('确认删除模板编号为"' + templateIds + '"的数据?', "警告", { type: "warning" }).then(() => {
+        return delTemplate(templateIds);
+      }).then(() => { this.getList(); this.msgSuccess("删除成功"); }).catch(() => {});
+    },
+    // 租户任务配置
+    handleTenantJobConfig() { this.openTenantJob = true; },
+    loadTenantJobDialog() {
+      this.tenantJobLoading = true;
+      tenantList({}).then(tenantsRes => { this.tenantOptions = tenantsRes.data || tenantsRes.rows || []; this.tenantJobLoading = false; if (this.tenantJobForm.tenantId) { this.loadTenantJobSelection(); } }).catch(() => { this.tenantJobLoading = false; });
+    },
+    loadTenantJobSelection() {
+      if (!this.tenantJobForm.tenantId) return;
+      this.tenantJobLoading = true;
+      getTenantJobConfig(this.tenantJobForm.tenantId).then(res => { this.tenantJobConfigList = res.data || []; this.tenantJobLoading = false; }).catch(() => { this.tenantJobLoading = false; });
+    },
+    handleTenantJobStatusChange(row) {
+      const text = row.status === "0" ? "启用" : "停用";
+      this.$confirm('确认"' + text + '"该任务？同步后生效', "提示", { type: "warning" }).then(() => {
+        return updateTenantJobStatus(row.id, row.status);
+      }).then(() => { this.msgSuccess(text + "成功（同步后生效）"); }).catch(() => { row.status = row.status === "0" ? "1" : "0"; });
+    },
+    doSyncTenantJob() {
+      if (!this.tenantJobForm.tenantId) return;
+      this.$confirm("确认将模板同步到该租户库？", "提示", { type: "warning" }).then(() => {
+        return syncTenantJob(this.tenantJobForm.tenantId);
+      }).then(res => { this.msgSuccess("同步完成，写入 " + (res.data.synced || 0) + " 条任务"); this.loadTenantJobSelection(); }).catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm("是否确认导出所有定时任务数据项?", "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.exportLoading = true;
-          return exportJob(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-          this.exportLoading = false;
-        }).catch(() => {});
+    doSyncAllTenantJob() {
+      this.$confirm("确认将全部租户的任务配置同步到各租户库？", "提示", { type: "warning" }).then(() => {
+        return syncAllTenantJob();
+      }).then(res => { const d = res.data || {}; this.msgSuccess("同步完成：成功 " + (d.successCount || 0) + "，失败 " + (d.failCount || 0)); }).catch(() => {});
     }
   }
 };

src/views/monitor/job/log.vue

@@ -185,7 +185,6 @@
 </template>
 
 <script>
-import { getJob} from "@/api/monitor/job";
 import { listJobLog, delJobLog, exportJobLog, cleanJobLog } from "@/api/monitor/jobLog";
 
 export default {
@@ -227,16 +226,7 @@ export default {
     };
   },
   created() {
-    const jobId = this.$route.query.jobId;
-    if (jobId !== undefined && jobId != 0) {
-      getJob(jobId).then(response => {
-        this.queryParams.jobName = response.data.jobName;
-        this.queryParams.jobGroup = response.data.jobGroup;
-        this.getList();
-      });
-    } else {
-      this.getList();
-    }
+    this.getList();
     this.getDicts("sys_common_status").then(response => {
       this.statusOptions = response.data;
     });