fix 新增菜单路由问题

动态表单显示/输入字段显示为空问题
数据库语句生成无法执行的问题

boman-api/boman-domain/src/main/java/com.boman.domain/GenTableColumn.java

@@ -139,12 +139,24 @@ public class GenTableColumn extends BaseEntity
      */
     private Object columnValue;
 
+    /**
+     * 正则表达式
+     */
+    private String regular;
+
     /**
      * 查询时：{"fkTableName":"外键表的表名", "fkColumnName":"关联外键表的列名", "dkColumnName":"关联表需要展示的字段名"}
      * 根据列名获取关联表字段的值和名称{"name":"12", "value":"dept_id"}
      */
     private Map<String, String> fkInfo;
 
+    public String getRegular() {
+        return regular;
+    }
+
+    public void setRegular(String regular) {
+        this.regular = regular;
+    }
 
     public String getFieldTranslator() {
         return fieldTranslator;

boman-common/boman-common-core/src/main/java/com/boman/common/core/constant/UserConstants.java

@@ -77,7 +77,7 @@ public class UserConstants
     public static final int PASSWORD_MAX_LENGTH = 20;
 
     /**
-     * 是自增
+     * 是自增/是主键
      */
     public static final String INCREMENT = "1";
 

boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableServiceImpl.java

@@ -90,10 +90,10 @@ public class GenTableServiceImpl implements IGenTableService {
             if (tablePrimaryKey != null && tablePrimaryKey.equals(columnId)) {
                 genTable.setTablePrimaryKeyName(column.getColumnName());
                 index++;
-            } else if (akColumn != null && akColumn.equals(columnId)) {
+            }  if (akColumn != null && akColumn.equals(columnId)) {
                 genTable.setAkColumnName(column.getColumnName());
                 index++;
-            } else if (dkColumn != null && dkColumn.equals(columnId)) {
+            }  if (dkColumn != null && dkColumn.equals(columnId)) {
                 genTable.setDkColumnName(column.getColumnName());
                 index++;
             }
@@ -471,6 +471,7 @@ public class GenTableServiceImpl implements IGenTableService {
         genTableColumnLog.setSort(num);
         genTableColumnLog.setCreateBy("admin");
         genTableColumnLog.setHtmlType("HR");
+        genTableColumnLog.setMask("000000");
         genTableColumnLog.setCreateTime(DateUtils.getNowDate());
         genTableColumnMapper.insertGenTableColumn(genTableColumnLog);
 
@@ -486,6 +487,7 @@ public class GenTableServiceImpl implements IGenTableService {
         genTableColumnBaseInfo.setSort(20);
         genTableColumnBaseInfo.setCreateBy("admin");
         genTableColumnBaseInfo.setHtmlType("HR");
+        genTableColumnBaseInfo.setMask("000000");
         genTableColumnBaseInfo.setCreateTime(DateUtils.getNowDate());
         genTableColumnMapper.insertGenTableColumn(genTableColumnBaseInfo);
 
@@ -548,7 +550,7 @@ public class GenTableServiceImpl implements IGenTableService {
             //路由地址(使用表名称)
             sysMenu.setPath(genTable.getTableName());
             //组件
-            sysMenu.setComponent("system/surface/index ");
+            sysMenu.setComponent("system/surface/index");
             sysMenu.setMenuType("C");
             sysMenu.setOrderNum("0");
             sysMenu.setIcon("system");
@@ -572,6 +574,8 @@ public class GenTableServiceImpl implements IGenTableService {
                     menu.setOrderNum(String.valueOf(i + 1));
                     menu.setMenuType("F");
                     menu.setIcon("#");
+                    //路由
+                    menu.setPath("#");
                     sysMenu.setCreateBy(SecurityUtils.getUsername());
                     remoteSysMenuService.add(menu);
 

boman-modules/boman-gen/src/main/java/com/boman/gen/service/IGenTableService.java

@@ -144,5 +144,10 @@ public interface IGenTableService {
      */
     public AjaxResult insertGenTable(GenTable genTable);
 
+    /**
+     * 校验表名
+     * @param genTable
+     * @return
+     */
     public String checkTableNameUnique(GenTable genTable);
 }

boman-modules/boman-gen/src/main/java/com/boman/gen/service/TableSqlServiceImpl.java

@@ -151,11 +151,13 @@ public class TableSqlServiceImpl implements ITableSqlService {
         for (GenTableColumn genTableColumn : genTableColumns) {
             if (!"HR".equals(genTableColumn.getHtmlType())){
                 sb.append(genTableColumn.getColumnName()).append(" ").append(genTableColumn.getColumnType());
-                sb = genTableColumn.getDefaultValue() == null ? sb.append(" DEFAULT NULL COMMENT '") : sb.append(" DEFAULT '").append(genTableColumn.getDefaultValue()).append("' COMMENT '");
-                sb.append(genTableColumn.getColumnComment()).append("'").append(",").append("\r\n");
                 if (genTableColumn.getIsPk().equals(UserConstants.INCREMENT)) {
                     primaryKey = genTableColumn.getColumnName();
+                    sb.append(" NOT NULL COMMENT '");
+                }else {
+                    sb = genTableColumn.getDefaultValue() == null ? sb.append(" DEFAULT NULL COMMENT '") : sb.append(" DEFAULT '").append(genTableColumn.getDefaultValue()).append("' COMMENT '");
                 }
+                sb.append(genTableColumn.getColumnComment()).append("'").append(",").append("\r\n");
             }
         }
         if (StringUtils.isNotBlank(primaryKey)) {

boman-modules/boman-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -37,10 +37,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="extendedAttributes"     column="extended_attributes"    />
         <result property="isIn"     column="is_in"    />
         <result property="isOut"     column="is_out"    />
+        <result property="regular"     column="regular"    />
     </resultMap>
 	
 	<sql id="selectGenTableColumnVo">
-        select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, foreign_key, dict_type, sort, create_by, create_time, update_by, update_time, hr_parent_id, mask, default_value, num_rows, num_columns, field_translator, extended_attributes, is_in, is_out from gen_table_column
+        select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, foreign_key, dict_type, sort, create_by, create_time, update_by, update_time, hr_parent_id, mask, default_value, num_rows, num_columns, field_translator, extended_attributes, is_in, is_out, regular from gen_table_column
     </sql>
 	
     <select id="selectGenTableColumnListByTableId" parameterType="GenTableColumn" resultMap="GenTableColumnResult">
@@ -115,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="extendedAttributes != null and extendedAttributes != ''">extended_attributes,</if>
 			<if test="isIn != null and isIn != ''">is_in,</if>
 			<if test="isOut != null and isOut != ''">is_out,</if>
+			<if test="regular != null and regular != ''">regular,</if>
 			create_time
          )values(
 			<if test="tableId != null and tableId != ''">#{tableId},</if>
@@ -145,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="extendedAttributes != null and extendedAttributes != ''">#{extendedAttributes},</if>
 			<if test="isIn != null and isIn != ''">#{isIn},</if>
 			<if test="isOut != null and isOut != ''">#{isOut},</if>
+			<if test="regular != null and regular != ''">#{regular},</if>
 			sysdate()
          )
     </insert>
@@ -181,6 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="extendedAttributes != null and extendedAttributes != ''">extended_attributes = #{extendedAttributes},</if>
             <if test="isIn != null and isIn != ''">is_in = #{isIn},</if>
             <if test="isOut != null and isOut != ''">is_out = #{isOut},</if>
+            <if test="regular != null and regular != ''">regular = #{regular},</if>
             update_time = sysdate()
         </set>
         where column_id = #{columnId}