1、引入lombok支持,重构JavaBean 将 常规getter/setter去除

2、去除Gson 依赖
This commit is contained in:
2019-04-25 17:18:35 +08:00
parent 936d4dc992
commit 9a38d69eb0
30 changed files with 176 additions and 1048 deletions

View File

@@ -1,10 +1,12 @@
package net.tccn.base;
import lombok.Getter;
import net.tccn.base.arango.Doc;
import net.tccn.dbq.Field;
import net.tccn.dbq.fbean.FilterType;
import net.tccn.dbq.jdbc.api.DbAccount;
import net.tccn.dbq.jdbc.api.DbKit;
import net.tccn.meta.Filter;
import net.tccn.meta.MetaLink;
import net.tccn.meta.MetaService;
import net.tccn.meta.MetaTable;
@@ -14,7 +16,6 @@ import org.redkale.util.Comment;
import java.util.*;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
@@ -22,13 +23,18 @@ import java.util.stream.Collectors;
*
* Created by liangxianyou at 2019/1/7 13:31.
*/
public class MetaKit {
public final class MetaKit {
//基础数据缓存
@Getter
private static List<MetaTable> metaTables;
@Getter
private static List<MetaLink> metaLinks;
@Getter
private static List<MetaService> metaServices;
@Getter
private static List<DbAccount> dbPlats;
@Getter
private static List<SysPlat> sysPlats;
static {
@@ -57,47 +63,7 @@ public class MetaKit {
// todo: 按照key 查询更新内存
}
//----- get/set ----
public static List<MetaTable> getMetaTables() {
return metaTables;
}
public static void setMetaTables(List<MetaTable> metaTables) {
MetaKit.metaTables = metaTables;
}
public static List<MetaLink> getMetaLinks() {
return metaLinks;
}
public static void setMetaLinks(List<MetaLink> metaLinks) {
MetaKit.metaLinks = metaLinks;
}
public static List<MetaService> getMetaServices() {
return metaServices;
}
public static List<DbAccount> getDbPlats() {
return dbPlats;
}
public static void setDbPlats(List<DbAccount> dbPlats) {
MetaKit.dbPlats = dbPlats;
}
public static List<SysPlat> getSysPlats() {
return sysPlats;
}
public static void setSysPlats(List<SysPlat> sysPlats) {
MetaKit.sysPlats = sysPlats;
}
//-----------------------------------
public static void setMetaServices(List<MetaService> metaServices) {
MetaKit.metaServices = metaServices;
}
// -----------------------------------
/**
* 通过 别名 查询 MetaTable
@@ -150,12 +116,6 @@ public class MetaKit {
*/
public static MetaService getMetaService(String name, String token) {
Optional<MetaService> service = metaServices.stream().filter(x -> x.getName().equals(name)).findAny();
//处理业务逻辑
service.ifPresent(x -> {
//x.setMetaTable(metaTableByAlias(x.getTable()));
//x.setMetaLinks(metaLinks(x.getLinks()));
//x.setTables(metaTables(x.getMetaLinks()));
});
return service.orElse(null);
}
@@ -185,83 +145,14 @@ public class MetaKit {
return t;
};
public static Function<String, Field> getField = (n) -> {
String[] arr = n.split("[.]");
MetaTable metaTable = getMetaTableByAlias(arr[0]);
return metaTable.getItems().stream().filter(x -> x.getName().equals(arr[1])).findAny().orElse(null);
};
//listcfg
/*public static Function<MetaService, Kv> builderCfg = (m) -> {
List<String> shows = m.getShows();
List<Map> filters = m.getFilters();
List<Map> _filters = new ArrayList<>();
List<Map> _cols = new ArrayList<>();
//todo: 优化,批量操作
//build shows
shows.forEach(x -> {
Field field = getField.apply(x);
if (field != null) {
Kv col = Kv.of();
col.set("col", x.split("$]")[0] + field.showField());//a.createtime=dt
col.set("label", field.getLabel());
col.set("order", 1);//dev 是否支持排序
_cols.add(col);
}
});
//build filters
filters.forEach(x -> {
Kv filter = Kv.of();
Field filed = getField.apply(x.get("name") + "");
if (filed != null) {
filter.set("name", x.get("name"));
filter.set("label", filed.getLabel());
}
filter.set("inType", filed.getInType());
filter.set("inExt", filed.getInExt());
List<Kv> types = new ArrayList<>();
List<String> list = (List) x.get("filterType");
list.forEach(t -> {
FilterType type = FilterType.getFilterType(t);
if (type != null) {
types.add(Kv.of("name", t).set("remark", type.getRemark()));
}
});
filter.set("filterType", types);
Object checked = x.getOrDefault("checked", false);
filter.set("checked", checked instanceof Boolean ? checked : false);
_filters.add(filter);
});
*//*shows.forEach(x -> {
_shows.add(Kv.of("name", x).set("label", getFieldLabel(x)));
});*//*
Kv cfg = Kv.of();
cfg.set("title", m.getName())//业务名称
//.set("url", getUrl())
.set("cols", _cols)//展示的数据列
//.set("conditionLabel", "")
.set("filters", _filters);//查询过滤条件
return cfg;
};*/
public static Map cfg(String name, String token) {
MetaService metaService = getMetaService(name, token);
Kv<String, MetaTable> metaTables = getMetaTables(metaService, false);
List<Map<String, String>> shows = metaService.getShows();
List<Map> edits = metaService.getEdits();
//List<Map> edits = metaService.getEdits();
List<String> details = metaService.getDetails();
List<Map> filters = metaService.getFilters();
List<Filter> filters = metaService.getFilters();
String comment = metaService.getComment();
//List<Field> items = new ArrayList<>();
@@ -293,7 +184,7 @@ public class MetaKit {
//filters
List<Map> _filters = new ArrayList<>();
filters.forEach(x -> {
String col = String.valueOf(x.get("name"));
String col = String.valueOf(x.getName());
MetaTable metaTable = metaTables.get(col.split("[.]")[0]); // 表别名
Kv filter = Kv.of();
@@ -301,10 +192,10 @@ public class MetaKit {
.filter(y -> col.split("[.]")[1].equals(y.getName()))
.findFirst()
.ifPresent(y -> {
filter.set("name", x.get("name"));
filter.set("label", x.get("label") != null ? x.get("label") : y.getLabel());
filter.set("name", x.getName());
filter.set("label", x.getLabel() != null ? x.getLabel() : y.getLabel());
List<Kv> types = new ArrayList<>();
List<String> list = (List) x.get("filterType");
List<String> list = (List) x.getFilterType();
list.forEach(t -> {
FilterType type = FilterType.getFilterType(t);
if (type != null) {
@@ -316,15 +207,14 @@ public class MetaKit {
if (!types.isEmpty()) {//设置默认查询项
filter.set("type", types.get(0).get("name"));
}
Object checked = x.getOrDefault("checked", false);
filter.set("checked", checked instanceof Boolean ? checked : false);
filter.set("checked", x.isChecked());
});
_filters.add(filter);
});
//edits
List _edits = new ArrayList();//edits;
edits.forEach(x -> {
/*edits.forEach(x -> {
Kv kv = Kv.of();
kv.set("col", x);
@@ -348,7 +238,7 @@ public class MetaKit {
}
_edits.add(kv);
});
});*/
//details
List _details = new ArrayList();//details;
@@ -460,7 +350,7 @@ public class MetaKit {
if (!all) {
allAlias = Liangs.streamConcat(
metaService.getFilters().stream().map(f -> {
String col = (String) f.get("name");
String col = (String) f.getName();
String alias = col.split("[.]")[0];
return alias;
}),