'升级依赖包'

This commit is contained in:
2019-04-12 11:06:59 +08:00
parent 913ee85779
commit d6c023521c
5 changed files with 5 additions and 668 deletions

File diff suppressed because one or more lines are too long

View File

@@ -1,552 +0,0 @@
{
"servers": [
{
"address": "0.0.0.0:80",
"servlets": [
{
"urlregs": [
"/meta/*"
],
"moduleid": 0,
"name": "",
"comment": "元数据服务",
"mappings": [
{
"url": "/meta/db_plat_list",
"auth": true,
"actionid": 0,
"comment": "数据平台",
"params": [],
"results": [],
"result": "java.util.List<net.tccn.dbq.DbPlat>"
},
{
"url": "/meta/exportsort",
"auth": true,
"actionid": 0,
"comment": "导出字段排序保存",
"params": [
{
"name": "serviceKey",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "items",
"radix": 10,
"type": "java.util.List",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "platToken",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
}
],
"results": [],
"result": "java.util.List<java.lang.String>"
},
{
"url": "/meta/filter_update",
"auth": true,
"actionid": 0,
"comment": "查询配置修改",
"params": [
{
"name": "serviceKey",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "filters",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "platToken",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
}
],
"results": [],
"result": "net.tccn.base.JBean"
},
{
"url": "/meta/findMetaTable",
"auth": true,
"actionid": 0,
"comment": "",
"params": [
{
"name": "name",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "token",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
}
],
"results": [],
"result": "net.tccn.meta.MetaTable"
},
{
"url": "/meta/importsort",
"auth": true,
"actionid": 0,
"comment": "导入字段保存",
"params": [
{
"name": "serviceKey",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "items",
"radix": 10,
"type": "java.util.List",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "platToken",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
}
],
"results": [],
"result": "java.util.List<java.lang.String>"
},
{
"url": "/meta/itemsort",
"auth": true,
"actionid": 0,
"comment": "字段排序",
"params": [
{
"name": "serviceKey",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "items",
"radix": 10,
"type": "java.lang.String[]",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "platToken",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
}
],
"results": [],
"result": "[Ljava.lang.String;"
},
{
"url": "/meta/itemupdate",
"auth": true,
"actionid": 0,
"comment": "字段修改",
"params": [
{
"name": "serviceKey",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "items",
"radix": 10,
"type": "java.util.List",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "platToken",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
}
],
"results": [],
"result": "java.util.List<net.tccn.dbq.Field>"
},
{
"url": "/meta/listcfg",
"auth": false,
"actionid": 0,
"comment": "内容列表配置",
"params": [
{
"name": "key",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "platToken",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
}
],
"results": [],
"result": "net.tccn.base.JBean"
},
{
"url": "/meta/showsort",
"auth": true,
"actionid": 0,
"comment": "展示字段修改",
"params": [
{
"name": "serviceKey",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "items",
"radix": 10,
"type": "java.util.List",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "platToken",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
}
],
"results": [],
"result": "java.util.List<java.lang.String>"
},
{
"url": "/meta/tableinfo",
"auth": true,
"actionid": 0,
"comment": "table详情",
"params": [
{
"name": "platToken",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "name",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
}
],
"results": [],
"result": "net.tccn.base.JBean"
},
{
"url": "/meta/tablelist",
"auth": true,
"actionid": 0,
"comment": "table列表",
"params": [
{
"name": "platToken",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "catalog",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "dbPlatId",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "name",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
}
],
"results": [],
"result": "net.tccn.base.JBean"
}
]
},
{
"urlregs": [
"/qtask/test",
"/qtask/call",
"/qtask/getSysPlat",
"/qtask/qsave"
],
"moduleid": 0,
"name": "",
"comment": "qtask查询服务",
"mappings": [
{
"url": "/qtask/call",
"auth": true,
"actionid": 0,
"comment": "qtask查询",
"params": [
{
"name": "queryId",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "para",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
},
{
"name": "platToken",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
}
],
"results": [],
"result": "net.tccn.base.JBean"
},
{
"url": "/qtask/getSysPlat",
"auth": true,
"actionid": 0,
"comment": "",
"params": [
{
"name": "token",
"radix": 10,
"type": "java.lang.String",
"src": "PARAMETER",
"comment": "",
"required": true
}
],
"results": [],
"result": "net.tccn.dbq.qtask.SysPlat"
},
{
"url": "/qtask/qsave",
"auth": true,
"actionid": 0,
"comment": "qtask保存",
"params": [
{
"name": "qtask",
"radix": 10,
"type": "net.tccn.dbq.qtask.Qtask",
"src": "PARAMETER",
"comment": "",
"required": true
}
],
"results": [],
"result": "net.tccn.base.JBean"
},
{
"url": "/qtask/test",
"auth": true,
"actionid": 0,
"comment": "qtask调试",
"params": [
{
"name": "qtask",
"radix": 10,
"type": "net.tccn.dbq.qtask.Qtask",
"src": "PARAMETER",
"comment": "",
"required": true
}
],
"results": [],
"result": "net.tccn.base.JBean"
}
]
}
]
}
],
"types": {
"net.tccn.dbq.qtask.Qtask": {
"queryId": {
"type": "java.lang.String",
"primary": false,
"updatable": true
},
"name": {
"type": "java.lang.String",
"primary": false,
"updatable": true
},
"remark": {
"type": "java.lang.String",
"primary": false,
"updatable": true
},
"sql": {
"type": "java.lang.String",
"primary": false,
"updatable": true
},
"para": {
"type": "java.lang.String",
"primary": false,
"updatable": true
},
"cate": {
"type": "java.lang.String",
"primary": false,
"updatable": true
},
"sysPlatId": {
"type": "java.lang.Integer",
"primary": false,
"updatable": true
},
"platId": {
"type": "java.lang.Integer",
"primary": false,
"updatable": true
},
"catalog": {
"type": "java.lang.String",
"primary": false,
"updatable": true
},
"status": {
"type": "java.lang.Integer",
"primary": false,
"updatable": true
},
"attr": {
"type": "java.util.HashMap",
"primary": false,
"updatable": true
},
"_id": {
"type": "java.lang.String",
"primary": false,
"updatable": true
},
"_key": {
"type": "java.lang.String",
"primary": false,
"updatable": true
},
"_shows": {
"type": "java.util.Set<java.lang.String>",
"primary": false,
"updatable": true
},
"_order": {
"type": "java.util.Map",
"primary": false,
"updatable": true
},
"fieldName": {
"type": "java.util.function.Function<java.lang.String, java.lang.String>",
"primary": false,
"updatable": true
},
"arangoSource": {
"type": "net.tccn.base.arango.ArangoSource",
"primary": false,
"updatable": true
},
"db": {
"type": "com.arangodb.ArangoDatabase",
"primary": false,
"updatable": true
},
"collection": {
"type": "com.arangodb.ArangoCollection",
"primary": false,
"updatable": true
}
}
}
}

