From 403739859820e2c2d302bd4308a3e339a6c94ec5 Mon Sep 17 00:00:00 2001
From: lxyer <237809796@qq.com>
Date: Mon, 10 Jun 2019 17:55:46 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81metaTable=E4=B8=AD=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=BB=E9=94=AE=E8=AE=BE=E7=BD=AE=202?=
 =?UTF-8?q?=E3=80=81=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=203=E3=80=81=E5=88=97=E8=A1=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E5=8A=A0=E5=85=A5"HIDDEN"=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E9=A2=84=E8=A7=88=E4=B8=AD=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E8=A7=A3=E6=9E=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/application.xml                          |   8 +-
 conf/application.xsd                          | 110 ++++++++++++++++++
 root/api/meta.js                              |  12 +-
 root/api/qtask.js                             |   2 +-
 root/metadata/dataList.html                   |  23 +++-
 root/metadata/metaService.html                |  88 +++++++++++++-
 root/metadata/metatable/metaTable.html        |  15 ++-
 src/main/java/net/tccn/base/MetaKit.java      |  36 +++++-
 src/main/java/net/tccn/base/TplKit.java       |  10 ++
 src/main/java/net/tccn/dbq/DbExecutors.java   |  14 ++-
 src/main/java/net/tccn/dbq/Field.java         |   1 +
 .../java/net/tccn/dbq/jdbc/api/DbKit.java     |   6 +-
 .../java/net/tccn/dbq/jdbc/api/DbSource.java  |   2 +-
 .../net/tccn/dbq/jdbc/api/DbSourceMysql.java  |  11 +-
 .../java/net/tccn/dbq/parser/ParseMysql.java  |  19 +++
 src/main/java/net/tccn/meta/MetaService.java  |   2 +
 .../java/net/tccn/service/DataService.java    |  10 ++
 .../net/tccn/service/MetadataService.java     |  11 ++
 18 files changed, 350 insertions(+), 30 deletions(-)
 create mode 100644 conf/application.xsd

diff --git a/conf/application.xml b/conf/application.xml
index bd16f8d..6d20863 100644
--- a/conf/application.xml
+++ b/conf/application.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<application port="5001">
-
+<application port="5001" xmlns="application.xsd">
     <resources>
         <listener value="net.tccn.base.MetaListenter"/>
         <properties load="config.txt"></properties>
@@ -12,10 +11,9 @@
             <remoteaddr value="request.headers.X-RemoteAddress"/>
         </request>
         <response>
-            <addheader name="X-Node" value="system.property.APP_NODE" />
+            <addheader name="X-Node" value="system.property.APP_NODE"/>
         </response>
-        <resource-servlet>
-        </resource-servlet>
+        <resource-servlet/>
 
         <rest autoload="true" base="net.tccn.servlet.BaseServlet"/>
         <services autoload="true"/>
