From 59585e63692251df0fa8c223bf2544f719562ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=9D=E5=B0=98?= <237809796@qq.com> Date: Thu, 21 Mar 2024 18:28:51 +0800 Subject: [PATCH] . --- conf/application.properties | 2 +- pom.xml | 10 +++- root/metadata/dataList.html | 15 +++--- root/metadata/metaLink.html | 12 +++-- src/main/java/net/tccn/base/BaseService.java | 15 +++--- src/main/java/net/tccn/base/Utils.java | 46 +++++++++++++++++++ .../java/net/tccn/qtask/impl/QTaskMysql.java | 15 +++++- 7 files changed, 93 insertions(+), 22 deletions(-) diff --git a/conf/application.properties b/conf/application.properties index 01950a1..84dd784 100644 --- a/conf/application.properties +++ b/conf/application.properties @@ -17,7 +17,7 @@ redkale.server[0].protocol = HTTP redkale.server[0].port = 80 redkale.server[0].host = 0.0.0.0 redkale.server[0].maxbody = 2m - +redkale.server[0].root = root # --- request --- redkale.server[0].request.remoteaddr = request.headers.X-Real-IP diff --git a/pom.xml b/pom.xml index 4edfd9f..accd287 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ mysql mysql-connector-java - LATEST + 8.0.33 @@ -57,7 +57,7 @@ com.jfinal jfinal - 5.1.5 + 3.3 @@ -80,6 +80,12 @@ RELEASE test + + + com.github.jsqlparser + jsqlparser + 4.9 + diff --git a/root/metadata/dataList.html b/root/metadata/dataList.html index c9bb579..49c653b 100644 --- a/root/metadata/dataList.html +++ b/root/metadata/dataList.html @@ -80,7 +80,7 @@ - + 操作 --> - + 编辑 + 删除 + 关闭

