From e5a4451a7ef127194847f423b544120fb54aff40 Mon Sep 17 00:00:00 2001
From: lxyer <237809796@qq.com>
Date: Mon, 22 Apr 2019 19:01:59 +0800
Subject: [PATCH] =?UTF-8?q?'=E4=BF=AE=E6=94=B9qtask=E7=9B=B8=E5=85=B3'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 root/api/qtask.js                             |   8 +-
 root/metadata/metatable/list.html             |   6 -
 root/metadata/metatable/metaTable.html        |   3 +-
 root/plat/db.html                             |   4 +-
 root/qtask/debug.html                         |  64 +++++-----
 root/qtask/list.html                          |  96 +++++----------
 src/main/java/net/tccn/base/MetaKit.java      |   4 +
 src/main/java/net/tccn/dbq/Field.java         |   7 +-
 .../java/net/tccn/dbq/jdbc/api/DbKit.java     |  10 ++
 .../net/tccn/dbq/jdbc/api/DbSourceMysql.java  |  16 ++-
 src/main/java/net/tccn/oth/QtaskTest.java     |  14 +++
 src/main/java/net/tccn/qtask/QRuner.java      |   2 +-
 src/main/java/net/tccn/qtask/Task.java        |  11 +-
 src/main/java/net/tccn/qtask/TaskEntity.java  |  22 ++--
 src/main/java/net/tccn/qtask/TaskKit.java     |  25 +++-
 .../java/net/tccn/qtask/impl/QTaskAbs.java    |   5 +-
 .../java/net/tccn/qtask/impl/QTaskMysql.java  |   7 +-
 .../java/net/tccn/service/BaseService.java    |   1 +
 .../net/tccn/service/MetadataService.java     |   6 -
 .../java/net/tccn/service/QtaskService.java   | 113 ++----------------
 .../java/net/tccn/service/_FileService.java   |  18 ++-
 .../java/net/tccn/service/_QtaskService.java  |  42 +++++--
 src/test/java/RunTest.java                    |  13 +-
 23 files changed, 236 insertions(+), 261 deletions(-)
 create mode 100644 src/main/java/net/tccn/oth/QtaskTest.java

diff --git a/root/api/qtask.js b/root/api/qtask.js
index 726e3bd..129e1ab 100644
--- a/root/api/qtask.js
+++ b/root/api/qtask.js
@@ -1,5 +1,11 @@
 const qtask = {
     qtaskList() {
-        return red.getX('_qtask/list',{})
+        return red.postX('_qtask/list',{})
+    },
+    qtaskSave({task}) {
+        return red.postX('_qtask/save',{task})
+    },
+    qtaskDebug({task}) {
+        return red.postX('_qtask/debug',{task})
     }
 }
\ No newline at end of file
diff --git a/root/metadata/metatable/list.html b/root/metadata/metatable/list.html
index f681639..1861efb 100644
--- a/root/metadata/metatable/list.html
+++ b/root/metadata/metatable/list.html
@@ -1,8 +1,3 @@
-<style>
-    .table td, .table th {
-        padding: 4px;
-    }
-</style>
 <row class="metatable-list">
     <div class="col-md-12">
         <h3 v-text="cfg.title"></h3>
