From d40676f72454ec9d5cec34b99148cf39260477ff Mon Sep 17 00:00:00 2001 From: lxyer <237809796@qq.com> Date: Thu, 13 Jun 2019 17:45:17 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=20=E2=80=9C?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=A2=84=E8=A7=88-=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E2=80=9D=E5=8A=9F=E8=83=BD=E9=80=BB=E8=BE=91?= =?UTF-8?q?=202=E3=80=81=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A7=A3=E6=9E=90sql=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- root/api/meta.js | 6 ++- root/metadata/dataList.html | 45 ++++++++++++++----- .../net/tccn/dbq/jdbc/api/DbSourceMysql.java | 4 +- .../java/net/tccn/dbq/parser/ParseMysql.java | 8 ++-- .../java/net/tccn/service/DataService.java | 19 ++++---- 5 files changed, 54 insertions(+), 28 deletions(-) diff --git a/root/api/meta.js b/root/api/meta.js index 0655d41..d219d1a 100644 --- a/root/api/meta.js +++ b/root/api/meta.js @@ -105,8 +105,12 @@ const meta = { } }, - del({name, id}) { + dataDel({name, id}) { return red.postX('/data/del', {name, data: JSON.stringify({id})}) + }, + + dataSave({name, data}) { + return red.postX('/data/save', {name, data: JSON.stringify(data)}) } } diff --git a/root/metadata/dataList.html b/root/metadata/dataList.html index 86aa939..c126757 100644 --- a/root/metadata/dataList.html +++ b/root/metadata/dataList.html @@ -76,7 +76,7 @@ @@ -89,7 +89,7 @@ --> @@ -184,15 +184,15 @@
-
+
- + - + + + @@ -206,7 +206,7 @@
- +
@@ -229,7 +229,7 @@ return {1:"男",2:"女"}[v] || "未知性别" } - let {getServiceList, getCfg, getDataList, exportData, del} = meta + let {getServiceList, getCfg, getDataList, exportData, dataDel, dataSave} = meta let {showOk} = red var vm = new Vue({ el:".data-list", @@ -320,7 +320,12 @@ else { v = bean[colFmt["col"]] } - return v + " -> "+colFmt.inType + + if (colFmt.inType && colFmt.inType != "INPUT") { + v += " -> "+colFmt.inType + } + + return v /*if (colFmt["fmt"]) { let fmt = colFmt["fmt"] @@ -454,7 +459,23 @@ let name = this.service let pk = this.detailData[this.cfg.pk] - del({name, id: pk}).then(res => showOk) + dataDel({name, id: pk}).then(res => showOk()) + }, + save() { + // 表单保存 + let row = this.detailData + let edits = this.cfg.edits + + let name = this.service + let data = {} + for (let i in edits) { + data[edits[i].col] = row[edits[i].col] + } + + dataSave({name, data}).then(res => { + showOk() + $('#edit').modal('hide') + }) }, showInfo() { $('#f-info').modal({moveable: true}) 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 d2f17ca..e20177e 100644 --- a/src/main/java/net/tccn/dbq/jdbc/api/DbSourceMysql.java +++ b/src/main/java/net/tccn/dbq/jdbc/api/DbSourceMysql.java @@ -1,5 +1,6 @@ package net.tccn.dbq.jdbc.api; +import net.tccn.base.CfgException; import net.tccn.base.Kv; import java.sql.*; @@ -154,8 +155,7 @@ public class DbSourceMysql implements DbSource { ps.execute(); //ps.executeUpdate(); } catch (SQLException e) { - e.printStackTrace(); - + throw new CfgException("SQL 执行失败：", sql); } finally { release(connection); } diff --git a/src/main/java/net/tccn/dbq/parser/ParseMysql.java b/src/main/java/net/tccn/dbq/parser/ParseMysql.java index 41da6df..98ac500 100644 --- a/src/main/java/net/tccn/dbq/parser/ParseMysql.java +++ b/src/main/java/net/tccn/dbq/parser/ParseMysql.java @@ -176,6 +176,8 @@ public class ParseMysql implements Parser { String alias = mainTable.getAlias(); String[] pks = mainTable.pk(); + // 异常 sql： update `user2` set `aa.name`='null',`aa.deptId`='null',`aa.id`='null' where `id` = '1'; + // 取出有效的数据key List keys = data.keySet() .stream() @@ -197,8 +199,8 @@ public class ParseMysql implements Parser { StringBuffer vs = new StringBuffer();// `v1`,`v2`,`v3`, ... for (String k : keys) { - ks.append(String.format("`%s`,", k)); - vs.append(String.format("'%s',", data.get(alias + "." + k))); + ks.append(String.format("`%s`,", k.substring(k.indexOf(".") + 1))); + vs.append(String.format("'%s',", data.get(k))); } if (ks.length() > 0) { ks.deleteCharAt(ks.length() - 1); @@ -214,7 +216,7 @@ public class ParseMysql implements Parser { String pk = pks[0]; for (String k : keys) { - kvs.append(String.format("`%s`='%s',", k, data.get(alias + "." + k))); + kvs.append(String.format("`%s`='%s',", k.substring(k.indexOf(".") + 1), data.get(k))); } if (kvs.length() > 0) { diff --git a/src/main/java/net/tccn/service/DataService.java b/src/main/java/net/tccn/service/DataService.java index a859454..4c96328 100644 --- a/src/main/java/net/tccn/service/DataService.java +++ b/src/main/java/net/tccn/service/DataService.java @@ -1,9 +1,6 @@ package net.tccn.service; -import net.tccn.base.JBean; -import net.tccn.base.Kv; -import net.tccn.base.MetaKit; -import net.tccn.base.PageBean; +import net.tccn.base.*; import net.tccn.dbq.DbExecutors; import net.tccn.dbq.fbean.FBean; import org.redkale.net.http.HttpScope; @@ -43,13 +40,15 @@ public class DataService extends BaseService { } @RestMapping(name = "save", comment = "数据保存") - public JBean save(String name, Map data, @RestParam(name = "platToken") String token) { - //MetaTable metaTable = MetaKit.getMetaTable(ks, token); + public JBean save(String name, Map data, @RestParam(name = "platToken") String token) { + JBean jBean = new JBean(); + try { + DbExecutors.save(name, data, token); + } catch (Exception e) { + throw new CfgException("保存数据失败"); + } - //String sql = metaTable.buildSaveSql(data); - - - return null; + return jBean; } @Comment("数据导出excel")