diff --git a/conf/application.xsd b/conf/application.xsd
new file mode 100644
index 0000000..9c0d7d4
--- /dev/null
+++ b/conf/application.xsd
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.w3school.com.cn" xmlns="http://www.w3school.com.cn">
+
+    <!-- **************************************************** -->
+    <!-- 复合元素定义 -->
+
+    <!-- server -->
+    <xs:element name="request">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="remoteaddr">
+                    <xs:complexType>
+                        <xs:attribute name="value" type="xs:string"></xs:attribute>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="response">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="addheader">
+                    <xs:complexType>
+                        <xs:attribute name="name" type="xs:string"></xs:attribute>
+                        <xs:attribute name="value" type="xs:string"></xs:attribute>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="resource-servlet"></xs:element>
+    <xs:element name="rest">
+        <xs:complexType>
+            <xs:attribute name="autoload"></xs:attribute>
+            <xs:attribute name="base"></xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="services">
+        <xs:complexType>
+            <xs:attribute name="autoload"></xs:attribute>
+            <xs:attribute name="base"></xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="servlets">
+        <xs:complexType>
+            <xs:attribute name="autoload"></xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="render">
+        <xs:complexType>
+            <xs:attribute name="value"></xs:attribute>
+        </xs:complexType>
+    </xs:element>
+
+
+    <xs:element name="resources">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="listener">
+                    <xs:complexType>
+                        <xs:attribute name="value" type="xs:string"></xs:attribute>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="properties">
+                    <xs:complexType>
+                        <xs:attribute name="load" type="xs:anyURI"></xs:attribute>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="server">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="request"/>
+                <xs:element ref="response"/>
+                <xs:element ref="resource-servlet"/>
+                <xs:element ref="rest"/>
+                <xs:element ref="services"/>
+                <xs:element ref="servlets"/>
+                <xs:element ref="render"/>
+            </xs:sequence>
+
+            <xs:attribute name="protocol" type="xs:string"></xs:attribute>
+            <xs:attribute name="host" type="xs:string"></xs:attribute>
+            <xs:attribute name="port" type="xs:string"></xs:attribute>
+            <xs:attribute name="root" type="xs:string"></xs:attribute>
+        </xs:complexType>
+    </xs:element>
+
+
+    <!-- **************************************************** -->
+
+    <xs:element name="application">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="resources"/>
+                <xs:element ref="server"/>
+
+            </xs:sequence>
+
+            <xs:attribute name="port" type="xs:integer"/>
+            <xs:attribute name="version" type="xs:string"/>
+            <xs:attribute name="xmlns" type="xs:string"/>
+        </xs:complexType>
+    </xs:element>
+
+
+</xs:schema>
\ No newline at end of file
diff --git a/root/api/meta.js b/root/api/meta.js
index 190d69b..0655d41 100644
--- a/root/api/meta.js
+++ b/root/api/meta.js
@@ -19,9 +19,9 @@ const meta = {
     getServiceInfo({name}, callback) {
         red.getJSON("/meta/service_info",{name}, res => {
 
-            let {name, comment, table, edits, imports, shows, exports, filters, details} = red.replacePoint(res)
+            let {name, comment, table, edits, imports, shows, exports, filters, details, dels} = red.replacePoint(res)
 
-            callback({name, comment, table, edits, imports, shows, exports, filters, details});
+            callback({name, comment, table, edits, imports, shows, exports, filters, details, dels});
         });
     },
     getServiceDetail({name}, callback) {
@@ -78,6 +78,10 @@ const meta = {
         edits = red.replace$(edits);
         return red.postX('/meta/editsave', {name, edits: JSON.stringify(edits)})
     },
+    delSave({name, dels}) {
+        dels = red.replace$(dels);
+        return red.postX('/meta/delsave', {name, dels: JSON.stringify(dels)})
+    },
 
     // Meta-Table
     tableList() {
@@ -99,6 +103,10 @@ const meta = {
         } else if (cate == 'json') {
 
         }
+    },
+
+    del({name, id}) {
+        return red.postX('/data/del', {name, data: JSON.stringify({id})})
     }
 }
 
diff --git a/root/api/qtask.js b/root/api/qtask.js
index 129e1ab..d99fc12 100644
--- a/root/api/qtask.js
+++ b/root/api/qtask.js
@@ -6,6 +6,6 @@ const qtask = {
         return red.postX('_qtask/save',{task})
     },
     qtaskDebug({task}) {
-        return red.postX('_qtask/debug',{task})
+        return red.postX('_qtask/debug',{task:JSON.stringify(task)})
     }
 }
\ No newline at end of file
diff --git a/root/metadata/dataList.html b/root/metadata/dataList.html
index c8e25cb..7f12374 100644
--- a/root/metadata/dataList.html
+++ b/root/metadata/dataList.html
@@ -74,9 +74,11 @@
             <table class="table table-bordered table-hover" style="width: 100%">
                 <thead>
                 <tr>
+                    <!-- 'sort':field.order>0 -->
                     <th v-for="field in cfg.shows"
+                        v-if="field.fmt != 'HIDDEN'"
                         v-text="field.label || getFieldLabel(field.col)"
-                        :class="{'sort':field.order>0, 'sort-up':field.col==order.col && order.desc==1, 'sort-down':field.col==order.col && order.desc!=1}"
+                        :class="{'sort':1, 'sort-up':field.col==order.col && order.desc==1, 'sort-down':field.col==order.col && order.desc!=1}"
                         @click="sortEvent(field.col)"></th>
                     <th>操作</th>
                 </tr>
