修改驼峰命名法

appbuild-manager/src/main/java/com/mortals/xhx/base/system/gentable/model/GentableEntityExt.java

@@ -53,6 +53,15 @@ public class GentableEntityExt extends BaseEntityLong {
      * 子表信息
      */
     private GentableEntity subTable;
+    /**
+     * 子表1信息
+     */
+    private GentableEntity subTable1;
+    /**
+     * 子表信息
+     */
+    private GentableEntity subTable2;
+    private GentableEntity subTable3;
 
     private String requestMapping;
 
@@ -73,6 +82,7 @@ public class GentableEntityExt extends BaseEntityLong {
      */
     private List<GentableColumnEntity> columns;
 
+
     public static boolean isSuperColumn(String javaField) {
         return StringUtils.equalsAnyIgnoreCase(javaField,
                 // BaseEntity

appbuild-manager/src/main/java/com/mortals/xhx/base/system/gentable/service/impl/GentableServiceImpl.java

@@ -702,6 +702,9 @@ public class GentableServiceImpl extends AbstractCRUDServiceImpl<GentableDao, Ge
      */
     public void setSubTable(GentableEntity table) {
         String subTableName = table.getSubTableName();
+        String subTableName1 = table.getSubTableName1();
+        String subTableName2 = table.getSubTableName2();
+        String subTableName3 = table.getSubTableName3();
         if (StringUtils.isNotEmpty(subTableName)) {
             GentableEntity gentableEntity = this.selectOne(new GentableQuery().tableName(subTableName));
             if (!ObjectUtils.isEmpty(gentableEntity)) {
@@ -711,6 +714,36 @@ public class GentableServiceImpl extends AbstractCRUDServiceImpl<GentableDao, Ge
                 table.setSubTable(gentableEntity);
             }
         }
+
+        if (StringUtils.isNotEmpty(subTableName1)) {
+            GentableEntity gentableEntity = this.selectOne(new GentableQuery().tableName(subTableName1));
+            if (!ObjectUtils.isEmpty(gentableEntity)) {
+                List<GentableColumnEntity> columnEntities = gentableColumnService.find(new GentableColumnQuery().tableId(gentableEntity.getId()));
+                gentableEntity.setColumns(columnEntities);
+                setPkColumn(gentableEntity);
+                table.setSubTable1(gentableEntity);
+            }
+        }
+
+        if (StringUtils.isNotEmpty(subTableName2)) {
+            GentableEntity gentableEntity = this.selectOne(new GentableQuery().tableName(subTableName2));
+            if (!ObjectUtils.isEmpty(gentableEntity)) {
+                List<GentableColumnEntity> columnEntities = gentableColumnService.find(new GentableColumnQuery().tableId(gentableEntity.getId()));
+                gentableEntity.setColumns(columnEntities);
+                setPkColumn(gentableEntity);
+                table.setSubTable2(gentableEntity);
+            }
+        }
+
+        if (StringUtils.isNotEmpty(subTableName3)) {
+            GentableEntity gentableEntity = this.selectOne(new GentableQuery().tableName(subTableName3));
+            if (!ObjectUtils.isEmpty(gentableEntity)) {
+                List<GentableColumnEntity> columnEntities = gentableColumnService.find(new GentableColumnQuery().tableId(gentableEntity.getId()));
+                gentableEntity.setColumns(columnEntities);
+                setPkColumn(gentableEntity);
+                table.setSubTable3(gentableEntity);
+            }
+        }
     }
 
 

appbuild-manager/src/main/java/com/mortals/xhx/common/utils/FreeMarkerUtils.java

@@ -247,16 +247,16 @@ public class FreeMarkerUtils {
         JSONObject paramsObj = JSONObject.parseObject(options);
         //树编码
         String treeCode = getTreecode(paramsObj);
-
+        //树父编码 返回的是驼峰命名法的字段名称
         String treeParentCode = getTreeParentCode(paramsObj);
 
-        //获取树编码父节点类型 todo
+        //获取树编码父节点类型 todo {"treeCode":"category_code","treeName":"category_name","treeParentCode":"parent_id"}
         String treeParentCodeType = "String";
 
         List<GentableColumnEntity> columns = genTable.getColumns();
 
         for (GentableColumnEntity column : columns) {
-            if (treeParentCode.equals(column.getColumnName())) {
+            if (treeParentCode.equals(StringUtils.toCamelCase(column.getColumnName()))) {
                 treeParentCodeType = column.getJavaType();
                 break;
             }
@@ -336,10 +336,28 @@ public class FreeMarkerUtils {
 
     public static void setSubFreeMarkerData(Map data, GentableEntity genTable) {
         GentableEntity subTable = genTable.getSubTable();
+        GentableEntity subTable1 = genTable.getSubTable1();
+        GentableEntity subTable2 = genTable.getSubTable2();
+        GentableEntity subTable3 = genTable.getSubTable3();
         String subTableName = genTable.getSubTableName();
         String subTableFkName = genTable.getSubTableFkName();
-        String subClassName = genTable.getSubTable().getClassName();
+        String subTableFkName1 = genTable.getSubTableFkName1();
+        String subTableFkName2 = genTable.getSubTableFkName2();
+        String subTableFkName3 = genTable.getSubTableFkName3();
+
+
+        String subClassName = genTable.getSubTable() == null ? "" : genTable.getSubTable().getClassName();
+        String subClassName1 = genTable.getSubTable1() == null ? "" : genTable.getSubTable1().getClassName();
+        String subClassName2 = genTable.getSubTable2() == null ? "" : genTable.getSubTable2().getClassName();
+        String subClassName3 = genTable.getSubTable3() == null ? "" : genTable.getSubTable3().getClassName();
+
+
         String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName);
+        String subTableFkClassName1 = StringUtils.convertToCamelCase(subTableFkName1);
+        String subTableFkClassName2 = StringUtils.convertToCamelCase(subTableFkName2);
+        String subTableFkClassName3 = StringUtils.convertToCamelCase(subTableFkName3);
+
+
         String businessName = subTable.getBusinessName().replace("\\.", "");
         String functionName = subTable.getFunctionName();
         String subPackageName = genTable.getPackageName() + "." + genTable.getModuleName() + "." + businessName;
@@ -348,20 +366,38 @@ public class FreeMarkerUtils {
         data.put("subPackageName", subPackageName);
         data.put("subTableName", subTableName);
         data.put("subTableFkName", subTableFkName);
+        data.put("subTableFkName1", subTableFkName1);
+        data.put("subTableFkName2", subTableFkName2);
+        data.put("subTableFkName3", subTableFkName3);
         data.put("subFunctionName", StringUtils.isNotEmpty(functionName) ? functionName : subTable.getTableComment());
         //外键java类型
         data.put("subTableFkType", getFkJavaType(subTable, subTableFkName));
-        data.put("subTableFkClassName", subTableFkClassName);
+        data.put("subTableFkType1", getFkJavaType(subTable1, subTableFkName1));
+        data.put("subTableFkType2", getFkJavaType(subTable2, subTableFkName2));
+        data.put("subTableFkType3", getFkJavaType(subTable3, subTableFkName3));
+        //data.put("subTableFkClassName", subTableFkClassName);
         data.put("subTableFkclassName", StringUtils.uncapitalize(subTableFkClassName));
+        data.put("subTableFkclassName1", StringUtils.uncapitalize(subTableFkClassName1));
+        data.put("subTableFkclassName2", StringUtils.uncapitalize(subTableFkClassName2));
+        data.put("subTableFkclassName3", StringUtils.uncapitalize(subTableFkClassName3));
         data.put("subClassName", subClassName);
+        data.put("subClassName1", subClassName1);
+        data.put("subClassName2", subClassName2);
+        data.put("subClassName3", subClassName3);
         data.put("subBusinessName", businessName);
         data.put("subclassName", StringUtils.uncapitalize(subClassName));
+        data.put("subclassName1", StringUtils.uncapitalize(subClassName1));
+        data.put("subclassName2", StringUtils.uncapitalize(subClassName2));
+        data.put("subclassName3", StringUtils.uncapitalize(subClassName3));
+
+
         data.put("subImportList", getImportList(subTable));
         data.put("subColumns", subTable.getColumns());
         data.put("subPkColumn", subTable.getPkColumn());
     }
 
     private static String getFkJavaType(GentableEntity subTable, String subTableFkName) {
+        if (ObjectUtils.isEmpty(subTable)) return "";
         String subTableFkType = "";
         GentableColumnEntity gentableColumnEntity = subTable.getColumns().stream().filter(f -> subTableFkName.equals(f.getColumnName())).findFirst().orElseGet(() -> null);
         if (!ObjectUtils.isEmpty(gentableColumnEntity)) {
@@ -440,9 +476,7 @@ public class FreeMarkerUtils {
             fileName = StringUtils.format("{}/{}/model/vo/{}Vo.java", javaPath, businessName, className);
         } else if (template.contains("entityQuery.java.ftl")) {
             fileName = StringUtils.format("{}/{}/model/{}Query.java", javaPath, businessName, className);
-        }
-
-        else if (template.contains("dao.java.ftl")) {
+        } else if (template.contains("dao.java.ftl")) {
             fileName = StringUtils.format("{}/{}/dao/{}Dao.java", javaPath, businessName, className);
         } else if (template.contains("daoImpl.java.ftl")) {
             fileName = StringUtils.format("{}/{}/dao/ibatis/{}DaoImpl.java", javaPath, businessName, className);
@@ -570,11 +604,22 @@ public class FreeMarkerUtils {
 
     public static void main(String[] args) {
 
-        String templatePath = "E:\\pic\\template\\";
+
+         String json="{\"treeCode\":\"category_code\",\"treeName\":\"category_name\",\"treeParentCode\":\"parent_id\"}";
+
+        JSONObject paramsObj= JSONObject.parseObject(json);
+
+        String treeParentCode = getTreeParentCode(paramsObj);
+
+        System.out.println(treeParentCode);
+
+        //获取树编码父节点类型 todo {"treeCode":"category_code","treeName":"category_name","treeParentCode":"parent_id"}
+
+/*        String templatePath = "E:\\pic\\template\\";
 
         FreeMarkerUtils.initFreeMarkerPath(templatePath);
 
-        Template template = FreeMarkerUtils.getTemplate("634745647093772288.xml");
+        Template template = FreeMarkerUtils.getTemplate("634745647093772288.xml");*/
 
         //System.out.println(template);
 

appbuild-manager/src/main/resources/template/sql/dm_db.sql.ftl

@@ -38,7 +38,11 @@
         <#else>
             <#assign Default></#assign>
         </#if>
-        "${column.columnName}" ${columnType}   ${autoInc} ${Required} ${Default} ,
+        "${column.columnName}" <#if columnType??>
+        ${columnType}
+    <#else>
+        VARCHAR
+    </#if>   ${autoInc} ${Required} ${Default} ,
     </#list>
 NOT CLUSTER PRIMARY KEY("${table.pkColumn.columnName}"));
 COMMENT ON TABLE "${table.tableName}" IS '${table.functionName}';