修改前端生成页面

appbuild-manager/src/main/bin/start.sh

 #!/bin/sh
+source /etc/profile
 PORT="@profiles.server.port@"
 BASEDIR=`dirname $0`/..
 BASEDIR=`(cd "$BASEDIR"; pwd)`

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

@@ -213,7 +213,7 @@ public class GentableServiceImpl extends AbstractCRUDServiceImpl<GentableDao, Ge
             }
 
 
-            if (temp.equals("menu.sql.ftl") || temp.equals("db.sql.ftl") || temp.equals("api.md.ftl")) {
+            if (temp.equals("menu.sql.ftl") || temp.equals("db.sql.ftl")|| temp.equals("dm_db.sql.ftl")  || temp.equals("api.md.ftl")) {
                 try {
                     List<GentableEntity> tableList = new ArrayList<>();
                     tableList.add(gentableEntity);
@@ -270,6 +270,7 @@ public class GentableServiceImpl extends AbstractCRUDServiceImpl<GentableDao, Ge
         FreeMarkerUtils.initFreeMarker(genFreePath("menu.sql.ftl"));
         zipTemplate("menu.sql.ftl", "db/menu.sql", data, zip);
         zipTemplate("db.sql.ftl", "db/db.sql", data, zip);
+        zipTemplate("dm_db.sql.ftl", "db/dm_db.sql", data, zip);
         FreeMarkerUtils.initFreeMarker(genFreePath("api.md.ftl"));
         zipTemplate("api.md.ftl", "doc/api.md", data, zip);
 
@@ -292,6 +293,7 @@ public class GentableServiceImpl extends AbstractCRUDServiceImpl<GentableDao, Ge
         FreeMarkerUtils.initFreeMarker(genFreePath("menu.sql.ftl"));
         zipTemplate("menu.sql.ftl", "db/menu.sql", data, zip);
         zipTemplate("db.sql.ftl", "db/db.sql", data, zip);
+        zipTemplate("dm_db.sql.ftl", "db/dm_db.sql", data, zip);
         FreeMarkerUtils.initFreeMarker(genFreePath("api.md.ftl"));
         zipTemplate("api.md.ftl", "doc/api.md", data, zip);
         IOUtils.closeQuietly(zip);
@@ -523,9 +525,6 @@ public class GentableServiceImpl extends AbstractCRUDServiceImpl<GentableDao, Ge
                         if (temp.contains("webForm.java.ftl")||temp.contains("web.java.ftl")) {
                             continue;
                         }
-//                if (temp.contains("entity.java.ftl")||temp.contains("entityQuery.java.ftl")) {
-//                    continue;
-//                }
                     } else if (gentableEntity.getIsShowControl() == 0) {
                         if (temp.contains("webBody.java.ftl")) {
                             continue;
@@ -568,6 +567,9 @@ public class GentableServiceImpl extends AbstractCRUDServiceImpl<GentableDao, Ge
                 if (temp.equals("db.sql.ftl")) {
                     continue;
                 }
+                if (temp.equals("dm_db.sql.ftl")) {
+                    continue;
+                }
                 if (temp.equals("api.md.ftl")) {
                     continue;
                 }

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

@@ -100,6 +100,7 @@ public class FreeMarkerUtils {
         templates.add("webForm.java.ftl");
         templates.add("sqlMap.xml.ftl");
         templates.add("db.sql.ftl");
+        templates.add("dm_db.sql.ftl");
         templates.add("menu.sql.ftl");
         templates.add("api.md.ftl");
 

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

@@ -23,17 +23,17 @@ CREATE TABLE ${table.tableName}(
     <#else>
         <#assign Required></#assign>
     </#if>
-    <#if column.javaType=="String" >
+<#--    <#if column.javaType=="String" >
         <#assign Type>CHARACTER SET utf8 COLLATE utf8_general_ci</#assign>
     <#else>
         <#assign Type></#assign>
-    </#if>
-    <#if column.defaultValue??>
+    </#if>-->
+    <#if column.defaultValue??&& column.defaultValue!="">
         <#assign Default>DEFAULT '${column.defaultValue}'</#assign>
     <#else>
         <#assign Default></#assign>
     </#if>
-    `${column.columnName}` ${column.columnType} ${Required}  ${autoInc}  COMMENT '${column.columnComment}',
+    `${column.columnName}` ${column.columnType} ${Required}  ${autoInc} ${Default}  COMMENT '${column.columnComment}',
 </#list>
 PRIMARY KEY  (`${table.pkColumn.columnName}`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='${table.functionName}';

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

+<#list tableList as table>
+    CREATE TABLE "${table.tableName}"(
+    <#list table.columns as column>
+        <#if column.isIncrement==1 >
+            <#assign autoInc>IDENTITY(1, 1)</#assign>
+        <#else>
+            <#assign autoInc></#assign>
+        </#if>
+        <#if column.isRequired==1 >
+            <#assign Required>NOT NULL</#assign>
+        <#else>
+            <#assign Required></#assign>
+        </#if>
+        <#if column.isPrimaryKey==1 >
+            <#assign Required>NOT NULL</#assign>
+        </#if>
+        <#if column.isRequired==1 >
+            <#assign Required>NOT NULL</#assign>
+        <#else>
+            <#assign Required></#assign>
+        </#if>
+        <#if column.columnType?contains("bigint") >
+            <#assign columnType>bigint</#assign>
+        <#elseif column.columnType?contains("tinyint") >
+            <#assign columnType>tinyint</#assign>
+        <#elseif column.columnType=="int" >
+            <#assign columnType>int</#assign>
+        <#elseif column.columnType=="datetime" >
+            <#assign columnType>timestamp(0)</#assign>
+        <#elseif column.columnType=="mediumtext" >
+            <#assign columnType>text</#assign>
+        <#elseif column.columnType=="longtext" >
+            <#assign columnType>text</#assign>
+        </#if>
+
+        <#if column.defaultValue??&& column.defaultValue!="">
+            <#assign Default>DEFAULT ${column.defaultValue}</#assign>
+        <#else>
+            <#assign Default></#assign>
+        </#if>
+        "${column.columnName}" ${columnType}   ${autoInc} ${Required} ${Default} ,
+    </#list>
+NOT CLUSTER PRIMARY KEY("${table.pkColumn.columnName}"));
+COMMENT ON TABLE "${table.tableName}" IS '${table.functionName}';
+    <#list table.columns as column>
+COMMENT ON COLUMN "${table.tableName}"."${column.columnName}" IS '${column.columnComment}';
+    </#list>
+
+</#list>
\ No newline at end of file

appbuild-manager/src/main/resources/template/vue/webVueList.vue.ftl

@@ -64,9 +64,9 @@
         </el-dialog>
         </#if>
 
-        <#if table.detailShow==1 >
+        <#if table.detailShow??&&table.detailShow==1 >
         <dialog-show ref="dialogform" @ok="getData" />
-        <#elseif table.detailShow==2>
+        <#elseif table.detailShow??&&table.detailShow==2>
         <drawer-show ref="drawerform" @ok="getData" />
         <#else>
         <dialog-show ref="dialogform" @ok="getData" />
@@ -76,10 +76,9 @@
 
 <script>
     /** 表单弹出框模式需引入 */
-
-    <#if table.detailShow==1 >
+    <#if table.detailShow??&&table.detailShow==1 >
     import dialogShow from "./dialogshow";
-    <#elseif table.detailShow==2>
+    <#elseif table.detailShow??&&table.detailShow==2>
     import drawerShow from "./drawershow";
     <#else >
     import dialogShow from "./dialogshow";
@@ -88,9 +87,9 @@
     export default {
         name: "${ClassName}List",
         components: {
-            <#if table.detailShow==1 >
+            <#if table.detailShow??&&table.detailShow==1 >
             dialogShow
-            <#elseif table.detailShow==2>
+            <#elseif table.detailShow??&&table.detailShow==2>
             drawerShow
             <#else >
             dialogShow
@@ -166,7 +165,7 @@
                  );
             },
             </#if>
-            <#if table.detailShow==1 >
+            <#if table.detailShow??&&table.detailShow==1 >
             /** 重写新增方法 */
             toAdd(row) {
                 this.$refs.dialogform.add(row);
@@ -179,7 +178,7 @@
             toView(row) {
                 this.$refs.dialogform.view(row);
             },
-            <#elseif table.detailShow==2>
+            <#elseif table.detailShow??&&table.detailShow==2>
             /** 重写新增方法 */
             toAdd(row) {
                 this.$refs.drawerform.add(row);