View File

@@ -31,14 +31,14 @@
<!-- arangodb支持 --> <!-- arangodb支持 -->
<dependency> <dependency>
<groupId>com.arangodb</groupId> <groupId>com.arangodb</groupId>
<artifactId>arangodb-java-driver</artifactId> <artifactId>arangodb-java-driver-async</artifactId>
<version>5.0.1</version> <version>5.0.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.lxyer</groupId> <groupId>com.lxyer</groupId>
<artifactId>excel</artifactId> <artifactId>excel</artifactId>
<version>0.1.0</version> <version>0.1.1</version>
</dependency> </dependency>
<dependency> <dependency>

View File

@@ -27,8 +27,7 @@ public class DbExecutors {
MetaTable mainTable = MetaKit.getMetaTableByAlias(metaService.getTable()); MetaTable mainTable = MetaKit.getMetaTableByAlias(metaService.getTable());
DbKit dbKit = MetaKit.getDbKit(mainTable.getDbPlatId()); DbKit dbKit = MetaKit.getDbKit(mainTable.getDbPlatId());
System.out.println("countSql: " + sqls[0]); //System.out.printf("----------------%n countSql:%s%n findSql:%s%n----------------%n", sqls[0], sqls[1]);
System.out.println("findSql: " + sqls[1]);
CompletableFuture<Integer> countFuture = CompletableFuture.supplyAsync(() -> dbKit.queryColumn(sqls[0], int.class)); CompletableFuture<Integer> countFuture = CompletableFuture.supplyAsync(() -> dbKit.queryColumn(sqls[0], int.class));
CompletableFuture<List<Map>> listFuture = CompletableFuture.supplyAsync(() -> dbKit.findList(sqls[1], Map.class)); CompletableFuture<List<Map>> listFuture = CompletableFuture.supplyAsync(() -> dbKit.findList(sqls[1], Map.class));

View File

@@ -134,7 +134,7 @@ public class ParseMysql implements Parser {
if (!isEmpty.test(shows)) { if (!isEmpty.test(shows)) {
shows.forEach(x -> { shows.forEach(x -> {
//buf.append("`").append("x").append("`").append(","); //buf.append("`").append("x").append("`").append(",");
bufSelect.append(x).append(" as ").append("'").append(x.replace(".", "\\.")).append("',"); bufSelect.append(x).append(" as ").append("'").append(x).append("',");
}); });
bufSelect.deleteCharAt(bufSelect.length() - 1); bufSelect.deleteCharAt(bufSelect.length() - 1);
} else { } else {