diff --git a/src/com/eversec/kit/creator/ICreator.java b/src/com/eversec/kit/creator/ICreator.java index 8f6f5ab..8fba403 100644 --- a/src/com/eversec/kit/creator/ICreator.java +++ b/src/com/eversec/kit/creator/ICreator.java @@ -63,7 +63,8 @@ public abstract class ICreator { public static Engine engine = Engine.use(); public static Map cateRelation = Kv.of("varchar", "String").set("text", "String").set("int", "Integer").set("bigint", "Long").set("long", "Long").set(null, "String").set("datetime", "Date"); - public static String[] fields = {"field","cate", "must","remark1", "remark2", "tag", "selects", "column","filter", "ck", "edit","update","xqzs"}; + //public static String[] fields = {"field","cate", "must","remark1", "remark2", "tag", "selects", "column","filter", "ck", "edit","update","xqzs"}; + public static String[] fields = {"field", "remark1", "cate", "must", "remark2"}; public static Gson gson = new Gson(); public static List sheetNames() { @@ -130,7 +131,7 @@ public abstract class ICreator { } public static boolean isMust(Map map) { - return false;//(map.get("must")+"") .equals("是") || (map.get("must")+"").equals("必须"); + return (map.get("must")+"") .equals("是") || (map.get("must")+"").equals("必须"); } public static boolean isEmpty(Object obj){ return obj == null || (obj+"").isEmpty(); @@ -163,7 +164,7 @@ public abstract class ICreator { return str; } protected static String getClazzName(Map note) { - String field = note.get("field")+""; + /*String field = note.get("field")+""; if (field.isEmpty()) return ""; @@ -174,6 +175,8 @@ public abstract class ICreator { } field = field.substring(0, inx).toLowerCase(); + */ + String field = (note.get("remark1")+"").trim(); String[] arr = field.split("_"); String str = ""; for (String s : arr) { @@ -183,15 +186,16 @@ public abstract class ICreator { } //{field:"ti_abc(测试表)"} => 测试表 protected static String getRemark(Map note) { - String field = note.get("field")+""; + /*String field = note.get("field")+""; if (field.isEmpty()) return ""; int s = field.indexOf("("); int e = field.indexOf(")"); if (s > 0){ return field.substring(s+1, e > 0 ? e : field.length()); - } - return ""; + }*/ + System.out.println(note.get("field")+""); + return note.get("field")+""; } protected static String getVerify(Map map) { if (map.get("cate") == null){ diff --git a/src/com/eversec/kit/creator/Runner.java b/src/com/eversec/kit/creator/Runner.java index d122c59..b49db21 100644 --- a/src/com/eversec/kit/creator/Runner.java +++ b/src/com/eversec/kit/creator/Runner.java @@ -119,7 +119,7 @@ public class Runner { } }); - infoBuf.append("\t\t==> "+ k + "\n"); + infoBuf.append("\t\t==> "+ k + "\t"+ ICreator.getTableName(clazz) + "\n"); }catch (Exception e){ e.printStackTrace(); } diff --git a/src/com/eversec/kit/creator/impl/SqlKit.java b/src/com/eversec/kit/creator/impl/SqlKit.java index 0f699df..a655e39 100644 --- a/src/com/eversec/kit/creator/impl/SqlKit.java +++ b/src/com/eversec/kit/creator/impl/SqlKit.java @@ -30,7 +30,8 @@ public class SqlKit extends ICreator { x.put("isMust", isMust(x)); //x.put("fieldType", this.getFieldType(x.get("cate")+"")); x.put("fieldType", x.get("cate")); - x.put("remark", x.get("remark1")); + //x.put("remark", x.get("remark1")); + x.put("remark", "["+ x.get("remark1") + "]"+ (isEmpty(x.get("remark2")) ? "" : x.get("remark2"))); }); Kv kv = createTplData(clazz); diff --git a/tpl/SqlTpl.sql b/tpl/SqlTpl.sql index 1706c09..a85d1d9 100644 --- a/tpl/SqlTpl.sql +++ b/tpl/SqlTpl.sql @@ -1,7 +1,6 @@ ##(remark) -# drop table if exists `#(tableName)`; +drop table if exists `#(tableName)`; CREATE TABLE `#(tableName)` ( - `id` bigint(20) auto_increment comment '主键', #for(x : fieldList) #set( field=x.field @@ -13,7 +12,7 @@ CREATE TABLE `#(tableName)` ( `#(field)` #(x.fieldType) #(isMust) #(autoIncrement) comment '#(x.remark)', #end #end - PRIMARY KEY (`id`) + PRIMARY KEY (`#(fieldList[0].field)`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 comment '#(remark)';