1、代码优化,重构逻辑,界面html
2、解决TplKit 因升级导致的模板文件找不到(退回原版本)
This commit is contained in:
@@ -41,6 +41,12 @@ public class MetaKit {
|
||||
}
|
||||
|
||||
public static <T extends Doc> void reload(Class<T> clazz) {
|
||||
reload(clazz, null);
|
||||
}
|
||||
public static <T extends Doc> void reload(T t) {
|
||||
reload(t.getClass(), t.getKey());
|
||||
}
|
||||
public static <T extends Doc> void reload(Class<T> clazz, String key) {
|
||||
|
||||
if (MetaTable.class == clazz) metaTables = MetaTable.dao.find();
|
||||
else if (MetaLink.class == clazz) metaLinks = MetaLink.dao.find();
|
||||
@@ -48,6 +54,7 @@ public class MetaKit {
|
||||
else if (DbAccount.class == clazz) dbPlats = DbAccount.dao.find();
|
||||
else if (DbPlat.class == clazz) dbPlats = DbAccount.dao.find();
|
||||
else if (SysPlat.class == clazz) sysPlats = SysPlat.dao.find();
|
||||
// todo: 按照key 查询更新内存
|
||||
}
|
||||
|
||||
//----- get/set ----
|
||||
|
||||
@@ -14,7 +14,6 @@ public class TplKit {
|
||||
private static TplKit tplKit = null;
|
||||
private static SqlKit kit = null;
|
||||
private static boolean hadParse = false;// 标记 是否已经解析
|
||||
private static String clazzRoot = new File(FileKit.rootPath()).getPath();
|
||||
|
||||
public static TplKit use() {
|
||||
return use(false);
|
||||
@@ -22,7 +21,7 @@ public class TplKit {
|
||||
|
||||
/**
|
||||
* 获取单列的实例对象,
|
||||
*
|
||||
*
|
||||
* @param isDev
|
||||
* 是否开发模式, 多次调用只有第一次的 isDev生效
|
||||
* @return
|
||||
@@ -38,6 +37,7 @@ public class TplKit {
|
||||
|
||||
private TplKit(boolean isDev) {
|
||||
kit = new SqlKit("tplKit", isDev);
|
||||
kit.setBaseSqlTemplatePath("/");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -54,9 +54,9 @@ public class TplKit {
|
||||
|
||||
/**
|
||||
* 添加文件/目录 到模板解析器
|
||||
*
|
||||
*
|
||||
* @param tplFile
|
||||
* 文件/目录必须放到 resources/下面
|
||||
* 模板文件/目录
|
||||
*/
|
||||
public void addTpl(File tplFile) {
|
||||
addTpl(tplFile, null);
|
||||
@@ -65,7 +65,7 @@ public class TplKit {
|
||||
|
||||
/**
|
||||
* 添加文件/目录 到模板解析器
|
||||
*
|
||||
*
|
||||
* @param tplFile
|
||||
* 文件/目录
|
||||
* @param filter
|
||||
@@ -73,7 +73,8 @@ public class TplKit {
|
||||
*/
|
||||
public void addTpl(File tplFile, FileFilter filter) {
|
||||
if (tplFile.isFile()) {
|
||||
addTpl(tplFile.getPath().replace(clazzRoot, "")); //以classes路径开始的路径
|
||||
addTpl(tplFile.getPath());
|
||||
//addTpl(tplFile.getPath().replace(clazzRoot, "")); //以classes路径开始的路径
|
||||
} else if (tplFile.isDirectory()) {
|
||||
File[] files = tplFile.listFiles(filter);
|
||||
for (int i = 0; i < files.length; i++) {
|
||||
|
||||
@@ -179,32 +179,35 @@ public class MetadataService extends BaseService { //arango
|
||||
|
||||
//修改item的排序
|
||||
@RestMapping(name = "itemsort", comment = "字段排序")
|
||||
public String[] itemSortSave(String serviceKey , String[] items, @RestParam(name = "platToken") String token) {
|
||||
public String[] itemSortSave(String alias , String[] items, @RestParam(name = "platToken") String token) {
|
||||
|
||||
MetaTable metaTable = MetaKit.getMetaTableByAlias(alias);
|
||||
|
||||
MetaTable metaTable = findMetaTable(serviceKey, token);
|
||||
MetaKit.sortItem.apply(metaTable, items);
|
||||
metaTable.update();
|
||||
return items;
|
||||
}
|
||||
|
||||
@RestMapping(name = "itemupdate", comment = "字段修改")
|
||||
public List<Field> itemUpdate(String serviceKey , List<Field> items, @RestParam(name = "platToken") String token) {
|
||||
MetaTable metaTable = findMetaTable(serviceKey, token);
|
||||
public JBean itemUpdate(String alias, List<Field> items, @RestParam(name = "platToken") String token) {
|
||||
MetaTable metaTable = MetaKit.getMetaTableByAlias(alias);
|
||||
|
||||
MetaKit.itemUpdate.apply(metaTable, items);
|
||||
metaTable.update();
|
||||
return items;
|
||||
MetaKit.reload(metaTable);
|
||||
return JBean.OK;
|
||||
}
|
||||
|
||||
@RestMapping(name = "showsort", comment = "展示字段修改")
|
||||
public List<String> showSort(String serviceKey , List<String> items, @RestParam(name = "platToken") String token) {
|
||||
public JBean showSort(String serviceKey , List<String> items, @RestParam(name = "platToken") String token) {
|
||||
if (items == null || items.size() == 0) return null;
|
||||
|
||||
MetaService metaService = MetaKit.getMetaService(serviceKey);
|
||||
|
||||
metaService.setShows(items);
|
||||
metaService.update();
|
||||
return items;
|
||||
MetaKit.reload(metaService);
|
||||
return JBean.OK;
|
||||
}
|
||||
|
||||
@RestMapping(name = "exportsort", comment = "导出字段排序保存")
|
||||
@@ -213,8 +216,9 @@ public class MetadataService extends BaseService { //arango
|
||||
|
||||
MetaService metaService = MetaKit.getMetaService(serviceKey);
|
||||
metaService.setExports(items);
|
||||
|
||||
metaService.update();
|
||||
|
||||
MetaKit.reload(metaService);
|
||||
return items;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import com.google.gson.Gson;
|
||||
import net.tccn.base.FileKit;
|
||||
import net.tccn.base.Kv;
|
||||
import net.tccn.base.MetaKit;
|
||||
import net.tccn.base.TplKit;
|
||||
@@ -12,6 +13,7 @@ import net.tccn.qtask.Task;
|
||||
import net.tccn.user.User;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
@@ -173,12 +175,10 @@ public class RunTest<T> {
|
||||
System.out.println(kv);
|
||||
}
|
||||
|
||||
//@Test
|
||||
@Test
|
||||
public void tplTest() {
|
||||
TplKit use = TplKit.use(true);
|
||||
//use.addTpl(new File(FileKit.rootPath(), "tpl")); ok
|
||||
//use.addTpl("/tpl/aql/db.sql"); //ok
|
||||
use.addTpl("tpl\\sql\\db.sql"); //ok
|
||||
use.addTpl(new File(FileKit.rootPath(), "tpl")); //ok
|
||||
String tpl = use.getTpl("db.table_list", Kv.of("catalogs", asList("redbbs")));
|
||||
System.out.println(tpl);
|
||||
|
||||
@@ -195,7 +195,7 @@ public class RunTest<T> {
|
||||
|
||||
@Test
|
||||
public void buildMethod() {
|
||||
tplKit.addTpl("/tpl/_t.tpl");
|
||||
tplKit.addTpl(new File(FileKit.rootPath(), "/tpl/_t.tpl"));
|
||||
|
||||
//buildMethod("table_link_list", "实体表,包含link信息的列表");
|
||||
buildMethod("link_info", "关联信息 ");
|
||||
|
||||
Reference in New Issue
Block a user