@@ -99,7 +94,6 @@
             },
         },
         mounted: function () {
-            //dbPlats 列表初始化
             red.dbPlats(function (json) {
                 vm.dbPlats = json;
             });
diff --git a/root/metadata/metatable/metaTable.html b/root/metadata/metatable/metaTable.html
index 09fff8d..d6a10dc 100644
--- a/root/metadata/metatable/metaTable.html
+++ b/root/metadata/metatable/metaTable.html
@@ -21,7 +21,6 @@
             <span class="input-group-btn" style="padding-left: 10px">
                 <button @click="status=7;" :class="['btn',{'btn-primary':status==7}]" type="button"> 基本属性</button>
             </span>
-            <!-- fixme: 加入数据平台相关操作， 1、关联数据平台，2、表结构入库 -->
 
             <span class="input-group-btn" style="padding-left: 20px">
                 <button @click="save()" :class="['btn',{'btn-primary':status!=0},{'disabled':status==0}]" type="button"> 保存</button>
@@ -144,7 +143,7 @@
     var vm = new Vue({
         el: ".meta-list",
         data: {
-            inTypes: ["INPUT", "SELECT_EXT", "INPUT_DT"],
+            inTypes: ["INPUT", "SELECT_EXT", "INPUT_DT", "FMT_FUN"],
             dataTypes: ["bigint(20)", "varchar(255)", "varchar(64)", "varchar(32)", "varchar(16)", "int(11)", "int(3)", "int(2)", "datetime"],
             filterCate: ["EQUAL", "NOTEQUAL", "LIKE", "IN"],
             tables: [],//所有的业务类型，【测试用】
diff --git a/root/plat/db.html b/root/plat/db.html
index e752f2a..a6276f4 100644
--- a/root/plat/db.html
+++ b/root/plat/db.html
@@ -85,8 +85,8 @@
                                 <select class="form-control" v-model="row.cate">
                                     <option value="mysql">MySql</option>
                                     <option value="es">ES</option>
-                                    <option value="htttp">Htttp</option>
-                                    <option value="method">Method</option>
+                                    <option value="http">Http</option>
+                                    <option value="localApi">平台本地API</option>
                                 </select>
                             </div>
                         </div>
diff --git a/root/qtask/debug.html b/root/qtask/debug.html
index e9cba61..0e231d4 100644
--- a/root/qtask/debug.html
+++ b/root/qtask/debug.html
@@ -8,7 +8,7 @@
                     <a href="javascript:;" class="btn" type="button"> 选择QTask任务</a>
             </span>
             <select class="form-control" v-model="row">
-                <option v-for="item in qtasks" :value="item" v-text="item.name"></option>
+                <option v-for="item in list.rows" :value="item" v-text="`${item.name}--${item.comment}`"></option>
             </select>
         </div>
 
@@ -16,25 +16,21 @@
         <div class="modal-body">
             <form class="form-horizontal">
                 <div class="form-group">
-                    <label class="col-sm-2">查询ID</label>
-                    <div class="col-md-6 col-sm-10" v-text="row.queryId" style="padding-top: 5px"></div>
+                    <label class="col-sm-2">业务名称</label>
+                    <div class="col-md-6 col-sm-10" v-text="row.comment" style="padding-top: 5px"></div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-2">业务名称</label>
+                    <label class="col-sm-2">业务标识码</label>
                     <div class="col-md-6 col-sm-10" v-text="row.name" style="padding-top: 5px"></div>
                 </div>
-                <div class="form-group">
-                    <label class="col-sm-2">说明</label>
-                    <div class="col-md-6 col-sm-10" v-text="row.remark" style="padding-top: 5px"></div>
-                </div>
                 <div class="form-group" style="margin-bottom: 0">
-                    <label for="sql" class="col-md-2">SQL</label>
+                    <label for="content" class="col-md-2">执行的内容</label>
                     <div class="col-md-10">
-                        <textarea v-model="row.sql" class="form-control layui-code" rows="10" id="sql" placeholder="请输入 SQL  (支持jfinal-enjoy模板语法)" > </textarea>
+                        <textarea v-model="row.content" class="form-control layui-code" rows="10" id="content" placeholder="请输入 SQL  (支持jfinal-enjoy模板语法)" > </textarea>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label for="para" class="col-sm-2">查询参数</label>
+                    <label for="para" class="col-sm-2">默认查询参数</label>
                     <div class="col-md-6 col-sm-10">
                         <input v-model="row.para" class="form-control" id="para" placeholder="请输入 默认查询参数格式: {k:v}">
                     </div>
@@ -42,7 +38,7 @@
                 <div class="form-group">
                     <label for="para" class="col-sm-2">数据平台</label>
                     <div class="col-md-6">
-                        <select v-model="row.platId" class="form-control">
+                        <select v-model="row.dbPlatId" class="form-control">
                             <option></option>
                             <option v-for="item in dbPlats" :value="item.key" v-text="item.name"></option>
                         </select>
@@ -67,10 +63,12 @@
 </row>
 <script src="http://www.1216.top/res/layui/layui.js"></script>
 <script>
+    let {qtaskList, qtaskDebug} = qtask
+    let {dbList} = plat
+
     var vm = new Vue({
         el: ".qtask-debug",
         data: {
-            qtasks: [],
             row: {},
             list: {rows:[], total: 0},
             dbPlats: [],
@@ -86,40 +84,34 @@
         },
         methods: {
             catalogs: function () {
-                var dbPlats = this.dbPlats;
+                let dbPlats = this.dbPlats;
                 for (i in dbPlats) {
-                    if (dbPlats[i].key == this.row.platId) {
+                    if (dbPlats[i].key == this.row.dbPlatId) {
                         return dbPlats[i]["catalogs"]
                     }
                 }
             },
             query: function () {
-                vm.result = "";
-                red.post("/qtask/test", {qtask: JSON.stringify(vm.row)}, function (json) {
-                    vm.result = json;
-                    red.showMsg({msg: "查询成功"});
-                });
+                this.result = "";
+                qtaskDebug({task: this.row}).then(res => {
+                    this.result = res;
+                    red.showOk("查询成功")
+                })
             }
         },
         mounted: function () {
+            dbList().then(res => {
+                this.dbPlats = res.rows;
+            })
+            qtaskList().then(res => {
+                let list = res
 
-            //qtask 列表初始化
-            var para = {
-                pn:1,
-                ps:120,
-                doc:"qtask",
-                clazz:"net.tccn.common.qtask.Qtask",
-                filter: JSON.stringify([{col:"status",type:"==",value:1},{col:"sysPlatId",type:"==",value:red.getPlatId()}])
-            };
-            red.getJSON("/meta/find", para, function (json) {
-                vm.qtasks = json.rows;
-                vm.row = vm.qtasks[0];
-            });
+                if(list && list.rows.length > 0) {
+                    this.row =  list.rows[0]
+                }
+                this.list = list
+            })
 
-            //dbPlats 列表初始化
-            red.dbPlats(function (json) {
-                vm.dbPlats = json;
-            });
 
             setTimeout(function () {
                 layui.use('code', function(){ //加载code模块
diff --git a/root/qtask/list.html b/root/qtask/list.html
index f2701ad..7d2ddc6 100644
--- a/root/qtask/list.html
+++ b/root/qtask/list.html
@@ -26,14 +26,12 @@
             <thead>
             <tr>
                 <th v-for="field in cfg.cols" v-text="field.label"></th>
-                <th>状态</th>
                 <th>操作</th>
             </tr>
             </thead>
             <tbody>
             <tr v-for="row in list.rows">
                 <td v-for="field in cfg.cols" v-title="row[field.col]" v-text="row[field.col]"></td>
-                <td v-text="dealStatus(row.status)"></td>
                 <td>
                     <a @click="openDia(row)" href="javascript:;">编辑</a>|
                     <a @click="row['status']=1;qsave(row);" v-show="row.status != 1" href="javascript:;">启用</a>
@@ -54,40 +52,26 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
-                        <h4 class="modal-title">QTask - [编辑]</h4>
+                        <h4 class="modal-title">QTask编辑</h4>
                     </div>
                     <div class="modal-body">
                         <form class="form-horizontal">
                             <div class="form-group">
-                                <label for="queryId" class="col-sm-2">查询ID</label>
+                                <label class="col-sm-2">任务名称</label>
                                 <div class="col-md-6 col-sm-10">
-                                    <input v-model="row.queryId" :readonly="row.key" class="form-control" id="queryId" placeholder="请输入queryId">
+                                    <input v-model="row.comment" class="form-control" placeholder="请输入 业务名称">
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="name" class="col-sm-2">业务名称</label>
+                                <label class="col-sm-2">任务标识码</label>
                                 <div class="col-md-6 col-sm-10">
-                                    <input v-model="row.name" class="form-control" id="name" placeholder="请输入 业务名称">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="para" class="col-sm-2">任务类型</label>
-                                <div class="col-md-6">
-                                    <select v-model="row.cate" class="form-control">
-                                        <option v-for="item in cfg.cates" :value="item" v-text="item"></option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="name" class="col-sm-2">说明</label>
-                                <div class="col-md-6 col-sm-10">
-                                    <input v-model="row.remark" class="form-control" id="remark" placeholder="请输入 说明">
+                                    <input v-model="row.name" :readonly="row.key" class="form-control" placeholder="请输入 任务标识码">
                                 </div>
                             </div>
                             <div class="form-group" style="margin-bottom: 0">
-                                <label for="sql" class="col-md-2">SQL</label>
+                                <label class="col-md-2">执行内容</label>
                                 <div class="col-md-10">
-                                    <textarea v-model="row.sql" class="form-control layui-code" rows="10" id="sql" placeholder="请输入 SQL  (支持jfinal-enjoy模板语法)" > </textarea>
+                                    <textarea v-model="row.content" class="form-control layui-code" rows="10" placeholder="请输入 SQL  (支持jfinal-enjoy模板语法)" > </textarea>
                                 </div>
                             </div>
                             <div class="form-group">
@@ -99,7 +83,7 @@
                             <div class="form-group">
                                 <label for="para" class="col-sm-2">数据平台</label>
                                 <div class="col-md-6">
-                                    <select v-model="row.platId" class="form-control">
+                                    <select v-model="row.dbPlatId" class="form-control">
                                         <option></option>
                                         <option v-for="item in dbPlats" :value="item.key" v-text="item.name"></option>
                                     </select>
@@ -115,7 +99,7 @@
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                        <button @click="qsave(row)" type="button" class="btn btn-primary">确定</button>
+                        <button @click="save()" type="button" class="btn btn-primary">确定</button>
                     </div>
                 </div>
             </div>
@@ -131,7 +115,7 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                    <button @click="qsave(row);$('#mySmModal').modal('hide');" type="button" class="btn btn-primary">确定</button>
+                    <button @click="save()" type="button" class="btn btn-primary">确定</button>
                 </div>
             </div>
         </div>
@@ -139,7 +123,8 @@
 </row>
 <script src="http://www.1216.top/res/layui/layui.js"></script>
 <script>
-    let {qtaskList} = qtask
+    let {qtaskList,qtaskSave} = qtask
+    let {dbList} = plat
 
     var vm = new Vue({
         el: ".qtask-list",
@@ -148,9 +133,8 @@
             cfg: {
                 title: "QTask 管理",
                 cols: [
-                    {col: "queryId", label: "查询id",},
-                    {col: "name", label: "业务名称",},
-                    {col: "remark", label: "说明"}
+                    {col: "name", label: "任务标识码",},
+                    {col: "comment", label: "任务名称",},
                 ],
                 filters: [],
                 cates: ["find","update"]
@@ -165,47 +149,27 @@
         },
         methods: {
             loadList: function () {
-                qtaskList().then(res => this.list = res)
-                /*var para = {
-                    pn:1,
-                    ps:120,
-                    doc:"qtask",
-                    clazz:"net.tccn.common.qtask.Qtask",
-                    filter: JSON.stringify([{col:"status",type:"!=",value:-1},{col:"sysPlatId",type:"==",value:this.sysPlat._key}])
-                };
-                red.getJSON("/meta/find", para, function (json) {
-                    vm.list = json;
-                });*/
-
+                qtaskList().then(res => {
+                    let list = res
+                    this.list = list
+                })
             },
             openDia: function (row) {
                 vm.row = row;
                 $('#myModal').modal({moveable: true});
-
                 if (this.dbPlats.length == 0) {
-                    var para = {
-                        doc:"db_plat",
-                        clazz:"net.tccn.common.qtask.DbPlat",
-                    };
-                    red.getJSON("/meta/find", para, function (json) {
-                        vm.dbPlats = json.rows;
-                    });
+                    dbList().then(res => {
+                        this.dbPlats = res.rows;
+                    })
                 }
             },
-            qsave: function (row) {
-                row = row || vm.row;
-
-                if (!row["sysPlatId"]) {//设置平台id
-                    row["sysPlatId"] = red.getPlatId();
-                }
-
-
-                red.post("/qtask/qsave", {qtask: JSON.stringify(row)}, function (json) {
-                    vm.row = {};
-                    $('#myModal').modal('hide');
-                    vm.loadList();
-                    red.showMsg();
-                });
+            save() {
+                qtaskSave({task:this.row}).then(res => {
+                    red.showOk()
+                    this.loadList()
+                    $('#myModal').modal('hide')
+                    this.row = {}
+                })
             },
             dealStatus: function (n) {
                 var arr = {"0":"未启用", "1":"启用", "-1":"删除",}
@@ -220,9 +184,9 @@
                 $(".container-fixed").load("abc.html");
             },
             catalogs: function () {
-                var dbPlats = this.dbPlats;
+                let dbPlats = this.dbPlats;
                 for (i in dbPlats) {
-                    if (dbPlats[i].key == this.row.platId) {
+                    if (dbPlats[i].key == this.row.dbPlatId) {
                         return dbPlats[i]["catalogs"]
                     }
                 }
diff --git a/src/main/java/net/tccn/base/MetaKit.java b/src/main/java/net/tccn/base/MetaKit.java
index 4b914ec..e23439a 100644
--- a/src/main/java/net/tccn/base/MetaKit.java
+++ b/src/main/java/net/tccn/base/MetaKit.java
@@ -471,6 +471,10 @@ public class MetaKit {
 
         return new DbKit(dbAccount.get());
     }
+    public static DbKit getDbKit(String dbPlatId, String catalog) {
+        Optional<DbAccount> dbAccount = dbPlats.stream().filter(x -> x.getKey().equals(dbPlatId)).findAny();
+        return new DbKit(dbAccount.get(), catalog);
+    }
 
     public static DbAccount getDbPlat(String dbPlatId) {
         Optional<DbAccount> dbAccount = dbPlats.stream().filter(x -> x.getKey().equals(dbPlatId)).findFirst();
diff --git a/src/main/java/net/tccn/dbq/Field.java b/src/main/java/net/tccn/dbq/Field.java
index 4d83950..1f6ee47 100644
--- a/src/main/java/net/tccn/dbq/Field.java
+++ b/src/main/java/net/tccn/dbq/Field.java
@@ -67,8 +67,9 @@ public class Field {
 
     //------------------------------------
     public enum InType {
-        SELECT_EXT("select_ext"),
-        INPUT_DT("input_dt");
+        SELECT_EXT("SELECT_EXT"),
+        INPUT_DT("INPUT_DT"),
+        FMT_FUN("FMT_FUN");
 
         String name;
 
@@ -86,6 +87,8 @@ public class Field {
             return name + "|" + inExt;
         } else if (InType.INPUT_DT.name.equalsIgnoreCase(inType)) {
             return name + "=dt";
+        } else if (InType.FMT_FUN.name.equalsIgnoreCase(inType)) {
+            return name + "=" + inExt;
         }
 
         return name;
diff --git a/src/main/java/net/tccn/dbq/jdbc/api/DbKit.java b/src/main/java/net/tccn/dbq/jdbc/api/DbKit.java
index a1cfd5d..4d350dc 100644
--- a/src/main/java/net/tccn/dbq/jdbc/api/DbKit.java
+++ b/src/main/java/net/tccn/dbq/jdbc/api/DbKit.java
@@ -9,6 +9,7 @@ public class DbKit implements DbSource{
 
     private DbAccount dbAccount;
     private DbSource dbSource;
+    private String catalog;
 
     public DbKit(DbAccount dbAccount) {
         this.dbAccount = dbAccount;
@@ -18,6 +19,15 @@ public class DbKit implements DbSource{
             throw new IllegalArgumentException(String.format("创建DbKit失败：数据库类型[cate:%s]未知", dbAccount.getCate()));
         }
     }
+    public DbKit(DbAccount dbAccount, String catalog) {
+        this.dbAccount = dbAccount;
+        this.catalog = catalog;
+        if ("mysql".equalsIgnoreCase(dbAccount.getCate())) {
+            dbSource = new DbSourceMysql(dbAccount, catalog);
+        } else {
+            throw new IllegalArgumentException(String.format("创建DbKit失败：数据库类型[cate:%s]未知", dbAccount.getCate()));
+        }
+    }
 
 
     @Override
diff --git a/src/main/java/net/tccn/dbq/jdbc/api/DbSourceMysql.java b/src/main/java/net/tccn/dbq/jdbc/api/DbSourceMysql.java
index a2904e9..9b0d78b 100644
--- a/src/main/java/net/tccn/dbq/jdbc/api/DbSourceMysql.java
+++ b/src/main/java/net/tccn/dbq/jdbc/api/DbSourceMysql.java
@@ -22,11 +22,17 @@ public class DbSourceMysql implements DbSource {
 
     private String accountKey;
     private DbAccount dbAccount;
+    private String catalog;
 
     public DbSourceMysql(DbAccount dbAccount) {
         this.dbAccount = dbAccount;
         this.accountKey = dbAccount.accountKey();
     }
+    public DbSourceMysql(DbAccount dbAccount, String catalog) {
+        this.dbAccount = dbAccount;
+        this.catalog = catalog;
+        this.accountKey = dbAccount.accountKey();
+    }
 
     @Override
     public <T> List<T> findList(String sql, Class<T> type) {
@@ -136,7 +142,15 @@ public class DbSourceMysql implements DbSource {
     }
 
     private Connection connection() {
-        return connection(0);
+        Connection connection = connection(0);
+        if (connection != null && catalog != null) {
+            try {
+                connection.setCatalog(catalog); //还回连接的时候是否需要重置catalog？ 后续观察
+            } catch (SQLException e) {
+                e.printStackTrace();
+            }
+        }
+        return connection;
     }
     private Connection connection(int n) {
         LinkedBlockingQueue<Connection> queue = conns.getOrDefault(accountKey, new LinkedBlockingQueue<>(15));
diff --git a/src/main/java/net/tccn/oth/QtaskTest.java b/src/main/java/net/tccn/oth/QtaskTest.java
new file mode 100644
index 0000000..681b1da
--- /dev/null
+++ b/src/main/java/net/tccn/oth/QtaskTest.java
@@ -0,0 +1,14 @@
+package net.tccn.oth;
+
+import net.tccn.base.Kv;
+
+/**
+ * @author: liangxianyou
+ */
+public class QtaskTest {
+
+    public Kv abx(Kv kv) {
+
+        return Kv.of("hello", "world").putAll(kv);
+    }
+}
diff --git a/src/main/java/net/tccn/qtask/QRuner.java b/src/main/java/net/tccn/qtask/QRuner.java
index a679dbd..afc9631 100644
--- a/src/main/java/net/tccn/qtask/QRuner.java
+++ b/src/main/java/net/tccn/qtask/QRuner.java
@@ -13,7 +13,7 @@ public class QRuner {
         switch (cate.toLowerCase()) {
             case "mysql":
                 return new QTaskMysql(task).execute();
-            case "method":
+            case "localapi":
                 return new QTaskMethod(task).execute();
             case "http":
                 return new QTaskHttp(task).execute();
diff --git a/src/main/java/net/tccn/qtask/Task.java b/src/main/java/net/tccn/qtask/Task.java
index 3c47429..4ea2945 100644
--- a/src/main/java/net/tccn/qtask/Task.java
+++ b/src/main/java/net/tccn/qtask/Task.java
@@ -16,7 +16,8 @@ public class Task {
 
 
     private String name; // 任务名，同一系统唯一
-    private String dbPlatId;// 数据源id
+    private String dbPlatId; // 数据源id
+    private String catalog; // 数据库 database
 
     private String content;
     private String comment;
@@ -41,6 +42,14 @@ public class Task {
         this.dbPlatId = dbPlatId;
     }
 
+    public String getCatalog() {
+        return catalog;
+    }
+
+    public void setCatalog(String catalog) {
+        this.catalog = catalog;
+    }
+
     public String getContent() {
         return content;
     }
diff --git a/src/main/java/net/tccn/qtask/TaskEntity.java b/src/main/java/net/tccn/qtask/TaskEntity.java
index 9ce083c..8a17a7f 100644
--- a/src/main/java/net/tccn/qtask/TaskEntity.java
+++ b/src/main/java/net/tccn/qtask/TaskEntity.java
@@ -1,6 +1,5 @@
 package net.tccn.qtask;
 
-import net.tccn.base.Kv;
 import net.tccn.base.arango.Doc;
 
 import javax.persistence.Table;
@@ -8,17 +7,18 @@ import javax.persistence.Table;
 /**
  * Created by liangxianyou at 2019/4/20 20:04.
  */
-@Table(name = "qtask", catalog = "db_dev")
+@Table(name = "qtask", catalog = "db_demo")
 public class TaskEntity extends Doc<TaskEntity> {
     public static TaskEntity dao = dao(TaskEntity.class);
 
-    private String name; // 任务名称
+    private String name; // 任务标识码
+    private String comment; // 任务名称
     //private String cate; // 任务类型
     private String dbPlatId; // 数据平台id
-    private String comment; // 任务名称
+    private String catalog; //
 
     private String content; //任务内容
-    private Kv<String, String> para; //任务参数
+    private String para; //任务参数
     private String sysPlatId; // 平台id
 
     // ---------------------
@@ -38,6 +38,14 @@ public class TaskEntity extends Doc<TaskEntity> {
         this.dbPlatId = dbPlatId;
     }
 
+    public String getCatalog() {
+        return catalog;
+    }
+
+    public void setCatalog(String catalog) {
+        this.catalog = catalog;
+    }
+
     public String getComment() {
         return comment;
     }
@@ -54,11 +62,11 @@ public class TaskEntity extends Doc<TaskEntity> {
         this.content = content;
     }
 
-    public Kv<String, String> getPara() {
+    public String getPara() {
         return para;
     }
 
-    public void setPara(Kv<String, String> para) {
+    public void setPara(String para) {
         this.para = para;
     }
 
diff --git a/src/main/java/net/tccn/qtask/TaskKit.java b/src/main/java/net/tccn/qtask/TaskKit.java
index d95967d..70450a9 100644
--- a/src/main/java/net/tccn/qtask/TaskKit.java
+++ b/src/main/java/net/tccn/qtask/TaskKit.java
@@ -1,9 +1,11 @@
 package net.tccn.qtask;
 
+import com.google.gson.Gson;
 import net.tccn.base.Kv;
 import net.tccn.base.MetaKit;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -19,14 +21,28 @@ public class TaskKit {
 
     public static Task buildTask(String name, String platToken, Kv para) {
         TaskEntity taskEntity = getTaskEntity(name, platToken);
+        return buildTask(taskEntity, para);
+    }
 
+    public static Task buildTask(TaskEntity taskEntity, Kv para) {
         Task task = new Task();
         task.setName(taskEntity.getName());
         task.setComment(taskEntity.getComment());
+        task.setContent(taskEntity.getContent());
         task.setDbPlatId(taskEntity.getDbPlatId());
-        task.setPara(taskEntity.getPara().putAll(para));
-        task.setDbAccount(MetaKit.getDbPlat(taskEntity.getDbPlatId()));
+        task.setCatalog(taskEntity.getCatalog());
 
+        Kv _para = Kv.of().putAll(para);
+        if (taskEntity.getPara() != null) {
+            try {
+                Map map = new Gson().fromJson(taskEntity.getPara(), Map.class);
+                map.forEach((k,v) -> _para.put(k, v));
+            } catch (Exception e) {
+                new IllegalArgumentException(String.format("fromJson error:[%s]",taskEntity.getPara()), e);
+            }
+        }
+        task.setPara(_para);
+        task.setDbAccount(MetaKit.getDbPlat(taskEntity.getDbPlatId()));
         return task;
     }
 
@@ -44,4 +60,9 @@ public class TaskKit {
         Task task = buildTask(name, platToken, para);
         return QRuner.query(task);
     }
+
+    public static Object taskRun(TaskEntity entity) {
+        Task task = buildTask(entity, Kv.of());
+        return QRuner.query(task);
+    }
 }
diff --git a/src/main/java/net/tccn/qtask/impl/QTaskAbs.java b/src/main/java/net/tccn/qtask/impl/QTaskAbs.java
index 215837e..a1eef3e 100644
--- a/src/main/java/net/tccn/qtask/impl/QTaskAbs.java
+++ b/src/main/java/net/tccn/qtask/impl/QTaskAbs.java
@@ -17,11 +17,10 @@ public abstract class QTaskAbs implements QTask {
     }
 
     public Kv getPara() {
-        return getTask().getPara();
+        return task.getPara();
     }
 
     public String getContent() {
-        return getTask().getContent();
+        return task.getContent();
     }
-
 }
diff --git a/src/main/java/net/tccn/qtask/impl/QTaskMysql.java b/src/main/java/net/tccn/qtask/impl/QTaskMysql.java
index d3d9548..058e8a4 100644
--- a/src/main/java/net/tccn/qtask/impl/QTaskMysql.java
+++ b/src/main/java/net/tccn/qtask/impl/QTaskMysql.java
@@ -19,19 +19,20 @@ public class QTaskMysql extends QTaskAbs implements QTask {
 
     public static Engine engine = Engine.create("sqlTpl");
     private static MysqlDialect dialect = new MysqlDialect();
+
+    protected DbKit dbKit;
+
     static {
         engine.setDevMode(true);
     }
 
     public QTaskMysql(Task task) {
         super(task);
+        this.dbKit = MetaKit.getDbKit(task.getDbPlatId(), task.getCatalog());
     }
 
     @Override
     public Object execute() {
-
-        DbKit dbKit = MetaKit.getDbKit(getTask().getDbPlatId());
-
         Template tpl = engine.getTemplateByString(task.getContent());
         String sql = tpl.renderToString(getTask().getPara()).replaceAll("[\\s]+", " ");
 
diff --git a/src/main/java/net/tccn/service/BaseService.java b/src/main/java/net/tccn/service/BaseService.java
index 50962b8..48af24e 100644
--- a/src/main/java/net/tccn/service/BaseService.java
+++ b/src/main/java/net/tccn/service/BaseService.java
@@ -107,6 +107,7 @@ public class BaseService implements Service {
         return prop.getProperty(k);
     }
 
+    @RestMapping(ignore = true)
     public String platId(String token) {
         return MetaKit.getPlatId(token);
     }
diff --git a/src/main/java/net/tccn/service/MetadataService.java b/src/main/java/net/tccn/service/MetadataService.java
index e06c4d0..3534081 100644
--- a/src/main/java/net/tccn/service/MetadataService.java
+++ b/src/main/java/net/tccn/service/MetadataService.java
@@ -16,7 +16,6 @@ import org.redkale.net.http.RestService;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 /**
@@ -31,11 +30,6 @@ public class MetadataService extends BaseService { //arango
 
     public MetaTable findMetaTable(String name, String token)  {
         return getT("meta_cols_" + name + token, MetaTable.class, () -> {
-            SysPlat sysPlat = qtaskService.getSysPlat(token);
-            if (sysPlat == null) {
-                logger.log(Level.INFO, "平台信息未知");
-                throw new IllegalArgumentException("平台信息未知");
-            }
 
             return MetaKit.getMetaTables()
                     .stream()
diff --git a/src/main/java/net/tccn/service/QtaskService.java b/src/main/java/net/tccn/service/QtaskService.java
index 39928e2..eb261c0 100644
--- a/src/main/java/net/tccn/service/QtaskService.java
+++ b/src/main/java/net/tccn/service/QtaskService.java
@@ -2,119 +2,32 @@ package net.tccn.service;
 
 import net.tccn.base.JBean;
 import net.tccn.base.Kv;
-import net.tccn.dbq.jdbc.api.DbAccount;
-import net.tccn.dbq.qtask.Qtask;
-import net.tccn.plat.SysPlat;
+import net.tccn.qtask.TaskKit;
 import org.redkale.net.http.RestMapping;
 import org.redkale.net.http.RestParam;
 import org.redkale.net.http.RestService;
 
-import java.sql.SQLException;
-import java.util.function.Predicate;
+import java.util.Map;
 
 /**
  * @author: liangxianyou at 2018/11/13 18:14.
  */
-@RestService(name = "qtask", automapping = true, comment = "qtask查询服务")
+@RestService(automapping = true, comment = "qtask查询服务")
 public class QtaskService extends BaseService {
 
-    private Predicate<String> checkObj = (s) -> s != null && s.startsWith("{") && s.endsWith("}");
+    // 调用示例: http://qtask_service_addr_xxxxxx/qtask/call?name=abxx&platToken=3421432&para={h:1}
+    @RestMapping(name = "call", auth = false)
+    public JBean call(String name, Map<String, String> para, @RestParam(name = "platToken") String token) {
+        JBean jBean = new JBean();
 
-    public SysPlat getSysPlat(String token) {
-        return getT(token, SysPlat.class, () -> SysPlat.dao.findFirst(new SysPlat(token)));
-    }
+        Kv kv = Kv.of();
+        if (para != null) {
+            para.forEach((k, v) -> kv.put(k, v));
+        }
 
-    ///qtask/query?queryId=platform.list&para={id:211}
-    @RestMapping(name = "call", comment = "qtask查询")
-    public JBean call(String queryId, String para, @RestParam(name = "platToken") String token) {
-        JBean jBean = JBean.by(0, "");
-        do {
-            SysPlat sysPlat = getSysPlat(token);
-            if (sysPlat == null) {
-                jBean.set(-1, "平台信息未知"); break;
-            }
-
-            Qtask qtask = getQTask(queryId, sysPlat.getKey());
-            if (qtask == null) {
-                jBean.set(-1, "未知任务"); break;
-            }
-
-            if (!checkObj.test(para)) {
-                para = qtask.getPara();
-            }
-            Kv kv = null;
-            if (checkObj.test(para)) {
-                kv = BaseService.gson.fromJson(para, Kv.class);
-            }
-            try {
-                jBean.setBody(run(qtask, kv));
-            } catch (SQLException e) {
-                e.printStackTrace();
-                return jBean.set(-1, "数据查询失败", e.getMessage());
-            }
-        } while (false);
+        jBean.setBody(TaskKit.taskRun(name, token, kv));
         return jBean;
+
     }
 
-
-    @RestMapping(name = "test", comment = "qtask调试")
-    public JBean test(Qtask qtask) {
-        JBean jBean = JBean.by(0, "");
-        do {
-            //check data
-            if (isEmpty.test(qtask.getSql())) {
-                jBean.set(-1, "查询失败，请设置正确的【SQL】"); break;
-            }
-            if (isEmpty.test(qtask.getPlatId()) || isEmpty.test(qtask.getCatalog())) {
-                jBean.set(-1, "查询失败，请设置正确的【数据平台】"); break;
-            }
-
-            DbAccount dbPlat = DbAccount.dao.findByKey(qtask.getPlatId());//arangoSource.findById("db_plat/" + qTask.getPlatId(), DbAccount.class);
-            if (dbPlat == null) {
-                jBean.set(-1, "查询失败，请设置正确的【数据平台】"); break;
-            }
-            Kv kv = null;
-            if (checkObj.test(qtask.getPara())) {
-                try {
-                    kv = BaseService.gson.fromJson(qtask.getPara(), Kv.class);
-                } catch (Exception e) {
-                    jBean.set(-1, "查询失败，请设置正确的【查询参数】"); break;
-                }
-            }
-
-            try {
-                jBean.setBody(run(qtask, kv));
-            } catch (SQLException e) {
-                e.printStackTrace();
-                jBean.set(-1, e.getMessage());
-            }
-        } while (false);
-        return jBean;
-    }
-
-    // /qtask/query?queryId=platform.list&para={id:211}
-    @RestMapping(ignore = true, comment = "qtask查询数据")
-    private Object run(Qtask qTask, Kv kv) throws SQLException {
-
-
-        return null;
-    }
-
-    //-----------  Qtask ---------------
-
-    @RestMapping(name = "qsave", comment = "qtask保存")
-    public JBean qtaskSave(Qtask qtask) {
-        JBean jBean = JBean.by(0, "");
-
-        return jBean;
-    }
-
-    @RestMapping(ignore = true, comment = "qtask获取")
-    public Qtask getQTask(String queryId, String sysPlatId) {
-        Qtask qtask = null;
-
-        return qtask;
-    }
-
-    //-------------------------------------------------------
 }
diff --git a/src/main/java/net/tccn/service/_FileService.java b/src/main/java/net/tccn/service/_FileService.java
index f65674f..58c5181 100644
--- a/src/main/java/net/tccn/service/_FileService.java
+++ b/src/main/java/net/tccn/service/_FileService.java
@@ -10,7 +10,6 @@ import org.redkale.net.http.RestMapping;
 import org.redkale.net.http.RestParam;
 import org.redkale.net.http.RestService;
 
-import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -28,9 +27,6 @@ public class _FileService extends BaseService {
 
     private final static String[] FIELDS = {"field", "cate", "must", "remark1", "remark2", "tag", "selects", "column", "filter", "ck", "edit"};
 
-    @Resource
-    private QtaskService qtaskService;
-
 
     @RestMapping(name = "sheets", comment = "得到所有的sheetName")
     public List<String> sheets(String filePath) {
@@ -50,10 +46,14 @@ public class _FileService extends BaseService {
         }).collect(Collectors.toList());
     }
 
+    public SysPlat getSysPlat(String token) {
+        return getT(token, SysPlat.class, () -> SysPlat.dao.findFirst(new SysPlat(token)));
+    }
+
     @RestMapping(name = "data", comment = "得到文件数据")
     public JBean data(String filePath, @RestParam(name = "platToken") String token) {
         JBean jBean = new JBean();
-        SysPlat sysPlat = qtaskService.getSysPlat(token);
+        //SysPlat sysPlat = getSysPlat(token);
         File file = new File(webroot, filePath);
         if (file.exists()) {
             try {
@@ -73,7 +73,7 @@ public class _FileService extends BaseService {
                     buf.append("'").append(x.getName()).append("',");
                 });
                 buf.deleteCharAt(buf.length() - 1);
-                buf.append("] and d.sysPlatId=='" + sysPlat.getKey() + "'\n" +
+                buf.append("] and d.sysPlatId=='" + platId(token) + "'\n" +
                         " return d.name");
 
                 List<String> hv = MetaTable.dao.find(buf.toString(), String.class);
@@ -100,7 +100,6 @@ public class _FileService extends BaseService {
     @RestMapping(name = "sheet_data", comment = "得到sheet数据")
     public JBean sheetData(String filePath, String sheetName, @RestParam(name = "platToken") String token) {
         JBean jBean = new JBean();
-        SysPlat sysPlat = qtaskService.getSysPlat(token);
         File file = new File(webroot, filePath);
         try {
             List<Map> list = ExcelKit.readExcel(file, FIELDS, sheetName);
@@ -120,7 +119,6 @@ public class _FileService extends BaseService {
                                  @RestParam(name = "filePath", comment = "文件路径") String filePath,
                                  @RestParam(name = "platToken") String token) {
         JBean jBean = new JBean();
-        SysPlat sysPlat = qtaskService.getSysPlat(token);
 
         File file = new File(webroot, filePath);
         String[] fields = {"field", "cate", "must", "remark1", "remark2", "tag", "selects", "column", "filter", "ck", "edit"};
@@ -132,12 +130,12 @@ public class _FileService extends BaseService {
                     for (String sn : sheetArr) {
                         if (table.getName().equals(sn)) { //在选中列表中
                             MetaTable metaTable = new MetaTable();
-                            metaTable.setSysPlatId(sysPlat.getKey());
+                            metaTable.setSysPlatId(platId(token));
                             metaTable.setName(table.getName());
 
                             MetaTable _metaTable = MetaTable.dao.findFirst(metaTable);
                             if (_metaTable == null) {//库里没有数据保存
-                                table.setSysPlatId(sysPlat.getKey());
+                                table.setSysPlatId(platId(token));
                                 table.save();
                             }
                             break;
diff --git a/src/main/java/net/tccn/service/_QtaskService.java b/src/main/java/net/tccn/service/_QtaskService.java
index f2e5273..0cc7016 100644
--- a/src/main/java/net/tccn/service/_QtaskService.java
+++ b/src/main/java/net/tccn/service/_QtaskService.java
@@ -4,6 +4,7 @@ import net.tccn.base.JBean;
 import net.tccn.base.MetaKit;
 import net.tccn.base.PageBean;
 import net.tccn.qtask.TaskEntity;
+import net.tccn.qtask.TaskKit;
 import org.redkale.net.http.RestParam;
 import org.redkale.net.http.RestService;
 import org.redkale.source.Flipper;
@@ -14,6 +15,10 @@ public class _QtaskService extends BaseService{
 
     @Comment("qtask列表")
     public JBean list(TaskEntity task, Flipper flipper, @RestParam(name = "platToken") String token) {
+        if (task == null) {
+            task = new TaskEntity();
+        }
+        task.setSysPlatId(platId(token));
         PageBean<TaskEntity> page = TaskEntity.dao.findPage(task, flipper);
 
 
@@ -24,14 +29,22 @@ public class _QtaskService extends BaseService{
     public JBean save(TaskEntity task, @RestParam(name = "platToken") String token) {
         JBean jBean = new JBean();
 
-        // 同平台name 唯一校验
-        TaskEntity bean = new TaskEntity();
-        bean.setSysPlatId(platId(token));
-        bean.setName(task.getName());
-        long count = bean.count();
-        if (count > 0) {
-            jBean.set(-1, "任务名称占用");
-        } else {
+        do {
+            if (isEmpty.test(task.getName())) {
+                jBean.set(-1, "任务标识码不能为空");
+                break;
+            }
+
+            // 同平台name 唯一校验
+            TaskEntity bean = new TaskEntity();
+            bean.setSysPlatId(platId(token));
+            bean.setName(task.getName());
+
+            TaskEntity entity = TaskEntity.dao.findFirst(bean);
+            if (entity != null && !entity.getKey().equals(task.getKey())) {
+                jBean.set(-1, "任务标识码被占用");
+                break;
+            }
 
             if (task.getKey() != null) {
                 task.update();
@@ -40,9 +53,20 @@ public class _QtaskService extends BaseService{
                 task.save();
             }
             MetaKit.reload(task);
-        }
+        } while (false);
+
+
 
         return jBean;
     }
 
+    @Comment("debug调试接口")
+    public JBean debug(TaskEntity task, @RestParam(name = "platToken") String token) {
+        JBean jBean = new JBean();
+
+        Object res = TaskKit.taskRun(task);
+        jBean.setBody(res);
+        return jBean;
+    }
+
 }
diff --git a/src/test/java/RunTest.java b/src/test/java/RunTest.java
index ec7ecaf..f3f8207 100644
--- a/src/test/java/RunTest.java
+++ b/src/test/java/RunTest.java
@@ -8,8 +8,8 @@ import net.tccn.dbq.jdbc.api.DbAccount;
 import net.tccn.dbq.jdbc.api.DbKit;
 import net.tccn.dbq.parser.ParseMysql;
 import net.tccn.meta.MetaTable;
-import net.tccn.qtask.QRuner;
-import net.tccn.qtask.Task;
+import net.tccn.qtask.TaskEntity;
+import net.tccn.qtask.TaskKit;
 import net.tccn.user.User;
 import org.junit.Test;
 
@@ -194,7 +194,7 @@ public class RunTest<T> {
 
     TplKit tplKit = TplKit.use();
 
-    @Test
+    // @Test
     public void buildMethod() {
         tplKit.addTpl(new File(FileKit.rootPath(), "/tpl/_t.tpl"));
 
@@ -223,6 +223,13 @@ public class RunTest<T> {
         return str.substring(0, 1).toUpperCase() + str.substring(1);
     }
 
+    @Test
+    public void taskRunTest() {
+        TaskEntity entity = TaskEntity.dao.findByKey("23074420");
 
+        if (entity != null) {
+            System.out.printf("------------------------%n%s%n------------------------%n", new Gson().toJson(TaskKit.taskRun(entity)));
+        }
+    }
 
 }