fix代码生成接口

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

@@ -80,4 +80,6 @@ public class UserConstants
      * 是自增
      */
     public static final String INCREMENT = "1";
+
+    public static final String ISMENU = "Y";
 }

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenController.java

@@ -60,11 +60,11 @@ public class GenController extends BaseController {
      * 修改代码生成业务
      */
     @PreAuthorize(hasPermi = "tool:gen:query")
-    @GetMapping(value = "/{talbleId}")
-    public AjaxResult getInfo(@PathVariable Long talbleId) {
-        GenTable table = genTableService.selectGenTableById(talbleId);
+    @GetMapping(value = "/{tableId}")
+    public AjaxResult getInfo(@PathVariable Long tableId) {
+        GenTable table = genTableService.selectGenTableById(tableId);
         List<GenTable> tables = genTableService.selectGenTableAll();
-        List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId);
+        List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("info" , table);
         map.put("rows" , list);
@@ -86,8 +86,8 @@ public class GenController extends BaseController {
     /**
      * 查询数据表字段列表
      */
-    @GetMapping(value = "/column/{talbleId}")
-    public TableDataInfo columnList(Long tableId) {
+    @GetMapping(value = "/column/{tableId}")
+    public TableDataInfo columnList(@PathVariable Long tableId) {
         TableDataInfo dataInfo = new TableDataInfo();
         List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
         dataInfo.setRows(list);

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenTableColumnController.java

@@ -79,6 +79,15 @@ public class GenTableColumnController extends BaseController {
         return AjaxResult.success(genTableColumnService.selectGenTableColumnListByTableId(tableId));
     }
 
+    /**
+     * 根据字段编号获取字段详细信息
+     */
+    @GetMapping(value = "/getColumnInfo/{columnId}")
+    public AjaxResult getColumnInfo(@PathVariable Long columnId)
+    {
+        return AjaxResult.success(genTableColumnService.selectGenTableColumnListByColumnId(columnId));
+    }
+
     /**
      * 根据主键查找
      */

boman-modules/boman-gen/src/main/java/com/boman/gen/domain/GenTable.java

@@ -167,6 +167,19 @@ public class GenTable extends BaseEntity
      */
     private Long tablePrimaryKey;
 
+    /**
+     * 主键名称
+     */
+    private String tablePrimaryKeyName;
+
+    public String getTablePrimaryKeyName() {
+        return tablePrimaryKeyName;
+    }
+
+    public void setTablePrimaryKeyName(String tablePrimaryKeyName) {
+        this.tablePrimaryKeyName = tablePrimaryKeyName;
+    }
+
     public Long getTablePrimaryKey() {
         return tablePrimaryKey;
     }

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

@@ -140,7 +140,7 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
     public String checkColumnNameUnique(GenTableColumn genTableColumn) {
         Long columnId = StringUtils.isNull(genTableColumn.getColumnId()) ? -1L : genTableColumn.getColumnId();
         GenTableColumn column = genTableColumnMapper.checkColumnNameUnique(genTableColumn.getColumnName());
-        if (StringUtils.isNotNull(column) && column.getColumnId().longValue() != columnId.longValue()) {
+        if (StringUtils.isNotNull(column) && !column.getColumnId().equals(columnId)) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;

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

@@ -73,6 +73,17 @@ public class GenTableServiceImpl implements IGenTableService {
     @Override
     public GenTable selectGenTableById(Long id) {
         GenTable genTable = genTableMapper.selectGenTableById(id);
+        Long tablePrimaryKey = genTable.getTablePrimaryKey();
+        if (tablePrimaryKey != null){
+            List<GenTableColumn> columns = genTable.getColumns();
+            for (GenTableColumn column : columns) {
+                Long columnId = column.getColumnId();
+                if (tablePrimaryKey.equals(columnId)){
+                    genTable.setTablePrimaryKeyName(column.getColumnName());
+                    break;
+                }
+            }
+        }
         setTableFromOptions(genTable);
         return genTable;
     }
@@ -496,7 +507,7 @@ public class GenTableServiceImpl implements IGenTableService {
      */
     public void isMenu(GenTable genTable) {
         String isMenu = genTable.getIsMenu();
-        if (StringUtils.isNotBlank(isMenu) && isMenu.equals(UserConstants.NOT_UNIQUE)) {
+        if (StringUtils.isNotBlank(isMenu) && isMenu.equals(UserConstants.ISMENU)) {
             //先生成主菜单
             SysMenu sysMenu = new SysMenu();
             //表描述当菜单名称
@@ -510,6 +521,7 @@ public class GenTableServiceImpl implements IGenTableService {
             sysMenu.setIcon("system");
             sysMenu.setCreateBy(SecurityUtils.getUsername());
             sysMenu.setSysTableName(genTable.getTableName());
+            sysMenu.setStatus("1");
             remoteSysMenuService.add(sysMenu);
             //是菜单,生成crud按钮
             for (int i = 0; i < Constants.MENU_NAME.length; i++) {

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

@@ -54,7 +54,7 @@ public class TableSqlServiceImpl implements ITableSqlService {
         String tableName = genTable.getTableName();
         tableSql.setCreateSql(createSql(tableSql, tableName));
         tableSql.setCreateBy(SecurityUtils.getUsername());
-        tableSql.setCreateLog(DateUtils.getNowDate() + SecurityUtils.getUsername() + " 创建表 " + tableName);
+        tableSql.setCreateLog(DateUtils.getTime() +" "+ SecurityUtils.getUsername() + " 创建表 " + tableName);
         tableSqlMapper.insertTableSql(tableSql);
         return AjaxResult.success();
     }
@@ -72,7 +72,7 @@ public class TableSqlServiceImpl implements ITableSqlService {
         tableSql.setCreateSql(createSql(tableSql, tableName));
         String createLog = tableSql.getCreateLog();
         StringBuffer sb = new StringBuffer(createLog);
-        sb.append("\r\n").append(DateUtils.getNowDate()).append(SecurityUtils.getUsername()).append("刷新创建语句");
+        sb.append("\r\n").append(DateUtils.getTime()).append(" ").append(SecurityUtils.getUsername()).append("刷新创建语句");
         tableSql.setCreateLog(sb.toString());
         tableSql.setUpdateBy(SecurityUtils.getUsername());
         tableSqlMapper.updateTableSql(tableSql);
@@ -96,7 +96,7 @@ public class TableSqlServiceImpl implements ITableSqlService {
         }
         String createLog = tableSql.getCreateLog();
         StringBuffer sb = new StringBuffer(createLog);
-        sb.append(DateUtils.getNowDate()).append(SecurityUtils.getUsername()).append(" 执行建表语句");
+        sb.append(DateUtils.getTime()).append(" ").append(SecurityUtils.getUsername()).append(" 执行建表语句");
         tableSqlMapper.updateTableSql(tableSql);
         return AjaxResult.success();
     }
@@ -130,21 +130,21 @@ public class TableSqlServiceImpl implements ITableSqlService {
         sb.append(tableName).append(" (\r\n");
 
         for (GenTableColumn genTableColumn : genTableColumns) {
-            sb.append(genTableColumn.getColumnName()).append(" " + genTableColumn.getColumnType());
+            sb.append(genTableColumn.getColumnName()).append(" ").append(genTableColumn.getColumnType());
             if (genTableColumn.getIsIncrement().equals(UserConstants.INCREMENT)) {
                 sb = genTableColumn.getDefaultValue() == null ? sb.append(" DEFAULT NULL AUTO_INCREMENT COMMENT ") : sb.append(" DEFAULT '" + genTableColumn.getDefaultValue() + "' AUTO_INCREMENT COMMENT '");
             } else {
                 sb = genTableColumn.getDefaultValue() == null ? sb.append(" DEFAULT NULL COMMENT ") : sb.append(" DEFAULT '" + genTableColumn.getDefaultValue() + "' COMMENT '");
             }
-            sb.append(genTableColumn.getColumnComment() + "'").append(",\r\n");
+            sb.append(genTableColumn.getColumnComment()).append("'").append(",\r\n");
             if (genTableColumn.getIsPk().equals(UserConstants.INCREMENT)) {
                 primaryKey = genTableColumn.getColumnName();
             }
         }
         if (StringUtils.isNotBlank(primaryKey)) {
-            sb.append(" PRIMARY KEY (" + primaryKey + " ) USING BTREE\r\n");
+            sb.append(" PRIMARY KEY (").append(primaryKey).append(" ) USING BTREE\r\n");
         }
-        sb.append(") ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='" + tableName + "';");
+        sb.append(") ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='").append(tableName).append("';");
         return sb.toString();
     }
 

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

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.gen.mapper.GenTableColumnMapper">
     
     <resultMap type="GenTableColumn" id="GenTableColumnResult">
-        <id     property="columnId"       column="column_id"      />
+        <result property="columnId"       column="column_id"      />
         <result property="tableId"        column="table_id"       />
         <result property="columnName"     column="column_name"    />
         <result property="columnComment"  column="column_comment" />
@@ -179,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
 
-    <select id="checkColumnNameUnique" parameterType="String" resultType="com.boman.gen.domain.GenTableColumn">
+    <select id="checkColumnNameUnique" parameterType="String" resultMap="GenTableColumnResult">
         <include refid="selectGenTableColumnVo"/>
         where column_name = #{columnName} limit 1
     </select>

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

@@ -90,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
 			</if>
 		</where>
+		order by create_time DESC
 	</select>
 
 	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">