-
+
@@ -306,6 +306,9 @@ for (i in res["filters"]) { res["filters"][i]['type'] = res["filters"][i]['filterType'][0]['name'] } + if (!res.details || res.details.length === 0) { + res.details = res.shows + } this.cfg = res }); }, diff --git a/root/metadata/metaLink.html b/root/metadata/metaLink.html index 0839a25..fb2fd6c 100644 --- a/root/metadata/metaLink.html +++ b/root/metadata/metaLink.html @@ -66,14 +66,14 @@ @@ -103,7 +103,7 @@
@@ -299,6 +299,12 @@ }, showInfo() { $('#f-info').modal({moveable: true}) + }, + strJoin(a,b,c) { + if (a && b) { + return a + ' ' + c + ' ' + b + } + return a + b } }, mounted: function () { diff --git a/src/main/java/net/tccn/base/BaseService.java b/src/main/java/net/tccn/base/BaseService.java index 09a8b2c..d422030 100644 --- a/src/main/java/net/tccn/base/BaseService.java +++ b/src/main/java/net/tccn/base/BaseService.java @@ -1,7 +1,6 @@ package net.tccn.base; import org.redkale.convert.json.JsonConvert; -import org.redkale.net.http.RestMapping; import org.redkale.service.Service; import org.redkale.source.CacheMemorySource; @@ -21,9 +20,9 @@ public class BaseService implements Service { @Resource(name = "SERVER_ROOT") protected File webroot; - public Logger logger = Logger.getLogger(this.getClass().getSimpleName()); + protected Logger logger = Logger.getLogger(this.getClass().getSimpleName()); - public static boolean isWinos = System.getProperty("os.name").contains("Window"); + protected static boolean isWinos = System.getProperty("os.name").contains("Window"); @Resource(name = "cache") protected static CacheMemorySource cacheSource = new CacheMemorySource("cache"); @@ -31,13 +30,12 @@ public class BaseService implements Service { @Resource(name = "APP_HOME") protected File APP_HOME; - public static Properties prop = new Properties(); + protected static Properties prop = new Properties(); protected static TplKit tplKit = TplKit.use(true); private static boolean tplInit = false; - @RestMapping(ignore = true) - public T getT(String key, Class clazz, Supplier supplier) { + protected T getT(String key, Class clazz, Supplier supplier) { Object obj = cacheSource.getAndRefresh(key, 1000 * 60 * 3, clazz); if (obj != null) { return (T) obj; @@ -50,12 +48,11 @@ public class BaseService implements Service { return t; } - @RestMapping(ignore = true) - public String platId(String token) { + protected String platId(String token) { return MetaKit.getPlatId(token); } - public boolean isEmpty(Object obj) { + protected boolean isEmpty(Object obj) { return Utils.isEmpty(obj); } } diff --git a/src/main/java/net/tccn/base/Utils.java b/src/main/java/net/tccn/base/Utils.java index 1d373ca..1b32beb 100644 --- a/src/main/java/net/tccn/base/Utils.java +++ b/src/main/java/net/tccn/base/Utils.java @@ -1,5 +1,10 @@ package net.tccn.base; +import net.sf.jsqlparser.JSQLParserException; +import net.sf.jsqlparser.expression.Expression; +import net.sf.jsqlparser.expression.LongValue; +import net.sf.jsqlparser.parser.CCJSqlParserUtil; +import net.sf.jsqlparser.statement.select.*; import net.tccn.base.dbq.jdbc.api.DbSource; import java.lang.reflect.Array; @@ -211,4 +216,45 @@ public class Utils { return _group; } + public static String parserSql(String originalSql) { + try { + Select select = (Select) CCJSqlParserUtil.parse(originalSql); + + // 如果未设置分页，设置默认分页 99 + if (select.getLimit() == null) { + Limit limit = new Limit().withRowCount(new LongValue(10)); + select.setLimit(limit); + + originalSql = select.toString(); + } + + return originalSql; + } catch (JSQLParserException e) { + throw new RuntimeException(e); + } + } + + public static String parserCountSql(String originalSql) { + String sqlCount = "SELECT COUNT(1)"; + try { + Select select = (Select) CCJSqlParserUtil.parse(originalSql); + PlainSelect plainSelect = select.getPlainSelect(); + + FromItem fromItem = plainSelect.getFromItem(); + List joins = plainSelect.getJoins(); + Expression where = plainSelect.getWhere(); + + sqlCount += " FROM " + fromItem; + if (joins != null) { + for (Join join : joins) { + sqlCount += " " + join; + } + } + sqlCount += " WHERE " + where; + } catch (Exception e) { + throw new RuntimeException(e); + } + return sqlCount; + } + } diff --git a/src/main/java/net/tccn/qtask/impl/QTaskMysql.java b/src/main/java/net/tccn/qtask/impl/QTaskMysql.java index 15be374..299f7da 100644 --- a/src/main/java/net/tccn/qtask/impl/QTaskMysql.java +++ b/src/main/java/net/tccn/qtask/impl/QTaskMysql.java @@ -3,7 +3,9 @@ package net.tccn.qtask.impl; import com.jfinal.plugin.activerecord.dialect.MysqlDialect; import com.jfinal.template.Engine; import com.jfinal.template.Template; +import net.tccn.base.Kv; import net.tccn.base.MetaKit; +import net.tccn.base.Utils; import net.tccn.base.dbq.jdbc.api.DbKit; import net.tccn.qtask.QTask; import net.tccn.qtask.Task; @@ -31,6 +33,11 @@ public class QTaskMysql extends QTaskAbs implements QTask { Template tpl = engine.getTemplateByString(task.getContent()); String sql = tpl.renderToString(getTask().getPara()).replaceAll("[\\s]+", " "); + // 聚合统计返回统计结果 TODO 待完善 + if ((sql.startsWith("SELECT COUNT") || sql.startsWith("select count") || sql.startsWith("SELECT count") || sql.startsWith("select COUNT"))) { + return dbKit.find(sql, Kv.class); + } + /* // todo: 从sql分析，支持多种sql处理类别， if (sql.startsWith("select count")) { @@ -58,6 +65,12 @@ public class QTaskMysql extends QTaskAbs implements QTask { dbKit.exetute(sql); }*/ - return dbKit.queryList(sql, Map.class); + // sql 解析-检查：未设置分页设置默认分页 + sql = Utils.parserSql(sql); + + Kv kv = Kv.of(); + kv.set("count", dbKit.findLong(Utils.parserCountSql(sql))); + kv.set("list", dbKit.queryList(sql, Map.class)); + return kv; } }