@@ -86,10 +88,14 @@
                     <!--
                     <td v-for="field in cfg.shows" v-title="dealFieldFmt(row, field.col)" v-text="dealFieldFmt(row, field.col)"></td>
                     -->
-                    <td v-for="fieldFmt in cfg.shows" v-title="dealFieldFmt(row, fieldFmt)" v-html="dealFieldFmt(row, fieldFmt)"></td>
+                    <td v-for="field in cfg.shows"
+                        v-if="field.fmt != 'HIDDEN'"
+                        v-title="dealFieldFmt(row, field)"
+                        v-html="dealFieldFmt(row, field)"></td>
                     <td>
                         <a href="javascript:;" @click="detailData=row; detail()">详情</a>
                         <a href="javascript:;" @click="detailData=row; edit()">编辑</a>
+                        <a href="javascript:;" @click="detailData=row; del()">删除</a>
                     </td>
                 </tr>
                 </tbody>
@@ -223,7 +229,8 @@
         return {1:"男",2:"女"}[v] || "未知性别"
     }
 
-    let {getServiceList, getCfg, getDataList, exportData} = meta;
+    let {getServiceList, getCfg, getDataList, exportData, del} = meta
+    let {showOk} = red
     var vm = new Vue({
         el:".data-list",
         data: {
@@ -237,11 +244,12 @@
             services: [],
             service: "",
 
-            addFilter: "recompany",
+            addFilter: "",
             para: {},
             list: {rows: [], total: 0},
             limit: {pn: 1, ps: 10, total: 0},
             order: {col: "id", desc: 1},
+            pk: "",
             detailData: {}
         },
         watch: {
@@ -271,7 +279,6 @@
                 this.list = {rows:[], total:0};
                 let fbean = this.buildFBean();
                 getDataList(fbean, json => {
-                    console.log(json)
                     vm.list = json;
                 });
             },
@@ -420,6 +427,12 @@
             edit() {
                 $('#edit').modal({moveable: true});
             },
+            del() {
+                let name = this.service
+                let pk = this.detailData[this.cfg.pk]
+
+                del({name, id: pk}).then(res => showOk)
+            },
             showInfo() {
                 $('#f-info').modal({moveable: true})
             }
diff --git a/root/metadata/metaService.html b/root/metadata/metaService.html
index 202e96a..10c49df 100644
--- a/root/metadata/metaService.html
+++ b/root/metadata/metaService.html
@@ -67,7 +67,10 @@
                 <button @click="status='detail'" :class="['btn',{'btn-primary':status=='detail'}]" type="button"> 详情配置</button>
             </span>
             <span class="input-group-btn">
-                <button @click="status='edit'" :class="['btn',{'btn-primary':status=='form'}]" type="button"> 表单配置</button>
+                <button @click="status='edit'" :class="['btn',{'btn-primary':status=='edit'}]" type="button"> 表单配置</button>
+            </span>
+            <span class="input-group-btn">
+                <button @click="status='del'" :class="['btn',{'btn-primary':status=='del'}]" type="button"> 删除配置</button>
             </span>
 
             <span class="input-group-btn" style="padding-left: 10px">
@@ -137,7 +140,8 @@
                     <th></th>
                     <th>数据字段</th>
                     <th>表头名称</th>
-                    <th>格式化</th>
+                    <th>格式化类型</th>
+                    <th>附加参数</th>
                 </tr>
                 </thead>
                 <tr v-for="(item, index) in serviceInfo.shows">
@@ -146,7 +150,19 @@
                     </td>
                     <td v-text="item.col" style="background-color: rgb(235, 235, 228);"></td>
                     <td style="padding: 1px;"><input v-model="item.label" class="form-control" style="width: 130px;padding: 0px"></td>
+                    <td style="padding: 1px;">
+                        <select v-model="item.inType" class="form-control" style="width: 130px">
+                            <option></option>
+                            <option v-for="x in inTypes" :value="x">{{x}}</option>
+                        </select>
+                    </td>
+                    <td style="padding: 1px;" title="格式化类型为：funs或qtask的时候需要填写附加参数">
+                        <input v-show="item.inType == 'FUNC' || item.inType == 'QTASK' || item.inType == 'DICT'" v-model="item.inExt" class="form-control" style="width: 130px;padding: 0px">
+                        <input disabled v-show="item.inType != 'FUNC' && item.inType != 'QTASK' && item.inType != 'DICT'" v-model="item.inExt" class="form-control" style="width: 130px;padding: 0px">
+                    </td>
+                    <!--
                     <td style="padding: 1px;"><input v-model="item.fmt" class="form-control" style="width: 130px;padding: 0px"></td>
+                    -->
                 </tr>
             </table>
         </div>
@@ -293,6 +309,49 @@
                 </tbody>
             </table>
         </div>
+
+        <!-- del -->
+        <div id="del" v-show="status=='del'">
+            <div style="padding-left: 10px;background-color: #ccc;width: 100%"> 删除策略</div>
+            <div class="panel-body" style="overflow:auto;">
+                <form class="form-horizontal">
+                    <!--
+                    <label class="radio-inline">
+                        <input type="radio" v-model="serviceInfo.dels.cate" value="UP_FIELD"> 策略一（更新主表字段）
+                    </label>
+                    -->
+                    <label class="radio-inline">
+                        <input type="radio" v-model="serviceInfo.dels.cate" value="SQL"> 策略一（执行完整SQL）
+                    </label>
+                    <label class="radio-inline">
+                        <input disabled type="radio" v-model="serviceInfo.dels.cate" value="QTASK"> 策略二（执行QTask）
+                    </label>
+                    <br>
+                    <br>
+
+                    <div v-show="serviceInfo.dels.cate == 'UP_FIELD'" class="form-group">
+                        <label for="name" class="col-md-2">SQL</label>
+                        <div class="col-md-8">
+                            <textarea v-model="serviceInfo.dels.sql1" disabled style="width: 100%;" rows="5"></textarea>
+                            <!--
+                            <input v-model="serviceInfo.dels.name" class="form-control" id="name" placeholder="请输入Table名称">
+                            -->
+                        </div>
+                    </div>
+
+                    <div v-show="serviceInfo.dels.cate == 'SQL'" class="form-group">
+                        <label for="name" class="col-md-2">SQL</label>
+                        <div class="col-md-8">
+                            <textarea v-model="serviceInfo.dels.sql" style="width: 100%;" rows="5"></textarea>
+                            <!--
+                            <input v-model="serviceInfo.dels.name" class="form-control" id="name" placeholder="请输入Table名称">
+                            -->
+                        </div>
+                    </div>
+
+                </form>
+            </div>
+        </div>
     </div>
 
 
@@ -340,7 +399,7 @@
 </row>
 
 <script>
-    let {getServiceInfo, getServiceDetail, getServiceList, tableLinkList, serviceSave, showSave, filterSave, exportSave, detailSave, editSave} = meta;
+    let {getServiceInfo, getServiceDetail, getServiceList, tableLinkList, serviceSave, showSave, filterSave, exportSave, detailSave, editSave, delSave} = meta;
     let {showOk} = red
 
     var vm = new Vue({
@@ -350,7 +409,7 @@
             sheetArr: ["a"],//别名
             sheet: "a",//别名
 
-            inTypes: ["INPUT", "SELECT_EXT", "INPUT_DT"],
+            inTypes: ["INPUT", "DICT", "INPUT_DAY", "INPUT_TIME", "FUNC", "QTASK", "HIDDEN"],
             dataTypes: ["bigint(20)", "varchar(255)", "varchar(64)", "varchar(32)", "varchar(16)", "int(11)", "int(3)", "int(2)", "datetime"],
             filterCate: ["EQUAL", "NOTEQUAL", "LIKE", "IN"],
             serviceInfo: {
@@ -363,6 +422,7 @@
                 filters: [{name: '', label: '', filterType: ['']}],
                 details: [],
                 edits: [],
+                dels: {cate: "", sql: "", qtask: ""}
             },
             serviceDetail: {tables: {a: {items: []}}},
 
@@ -403,6 +463,8 @@
 
             //edits
             editArr: [],
+
+            //del
         },
         watch: {
             status: function (v) {
@@ -460,6 +522,18 @@
                 }
                 this.sheetArr = arr;//别名
                 this.sheet = arr[0];
+
+                // 处理dels 策略
+                let dels = this.serviceInfo["dels"] || {}
+                //console.log("dels", dels)
+                let cate = dels["cate"] || "UP_FIELD"
+                let sql1 = dels["sql1"] || "update #(table) set status=9 where id=#(id);"
+                let sql = dels["sql"] || `update ${v['tables'][this.serviceInfo.table]['name']} set status=9 where id=#(id);`
+                let qtask = dels["qtask"] || ""
+
+                let serviceInfo = this.serviceInfo
+                serviceInfo["dels"] = {cate, sql1, sql, qtask}
+                this.serviceInfo = serviceInfo
             },
             sheet: function (v) {
                 this.table = v;
@@ -656,6 +730,7 @@
         methods: {
             loadInfo(name) {
                 getServiceInfo({name}, (json) => {
+                    json.dels = json.dels || {cate:"", sql1:"", sql:"", qtask:""}
                     this.serviceInfo = json;
                 })
             },
@@ -830,6 +905,11 @@
                     }
                     console.log(edits)
                     editSave({name: this.service, edits}).then(res => red.showOk())
+                } else if (vm.status == 'del') {
+                    let dels = this.serviceInfo.dels
+
+                    console.log(dels)
+                    delSave({name: this.service, dels}).then(res => red.showOk())
                 } else if (vm.status == 7) {
                     console.log(vm.row);
                     red.postX("/meta/dbplatupdate", vm.row).then(() => showOk())
diff --git a/root/metadata/metatable/metaTable.html b/root/metadata/metatable/metaTable.html
index e53f9f5..77dce60 100644
--- a/root/metadata/metatable/metaTable.html
+++ b/root/metadata/metatable/metaTable.html
@@ -72,7 +72,7 @@
                 <th>数据类型</th>
                 <th>输入类型</th>
                 <th>附加属性</th>
-                <th>备注</th>
+                <th>主键</th>
             </tr>
             <tr v-for="(item, index) in meta.items" class="item">
                 <td v-show="status==1" class="icon icon-move"></td>
@@ -81,9 +81,12 @@
                 <td v-show="status!=2" v-text="item.type"></td>
                 <td v-show="status!=2" v-text="item.inType"></td>
                 <td v-show="status!=2" v-text="item.inExt"></td>
-                <td v-show="status!=2" v-text="item.remark"></td>
+                <td v-show="status!=2">
+                    <i v-if="item.pk" class="icon icon-check"></i>
+                </td>
 
                 <td v-show="status==2">
+                    <input type="hidden" name="item" :value="JSON.stringify(item)">
                     <input v-model="item" type="hidden">
                     <input :value="item.name" disabled class="form-control">
                     <input v-model="item.name" type="hidden">
@@ -98,7 +101,11 @@
                     </select>
                 </td>
                 <td v-show="status==2"><input v-model="item.inExt" class="form-control"></td>
-                <td v-show="status==2"><input v-model="item.remark" class="form-control"></td>
+                <td v-show="status==2" style="text-align: center">
+                    <label>
+                        <input v-model="item.pk" type="checkbox">
+                    </label>
+                </td>
             </tr>
         </table>
     </div>
@@ -204,7 +211,7 @@
                     let itemOv = this.oldItems || [];
                     if (itemOv.length == 0) return;
 
-                    let attr = ["label", "name", "remark", "type", "inType","inExt"];
+                    let attr = ["label", "name", "pk", "type", "inType","inExt"];
                     let itemEdit = [];
                     a:for (let i = 0; i < itemOv.length; i++) {
                         for (let j = 0; j < attr.length; j++) {
diff --git a/src/main/java/net/tccn/base/MetaKit.java b/src/main/java/net/tccn/base/MetaKit.java
index 07bb9e8..bea581a 100644
--- a/src/main/java/net/tccn/base/MetaKit.java
+++ b/src/main/java/net/tccn/base/MetaKit.java
@@ -231,6 +231,22 @@ public final class MetaKit {
                     .filter(y -> x.split("[.]")[1].equals(y.getName()))
                     .findFirst().ifPresent(y -> _shows.add(Kv.of("col", x).set("order", true)));
         });*/
+        List<Kv> _shows = shows.stream().map(x -> {
+            Kv kv = Kv.of();
+            kv.putAll(x);
+
+            if ("FUNC".equalsIgnoreCase(x.get("inType")) || "QTASK".equalsIgnoreCase(x.get("inType")) || "DICT".equalsIgnoreCase(x.get("inType"))) {
+                kv.set("fmt", x.get("inType") + "|" + x.get("inExt"));
+            } else if ("HIDDEN".equalsIgnoreCase(x.get("inType"))) {
+                kv.set("fmt", "HIDDEN");
+            } else {
+                kv.set("fmt", "");
+            }
+            kv.remove("inType");
+            kv.remove("inExt");
+            return kv;
+        }).collect(Collectors.toList());
+
 
         //filters
         List<Map> _filters = new ArrayList<>();
@@ -300,10 +316,28 @@ public final class MetaKit {
             _details.add(kv);
         });*/
 
+        //pk：业务主表的主键
+        StringBuffer _pks = new StringBuffer();
+        MetaTable mainTable = metaTables.get(metaService.getTable());
+        mainTable.getItems().stream().filter(x -> x.getPk() != null && x.getPk()).forEach(x -> {
+            _pks.append(String.format("%s.%s,", metaService.getTable(), x.getName()));
+        });
+        if (_pks.length() > 0) {
+            _pks.deleteCharAt(_pks.length() -1);
+        }
+        if (_pks.length() == 0) { // 默认主键
+            List<Field> items = metaTables.get(metaService.getTable()).getItems();
+            //存在id字段，取id
+            items.stream().filter(x -> x.getName().equalsIgnoreCase("id")).findAny().ifPresent(x -> {
+                _pks.append(String.format("%s.%s", metaService.getTable(), x.getName()));
+            });
+        }
+
         return Kv.of()
+                .set("pk", _pks.toString())
                 .set("title", comment)
                 .set("items", _items2)
-                .set("shows", shows)
+                .set("shows", _shows)
                 .set("filters", _filters)
                 .set("edits", edits)
                 .set("details", details);
diff --git a/src/main/java/net/tccn/base/TplKit.java b/src/main/java/net/tccn/base/TplKit.java
index 4527ce9..6d52836 100644
--- a/src/main/java/net/tccn/base/TplKit.java
+++ b/src/main/java/net/tccn/base/TplKit.java
@@ -2,6 +2,8 @@ package net.tccn.base;
 
 import com.jfinal.plugin.activerecord.SqlPara;
 import com.jfinal.plugin.activerecord.sql.SqlKit;
+import com.jfinal.template.Engine;
+import com.jfinal.template.Template;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -131,4 +133,12 @@ public class TplKit {
 	public void parseTpl() {
 		kit.parseSqlTemplate();
 	}
+
+	//---------------
+	private static Engine engine = Engine.use();
+
+	public static String parseTpl(String tpl, Map data) {
+		Template template = engine.getTemplateByString(tpl);
+		return template.renderToString(data);
+	}
 }
diff --git a/src/main/java/net/tccn/dbq/DbExecutors.java b/src/main/java/net/tccn/dbq/DbExecutors.java
index c8b5f1f..fdcaa92 100644
--- a/src/main/java/net/tccn/dbq/DbExecutors.java
+++ b/src/main/java/net/tccn/dbq/DbExecutors.java
@@ -5,7 +5,6 @@ import net.tccn.base.PageBean;
 import net.tccn.dbq.fbean.FBean;
 import net.tccn.dbq.jdbc.api.DbKit;
 import net.tccn.dbq.parser.ParseMysql;
-import net.tccn.dbq.parser.Parser;
 import net.tccn.meta.MetaService;
 import net.tccn.meta.MetaTable;
 
@@ -15,7 +14,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
 public class DbExecutors {
-    private final static Parser PARSER = new ParseMysql();
+    private final static ParseMysql PARSER = new ParseMysql();
 
     public static PageBean findPage(FBean fBean) throws ExecutionException, InterruptedException {
         //sql解析
@@ -37,4 +36,15 @@ public class DbExecutors {
 
         return PageBean.by(rows, total);
     }
+
+    public static void del(String name, Map data, String token) {
+        MetaService metaService = MetaKit.getMetaService(name, token);
+
+        MetaTable mainTable = MetaKit.getMetaTableByAlias(metaService.getTable());
+
+        DbKit dbKit = MetaKit.getDbKit(mainTable.getDbPlatId());
+
+        String delSql = PARSER.parseDel(name, data, token);
+        dbKit.exetute(delSql);
+    }
 }
diff --git a/src/main/java/net/tccn/dbq/Field.java b/src/main/java/net/tccn/dbq/Field.java
index f862c35..ce36944 100644
--- a/src/main/java/net/tccn/dbq/Field.java
+++ b/src/main/java/net/tccn/dbq/Field.java
@@ -14,6 +14,7 @@ public class Field {
     private String type;
     private String inType;
     private String inExt;
+    private Boolean pk; // 是否主键
 
     public Field() {}
 
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 39262fd..6e45266 100644
--- a/src/main/java/net/tccn/dbq/jdbc/api/DbKit.java
+++ b/src/main/java/net/tccn/dbq/jdbc/api/DbKit.java
@@ -47,8 +47,8 @@ public class DbKit implements DbSource{
     }
 
     @Override
-    public <T> T findfirst(String sql, Class<T> type) {
-        return dbSource.findfirst(sql, type);
+    public <T> T findFirst(String sql, Class<T> type) {
+        return dbSource.findFirst(sql, type);
     }
 
     @Override
@@ -72,7 +72,7 @@ public class DbKit implements DbSource{
 
     // -----------------------------------------
     public <T> CompletableFuture<T> findfirstAsync(String sql, Class<T> type) {
-        return CompletableFuture.supplyAsync(() -> findfirst(sql, type));
+        return CompletableFuture.supplyAsync(() -> findFirst(sql, type));
     }
     public <T> CompletableFuture<List<T>> findListAsync(String sql, Class<T> type) {
         return CompletableFuture.supplyAsync(() -> findList(sql, type));
diff --git a/src/main/java/net/tccn/dbq/jdbc/api/DbSource.java b/src/main/java/net/tccn/dbq/jdbc/api/DbSource.java
index 1269813..2171542 100644
--- a/src/main/java/net/tccn/dbq/jdbc/api/DbSource.java
+++ b/src/main/java/net/tccn/dbq/jdbc/api/DbSource.java
@@ -14,7 +14,7 @@ public interface DbSource extends IService {
 
     <T> List<T> findList(String sql, Class<T> type);
 
-    <T> T findfirst(String sql, Class<T> type);
+    <T> T findFirst(String sql, Class<T> type);
 
     <T> T queryColumn(String sql, Class<T> type);
 
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 4d0e917..1356618 100644
--- a/src/main/java/net/tccn/dbq/jdbc/api/DbSourceMysql.java
+++ b/src/main/java/net/tccn/dbq/jdbc/api/DbSourceMysql.java
@@ -89,7 +89,7 @@ public class DbSourceMysql implements DbSource {
     }
 
     @Override
-    public <T> T findfirst(String sql, Class<T> type) {
+    public <T> T findFirst(String sql, Class<T> type) {
         List<T> list = findList(sql, type);
         return list.size() > 0 ? list.get(0) : null;
     }
@@ -146,14 +146,17 @@ public class DbSourceMysql implements DbSource {
         try (
                 PreparedStatement ps = connection.prepareStatement(sql);
         ){
-            ps.executeUpdate();
+            ps.execute();
+            //ps.executeUpdate();
         } catch (SQLException e) {
             e.printStackTrace();
+
         } finally {
             release(connection);
         }
     }
 
+    //fixme: lxy 处理连接超过8小时失效问题
     private Connection connection() {
         Connection connection = connection(0);
         if (connection != null && catalog != null) {
@@ -178,6 +181,10 @@ public class DbSourceMysql implements DbSource {
                 System.out.println("创建新的连接:" + x);
             } else {
                 conn = queue.take();
+                if (conn.isClosed()) {
+                    System.out.println("connetion had closed,");
+                    conn = connection(n);
+                }
             }
         } catch (SQLException | InterruptedException e) {
             if (e instanceof InterruptedException) {
diff --git a/src/main/java/net/tccn/dbq/parser/ParseMysql.java b/src/main/java/net/tccn/dbq/parser/ParseMysql.java
index d223602..95c446e 100644
--- a/src/main/java/net/tccn/dbq/parser/ParseMysql.java
+++ b/src/main/java/net/tccn/dbq/parser/ParseMysql.java
@@ -2,6 +2,7 @@ package net.tccn.dbq.parser;
 
 import net.tccn.base.Kv;
 import net.tccn.base.MetaKit;
+import net.tccn.base.TplKit;
 import net.tccn.dbq.fbean.*;
 import net.tccn.meta.MetaLink;
 import net.tccn.meta.MetaService;
@@ -132,4 +133,22 @@ public class ParseMysql implements Parser {
 
         return null;
     }
+
+    public String parseDel(String name, Map data, String token) {
+        MetaService metaService = MetaKit.getMetaService(name, token);
+        Map<String, String> dels = metaService.getDels();
+        MetaTable mainTable = MetaKit.getMetaTableByAlias(metaService.getTable());
+
+        String sql = "";
+        if ("UP_FIELD".equalsIgnoreCase(dels.get("cate"))) {
+            data.put("table", mainTable.getName());
+            sql = TplKit.parseTpl("update #(table) set status=9 where id=#(id)", data);
+        } else if ("SQL".equalsIgnoreCase(dels.get("cate"))) {
+            sql = TplKit.parseTpl(dels.get("sql"), data);
+        } else if ("QTASK".equalsIgnoreCase(dels.get("cate"))) {
+            sql = TplKit.parseTpl("qtask", data);
+        }
+
+        return sql;
+    }
 }
diff --git a/src/main/java/net/tccn/meta/MetaService.java b/src/main/java/net/tccn/meta/MetaService.java
index adf8790..2151382 100644
--- a/src/main/java/net/tccn/meta/MetaService.java
+++ b/src/main/java/net/tccn/meta/MetaService.java
@@ -5,6 +5,7 @@ import net.tccn.base.arango.Doc;
 
 import javax.persistence.Table;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +25,7 @@ public class MetaService extends Doc<MetaService> {
     private List<Map<String,String>> shows = new ArrayList<>();
     private List<Map<String,String>> edits = new ArrayList<>();
     private List<Map<String,String>> details = new ArrayList<>();
+    private Map<String, String> dels = new HashMap<>();
     private List<Filter> filters = new ArrayList<>();//{name:"", label:"", checked:true, }
     private List<Map<String,String>> exports = new ArrayList<>();
 
diff --git a/src/main/java/net/tccn/service/DataService.java b/src/main/java/net/tccn/service/DataService.java
index 294eb1f..a859454 100644
--- a/src/main/java/net/tccn/service/DataService.java
+++ b/src/main/java/net/tccn/service/DataService.java
@@ -79,4 +79,14 @@ public class DataService extends BaseService {
         return HttpScope.refer("excel");
     }
 
+    @RestMapping(name = "del", auth = false, comment = "数据删除")
+    public JBean del(String name, Map<String, String> data, @RestParam(name = "platToken") String token) {
+        JBean jBean = new JBean();
+        try {
+            DbExecutors.del(name, data, token);
+        } catch (Exception e) {
+            jBean.set(-1, "删除数据失败!");
+        }
+        return jBean;
+    }
 }
diff --git a/src/main/java/net/tccn/service/MetadataService.java b/src/main/java/net/tccn/service/MetadataService.java
index 319624c..458ff53 100644
--- a/src/main/java/net/tccn/service/MetadataService.java
+++ b/src/main/java/net/tccn/service/MetadataService.java
@@ -183,6 +183,17 @@ public class MetadataService extends BaseService { //arango
         return JBean.OK;
     }
 
+    @RestMapping(name = "delsave", comment = "删除配置保存")
+    public JBean delSave(String name, Map<String, String> dels, @RestParam(name = "platToken") String token) {
+        if (dels == null || dels.size() == 0) return null;
+
+        MetaService metaService = MetaKit.getMetaService(name, token);
+        metaService.setDels(dels);
+
+        MetaKit.save(metaService);
+        return JBean.OK;
+    }
+
     @RestMapping(name = "importsort", comment = "导入字段保存")
     public JBean importSort(String serviceKey, List<String> items, @RestParam(name = "platToken") String token) {
         if (isEmpty.test(items)) return null;