fix gen表单主键改造

boman-api/boman-api-gen/src/main/java/com/boman/gen/api/RemoteGenTableService.java

@@ -3,9 +3,13 @@ package com.boman.gen.api;
 import com.boman.common.core.constant.ServiceNameConstants;
 import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.domain.GenTable;
+import com.boman.domain.TableSql;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * 生成代码模块，远程调用入口，如需其他接口，在此添加
@@ -34,12 +38,4 @@ public interface RemoteGenTableService {
      */
     @GetMapping(value = "/gen/table/{tableName}")
     GenTable getByTableName(@PathVariable("tableName") String tableName);
-
-    /**
-     * 把所有表信息重新加载到redis
-     * @param genTable
-     * @return
-     */
-    @GetMapping(value = "/loadTable")
-    AjaxResult loadTable(GenTable genTable);
 }

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

@@ -12,7 +12,7 @@ public class GenTable extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 编号 */
-    private Long tableId;
+    private Long Id;
 
     /** 表名称 */
 //    @NotBlank(message = "表名称不能为空")
@@ -301,14 +301,12 @@ public class GenTable extends BaseEntity
         this.menuRole = menuRole;
     }
 
-    public Long getTableId()
-    {
-        return tableId;
+    public Long getId() {
+        return Id;
     }
 
-    public void setTableId(Long tableId)
-    {
-        this.tableId = tableId;
+    public void setId(Long id) {
+        Id = id;
     }
 
     public String getTableName()

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

@@ -22,7 +22,7 @@ public class GenTableColumn extends BaseEntity
     public static final String IS_REQUIRED = "1";
 
     /** 编号 */
-    private Long columnId;
+    private Long id;
 
     /** 归属表编号 */
     private Long tableId;
@@ -76,7 +76,12 @@ public class GenTableColumn extends BaseEntity
     /**
      * 外键(表明该表哪个字段是外键,取值id)
      */
-    private String foreignKey;
+    private Long foreignKey;
+
+    /**
+     * 外键名称(仅仅给前端展示使用)
+     */
+    private String foreignKeyName;
 
     /** 字典类型 */
     private String dictType;
@@ -89,6 +94,10 @@ public class GenTableColumn extends BaseEntity
 
     /** 哪些字段属于这些hr的 */
     private Long hrParentId;
+    /**
+     * hr名称(仅仅给前端展示使用)
+     */
+    private String hrParentName;
 
     /** hr的孩子们 */
     private List<GenTableColumn> hrChildren;
@@ -145,7 +154,15 @@ public class GenTableColumn extends BaseEntity
      * 查询时：{"fkTableName":"外键表的表名", "fkColumnName":"关联外键表的列名", "dkColumnName":"关联表需要展示的字段名"}
      * 根据列名获取关联表字段的值和名称{"name":"12", "value":"dept_id"}
      */
-    private Map<String, String> fkInfo;
+    private Map<String, Object> fkInfo;
+
+    public Map<String, Object> getFkInfo() {
+        return fkInfo;
+    }
+
+    public void setFkInfo(Map<String, Object> fkInfo) {
+        this.fkInfo = fkInfo;
+    }
 
     public String getRegular() {
         return regular;
@@ -219,22 +236,36 @@ public class GenTableColumn extends BaseEntity
         this.numColumns = numColumns;
     }
 
-    public String getForeignKey() {
+    public Long getForeignKey() {
         return foreignKey;
     }
 
-    public void setForeignKey(String foreignKey) {
+    public void setForeignKey(Long foreignKey) {
         this.foreignKey = foreignKey;
     }
 
-    public void setColumnId(Long columnId)
-    {
-        this.columnId = columnId;
+    public String getForeignKeyName() {
+        return foreignKeyName;
     }
 
-    public Long getColumnId()
-    {
-        return columnId;
+    public void setForeignKeyName(String foreignKeyName) {
+        this.foreignKeyName = foreignKeyName;
+    }
+
+    public String getHrParentName() {
+        return hrParentName;
+    }
+
+    public void setHrParentName(String hrParentName) {
+        this.hrParentName = hrParentName;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
     }
 
     public void setTableId(Long tableId)
@@ -570,11 +601,4 @@ public class GenTableColumn extends BaseEntity
         this.columnValue = columnValue;
     }
 
-    public Map<String, String> getFkInfo() {
-        return fkInfo;
-    }
-
-    public void setFkInfo(Map<String, String> fkInfo) {
-        this.fkInfo = fkInfo;
-    }
 }

boman-modules/boman-gen/pom.xml

@@ -77,12 +77,6 @@
             <version>2.5.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.boman</groupId>
-            <artifactId>boman-api-gen</artifactId>
-            <version>2.5.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

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

@@ -0,0 +1,65 @@
+package com.boman.gen.controller;
+
+import com.boman.common.core.utils.obj.ObjectUtils;
+import com.boman.common.core.web.controller.BaseController;
+import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.common.redis.RedisKey;
+import com.boman.common.redis.service.RedisService;
+import com.boman.domain.constant.FormDataConstant;
+import com.boman.domain.GenTable;
+import com.boman.domain.GenTableColumn;
+import com.boman.domain.GenTableRelation;
+import com.boman.gen.service.IGenTableColumnService;
+import com.boman.gen.service.IGenTableRelationService;
+import com.boman.gen.service.IGenTableService;
+import com.boman.gen.service.ILoadTableServer;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import static com.boman.common.core.utils.obj.ObjectUtils.requireNonNull;
+
+/**
+ * @author shiqian
+ * @description 获取gen_table
+ * @date 2021年03月17日 16:44
+ **/
+@RestController
+@RequestMapping("/init")
+public class LoadTableController extends BaseController {
+    @Autowired
+    private ILoadTableServer loadTableServer;
+
+    /**
+     * 功能描述: 查询代码生成列表，table中封装columnList
+     *
+     * @param genTable 查询条件
+     * @return AjaxResult
+     */
+    @GetMapping("/loadTable")
+    public AjaxResult loadTable(GenTable genTable) {
+        return loadTableServer.loadTable(genTable);
+    }
+
+    /**
+     * 手动更新redis缓存表数据
+     *
+     * @Description
+     * @author tjf
+     * @Date 2021/3/29
+     */
+    public AjaxResult updateRedisTable() {
+       return loadTableServer.updateRedisTable();
+    }
+}

boman-modules/boman-gen/src/main/java/com/boman/gen/mapper/GenTableColumnMapper.java

@@ -39,7 +39,7 @@ public interface GenTableColumnMapper
      * @param columnId
      * @return
      */
-    public GenTableColumn selectGenTableColumnByColumnId(Long columnId);
+    public GenTableColumn selectGenTableColumnByColumnId(@Param("columnId") Long columnId);
 
     /**
      * 查询业务字段列表

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

@@ -11,7 +11,6 @@ import com.boman.domain.constant.FormDataConstant;
 import com.boman.domain.GenTable;
 import com.boman.domain.GenTableColumn;
 import com.boman.domain.TableSql;
-import com.boman.gen.api.RemoteGenTableService;
 import com.boman.gen.mapper.GenTableColumnMapper;
 import com.boman.gen.mapper.GenTableMapper;
 import com.boman.gen.mapper.TableSqlMapper;
@@ -22,6 +21,7 @@ import org.springframework.stereotype.Service;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 业务字段 服务层实现
@@ -37,7 +37,7 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
     @Autowired
     private TableSqlMapper tableSqlMapper;
     @Autowired
-    private RemoteGenTableService remoteGenTableService;
+    private ILoadTableServer loadTableServer;
 
     /**
      * 查询业务字段列表
@@ -47,7 +47,22 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
      */
     @Override
     public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId) {
-        return genTableColumnMapper.selectGenTableColumnListByTableId(tableId);
+        List<GenTableColumn> genTableColumns = genTableColumnMapper.selectGenTableColumnListByTableId(tableId);
+        for (GenTableColumn genTableColumn : genTableColumns) {
+            if (genTableColumn.getHrParentId() != null){
+                for (GenTableColumn tableColumn : genTableColumns) {
+                    if (genTableColumn.getHrParentId().equals(tableColumn.getId())){
+                        genTableColumn.setHrParentName(tableColumn.getColumnName());
+                        break;
+                    }
+                }
+            }
+            if (genTableColumn.getForeignKey() != null){
+                GenTableColumn genTableColumn1 = selectGenTableColumnListByColumnId(genTableColumn.getId());
+                genTableColumn.setForeignKeyName(genTableColumn1.getColumnName());
+            }
+        }
+        return genTableColumns;
     }
 
     @Override
@@ -75,11 +90,11 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
     @Override
     public GenTableColumn getByIdWithForeignKey(Long columnId) {
         GenTableColumn tableColumn = selectGenTableColumnListByColumnId(columnId);
-        String foreignKey = tableColumn.getForeignKey();
+        Long foreignKey = tableColumn.getForeignKey();
         if (ObjectUtils.isNotEmpty(foreignKey)) {
-            GenTableColumn fkTableColumn = selectGenTableColumnListByColumnId(Long.parseLong(foreignKey));
+            GenTableColumn fkTableColumn = selectGenTableColumnListByColumnId(foreignKey);
             String columnName = fkTableColumn.getColumnName();
-            Map<String, String> map = Maps.newHashMap();
+            Map<String, Object> map = Maps.newHashMap();
             map.put(FormDataConstant.SINGLE_OBJ_NAME, foreignKey);
             map.put(FormDataConstant.SINGLE_OBJ_VALUE, columnName);
             tableColumn.setFkInfo(map);
@@ -114,7 +129,7 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
         int i = genTableColumnMapper.insertGenTableColumn(genTableColumn);
         isAk(genTableColumn);
         insertCreateLog(genTableColumn, BusinessType.INSERT);
-        remoteGenTableService.loadTable(new GenTable());
+        loadTableServer.loadTable(new GenTable());
         return i;
     }
 
@@ -129,7 +144,7 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
         isAk(genTableColumn);
         insertCreateLog(genTableColumn, BusinessType.UPDATE);
         int i = genTableColumnMapper.updateGenTableColumn(genTableColumn);
-        remoteGenTableService.loadTable(new GenTable());
+        loadTableServer.loadTable(new GenTable());
         return i;
     }
 
@@ -140,7 +155,10 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
         GenTable genTable = genTableMapper.selectGenTableById(genTableColumn.getTableId());
         //新增业务字段的同时新增一条建表sql修改日志
         TableSql tableSql = tableSqlMapper.selectTableSqlByTableId(genTableColumn.getTableId());
-        String createLog = tableSql.getCreateLog();
+        String createLog = "";
+        if (tableSql != null) {
+            createLog = tableSql.getCreateLog();
+        }
         StringBuffer sb = new StringBuffer(createLog);
         //ALTER TABLE table_name ADD COLUMN column_name VARCHAR(100) DEFAULT NULL COMMENT '新加字段';
         sb.append("\r\n").append(DateUtils.getTime()).append(" ").append(SecurityUtils.getUsername()).append(" ALTER TABLE ").append(genTable.getTableName());
@@ -172,28 +190,28 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
         if (UserConstants.YES.equals(isIn)) {
             //判断是否已经存在输入字段且不是同一个字段
             for (GenTableColumn tableColumn : genTableColumns) {
-                if (UserConstants.YES.equals(tableColumn.getIsIn()) && !tableColumn.getColumnId().equals(genTableColumn.getColumnId())) {
+                if (UserConstants.YES.equals(tableColumn.getIsIn()) && !tableColumn.getId().equals(genTableColumn.getId())) {
                     tableColumn.setIsIn("N");
                     genTableColumnMapper.updateGenTableColumn(tableColumn);
                     break;
                 }
             }
-            genTable.setTableId(genTableColumn.getTableId());
-            genTable.setAkColumn(genTableColumn.getColumnId());
+            genTable.setId(genTableColumn.getTableId());
+            genTable.setAkColumn(genTableColumn.getId());
         }
         if (UserConstants.YES.equals(isOut)) {
             //判断是否已经存在显示字段且不是同一个字段
             for (GenTableColumn tableColumn : genTableColumns) {
-                if (UserConstants.YES.equals(tableColumn.getIsOut()) && !tableColumn.getColumnId().equals(genTableColumn.getColumnId())) {
+                if (UserConstants.YES.equals(tableColumn.getIsOut()) && !tableColumn.getId().equals(genTableColumn.getId())) {
                     tableColumn.setIsOut("N");
                     genTableColumnMapper.updateGenTableColumn(tableColumn);
                     break;
                 }
             }
-            genTable.setTableId(genTableColumn.getTableId());
-            genTable.setDkColumn(genTableColumn.getColumnId());
+            genTable.setId(genTableColumn.getTableId());
+            genTable.setDkColumn(genTableColumn.getId());
         }
-        if (genTable.getTableId() != null) {
+        if (genTable.getId() != null) {
             genTableMapper.updateGenTable(genTable);
         }
     }
@@ -208,7 +226,7 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
     @Override
     public int deleteGenTableColumnByIds(String ids) {
         int i = genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids));
-        remoteGenTableService.loadTable(new GenTable());
+        loadTableServer.loadTable(new GenTable());
         return i;
     }
 
@@ -226,7 +244,7 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
             insertCreateLog(genTableColumn, BusinessType.DELETE);
         }
         int i = genTableColumnMapper.deleteGenTableColumnByColumnIds(Convert.toLongArray(ids));
-        remoteGenTableService.loadTable(new GenTable());
+        loadTableServer.loadTable(new GenTable());
         return i;
     }
 
@@ -238,9 +256,9 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
      */
     @Override
     public String checkColumnNameUnique(GenTableColumn genTableColumn) {
-        Long columnId = StringUtils.isNull(genTableColumn.getColumnId()) ? -1L : genTableColumn.getColumnId();
+        Long columnId = StringUtils.isNull(genTableColumn.getId()) ? -1L : genTableColumn.getId();
         GenTableColumn column = genTableColumnMapper.checkColumnNameUnique(genTableColumn);
-        if (StringUtils.isNotNull(column) && !column.getColumnId().equals(columnId)) {
+        if (StringUtils.isNotNull(column) && !column.getId().equals(columnId)) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;

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

@@ -2,7 +2,6 @@ package com.boman.gen.service;
 
 import com.boman.domain.GenTable;
 import com.boman.domain.GenTableRelation;
-import com.boman.gen.api.RemoteGenTableService;
 import com.boman.gen.mapper.GenTableRelationMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,7 +19,7 @@ public class GenTableRelationServiceImpl implements IGenTableRelationService {
     private GenTableRelationMapper genTableRelationMapper;
 
     @Autowired
-    private RemoteGenTableService remoteGenTableService;
+    private ILoadTableServer loadTableServer;
 
 
     /**
@@ -56,7 +55,7 @@ public class GenTableRelationServiceImpl implements IGenTableRelationService {
     @Override
     public int insertGenTableRelation(GenTableRelation genTableRelation) {
         int i = genTableRelationMapper.insertGenTableRelation(genTableRelation);
-        remoteGenTableService.loadTable(new GenTable());
+        loadTableServer.loadTable(new GenTable());
         return i;
     }
 
@@ -69,7 +68,7 @@ public class GenTableRelationServiceImpl implements IGenTableRelationService {
     @Override
     public int updateGenTableRelation(GenTableRelation genTableRelation) {
         int i = genTableRelationMapper.updateGenTableRelation(genTableRelation);
-        remoteGenTableService.loadTable(new GenTable());
+        loadTableServer.loadTable(new GenTable());
         return i;
     }
 
@@ -82,7 +81,7 @@ public class GenTableRelationServiceImpl implements IGenTableRelationService {
     @Override
     public int deleteGenTableRelation(Long[] ids) {
         int i = genTableRelationMapper.deleteGenTableRelation(ids);
-        remoteGenTableService.loadTable(new GenTable());
+        loadTableServer.loadTable(new GenTable());
         return i;
     }
 }

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

@@ -19,7 +19,6 @@ import com.boman.common.log.enums.BusinessType;
 import com.boman.domain.RoleEnum;
 import com.boman.domain.TableSql;
 
-import com.boman.gen.api.RemoteGenTableService;
 import com.boman.gen.mapper.GenTableRelationMapper;
 import com.boman.system.api.RemoteSysMenuService;
 import com.boman.system.api.domain.SysMenu;
@@ -68,7 +67,7 @@ public class GenTableServiceImpl implements IGenTableService {
     private RemoteSysMenuService remoteSysMenuService;
 
     @Autowired
-    private TableSqlServiceImpl tableSqlService;
+    private ITableSqlService tableSqlService;
 
     @Autowired
     private IGenTableColumnService tableColumnService;
@@ -77,7 +76,7 @@ public class GenTableServiceImpl implements IGenTableService {
     private GenTableRelationMapper genTableRelationMapper;
 
     @Autowired
-    private RemoteGenTableService remoteGenTableService;
+    private ILoadTableServer loadTableServer;
 
     /**
      * 查询业务信息
@@ -94,7 +93,7 @@ public class GenTableServiceImpl implements IGenTableService {
         List<GenTableColumn> columns = genTable.getColumns();
         int index = 0;
         for (GenTableColumn column : columns) {
-            Long columnId = column.getColumnId();
+            Long columnId = column.getId();
             if (tablePrimaryKey != null && tablePrimaryKey.equals(columnId)) {
                 genTable.setTablePrimaryKeyName(column.getColumnName());
                 index++;
@@ -191,7 +190,7 @@ public class GenTableServiceImpl implements IGenTableService {
                 tableColumnService.updateGenTableColumn(cenTableColumn);
             }
         }
-        remoteGenTableService.loadTable(new GenTable());
+        loadTableServer.loadTable(new GenTable());
     }
 
     /**
@@ -208,7 +207,7 @@ public class GenTableServiceImpl implements IGenTableService {
         tableSqlService.deleteTableSqlByTableIds(tableIds);
         //删除关联关系
         genTableRelationMapper.deleteGenTableRelationByParentId(tableIds);
-        remoteGenTableService.loadTable(new GenTable());
+        loadTableServer.loadTable(new GenTable());
     }
 
     /**
@@ -232,6 +231,10 @@ public class GenTableServiceImpl implements IGenTableService {
                         GenUtils.initColumnField(column, table);
                         genTableColumnMapper.insertGenTableColumn(column);
                     }
+                    //插入一条数据库建表语句数据
+                    TableSql tableSql = new TableSql();
+                    tableSql.setTableId(table.getId());
+                    tableSqlService.insertTableSql(tableSql);
                 }
             }
         } catch (Exception e) {
@@ -445,7 +448,7 @@ public class GenTableServiceImpl implements IGenTableService {
         //新增表成功的时候,新增字段公共字段
         int i = genTableMapper.insertGenTable(genTable);
         if (i > 0) {
-            Long id = insertCommonColumn(genTable.getTableId());
+            Long id = insertCommonColumn(genTable.getId());
             if (id != -1) {
                 genTable.setTablePrimaryKey(id);
                 genTableMapper.updateGenTable(genTable);
@@ -454,9 +457,9 @@ public class GenTableServiceImpl implements IGenTableService {
             isMenu(genTable, BusinessType.INSERT);
             //新建表时新增建表语句
             TableSql tableSql = new TableSql();
-            tableSql.setTableId(genTable.getTableId());
+            tableSql.setTableId(genTable.getId());
             tableSqlService.insertTableSql(tableSql);
-            remoteGenTableService.loadTable(new GenTable());
+            loadTableServer.loadTable(new GenTable());
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -518,22 +521,22 @@ public class GenTableServiceImpl implements IGenTableService {
             genTableColumn.setColumnType(columnType[i]);
             genTableColumn.setIsPk("0");
             genTableColumn.setIsInsert("1");
-            genTableColumn.setQueryType("EQ");
+            genTableColumn.setQueryType("IN");
             genTableColumn.setHtmlType(htmlType[i]);
             genTableColumn.setSort(num + i);
             genTableColumn.setCreateBy("admin");
             genTableColumn.setCreateTime(DateUtils.getNowDate());
-            genTableColumn.setHrParentId(genTableColumnBaseInfo.getColumnId());
+            genTableColumn.setHrParentId(genTableColumnBaseInfo.getId());
             genTableColumn.setMask("000000");
             if (i == 0) {
                 genTableColumn.setSort(1);
                 genTableColumn.setIsPk("1");
-                genTableColumn.setHrParentId(genTableColumnLog.getColumnId());
+                genTableColumn.setHrParentId(genTableColumnLog.getId());
             }
             genTableColumnMapper.insertGenTableColumn(genTableColumn);
             //获得id字段的id
             if (i == 0) {
-                columnId = genTableColumn.getColumnId();
+                columnId = genTableColumn.getId();
             }
         }
         return columnId;
@@ -548,7 +551,7 @@ public class GenTableServiceImpl implements IGenTableService {
 
         if (type.equals(BusinessType.UPDATE)) {
             //先查询之前是否是菜单
-            GenTable genTableOld = genTableMapper.selectGenTableById(genTable.getTableId());
+            GenTable genTableOld = genTableMapper.selectGenTableById(genTable.getId());
             if (UserConstants.ISMENU.equals(genTableOld.getIsMenu())) {
                 return;
             }
@@ -591,7 +594,6 @@ public class GenTableServiceImpl implements IGenTableService {
                     menu.setPath("#");
                     sysMenu.setCreateBy(SecurityUtils.getUsername());
                     remoteSysMenuService.add(menu);
-
                 }
             }
         }

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

@@ -0,0 +1,23 @@
+package com.boman.gen.service;
+
+import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.GenTable;
+
+/**
+ * @author tjf
+ * @Date: 2021/04/27/15:07
+ */
+public interface ILoadTableServer {
+    /**
+     * 刷新对象表单的redis
+     * @param genTable
+     * @return
+     */
+    public AjaxResult loadTable(GenTable genTable);
+
+    /**
+     * 手动刷新redis
+     * @return
+     */
+    public AjaxResult updateRedisTable();
+}

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/MyController.java → boman-modules/boman-gen/src/main/java/com/boman/gen/service/LoadTableServerImpl.java

@@ -1,24 +1,18 @@
-package com.boman.gen.controller;
+package com.boman.gen.service;
 
 import com.boman.common.core.utils.obj.ObjectUtils;
-import com.boman.common.core.web.controller.BaseController;
 import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
-import com.boman.domain.constant.FormDataConstant;
 import com.boman.domain.GenTable;
 import com.boman.domain.GenTableColumn;
 import com.boman.domain.GenTableRelation;
-import com.boman.gen.service.IGenTableColumnService;
-import com.boman.gen.service.IGenTableRelationService;
-import com.boman.gen.service.IGenTableService;
+import com.boman.domain.constant.FormDataConstant;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -30,14 +24,11 @@ import java.util.stream.Collectors;
 import static com.boman.common.core.utils.obj.ObjectUtils.requireNonNull;
 
 /**
- * @author shiqian
- * @description 获取gen_table
- * @date 2021年03月17日 16:44
- **/
-@RestController
-@RequestMapping("/init")
-public class MyController extends BaseController {
-
+ * @author tjf
+ * @Date: 2021/04/27/15:07
+ */
+@Service
+public class LoadTableServerImpl implements ILoadTableServer{
     @Autowired
     private IGenTableService genTableService;
     @Autowired
@@ -47,19 +38,14 @@ public class MyController extends BaseController {
     @Autowired
     private IGenTableRelationService genTableRelationService;
 
-    /**
-     * 功能描述: 查询代码生成列表，table中封装columnList
-     *
-     * @param genTable 查询条件
-     * @return AjaxResult
-     */
-    @GetMapping("/loadTable")
+
+    @Override
     public AjaxResult loadTable(GenTable genTable) {
         List<GenTable> tableList = genTableService.selectGenTableList(genTable);
         requireNonNull(tableList);
 
         // load table and tableColumn
-        List<Long> tableIdList = tableList.stream().map(GenTable::getTableId).collect(Collectors.toList());
+        List<Long> tableIdList = tableList.stream().map(GenTable::getId).collect(Collectors.toList());
         List<GenTableColumn> genTableColumns = genTableColumnService.listByTableIdList(tableIdList);
         requireNonNull(genTableColumns);
         packTableAndInsertToRedis(tableList, genTableColumns);
@@ -74,6 +60,26 @@ public class MyController extends BaseController {
         return AjaxResult.success(tableList);
     }
 
+    /**
+     * 手动刷新redis
+     * @return
+     */
+    @Override
+    public AjaxResult updateRedisTable() {
+        //获取所有的表和表字段,更新到redis中
+        List<GenTable> tableList = genTableService.selectGenTableList(new GenTable());
+        if (null == tableList || tableList.isEmpty()) {
+            return AjaxResult.error("当前没有可更新数据");
+        }
+        List<Long> tableIdList = tableList.stream().map(GenTable::getId).collect(Collectors.toList());
+        List<GenTableColumn> genTableColumns = genTableColumnService.listByTableIdList(tableIdList);
+        if (null == genTableColumns || genTableColumns.isEmpty()) {
+            return AjaxResult.error("当前没有可更新数据");
+        }
+        packTableAndInsertToRedis(tableList, genTableColumns);
+        return AjaxResult.success();
+    }
+
     /**
      * 功能描述: 把主表关联的附表的信息和附表的字段信息存进redis
      *
@@ -89,7 +95,7 @@ public class MyController extends BaseController {
             relationList = relationList.stream().sorted(Comparator.comparing(GenTableRelation::getRelationParentId).thenComparing(GenTableRelation::getSort)).collect(Collectors.toList());
 
             for (GenTableRelation relation : relationList) {
-                if (relation.getRelationParentId().equals(table.getTableId())) {
+                if (relation.getRelationParentId().equals(table.getId())) {
                     //关联主表PK gen_table_column的id
                     Long childId = relation.getRelationChildId();
                     //根据gen_table_column的id查询出表id
@@ -98,7 +104,7 @@ public class MyController extends BaseController {
                     //从tableList中去取出对应表的对象
                     if (genTableColumn != null) {
                         List<GenTable> collect = tableList.stream()
-                                .filter(genTable -> genTable.getTableId().equals(genTableColumn.getTableId()))
+                                .filter(genTable -> genTable.getId().equals(genTableColumn.getTableId()))
                                 .collect(Collectors.toList());
                         GenTable genTable = collect.get(0);
                         List<GenTableColumn> collectColumn = tableColumns.stream()
@@ -124,7 +130,7 @@ public class MyController extends BaseController {
         for (GenTable table : tableList) {
             List<GenTableColumn> columnList = new ArrayList<>(16);
             for (GenTableColumn tableColumn : genTableColumns) {
-                if (table.getTableId().equals(tableColumn.getTableId())) {
+                if (table.getId().equals(tableColumn.getTableId())) {
                     // 存一个tableName留作备用
                     tableColumn.setTableName(table.getTableName());
                     // 把外键信息存进去，留着查询的时候用
@@ -140,10 +146,9 @@ public class MyController extends BaseController {
     }
 
     private void packFkInfo(GenTableColumn tableColumn) {
-        String foreignKey = tableColumn.getForeignKey();
-        if (ObjectUtils.isNotEmpty(foreignKey)) {
+        Long fkColumnId = tableColumn.getForeignKey();
+        if (ObjectUtils.isNotEmpty(fkColumnId)) {
             // 外键在table_column中的id
-            Long fkColumnId = Long.parseLong(foreignKey);
             GenTableColumn fkTableColumn = genTableColumnService.selectGenTableColumnListByColumnId(fkColumnId);
             String fkColumnName = fkTableColumn.getColumnName();
             Long fkTableId = fkTableColumn.getTableId();
@@ -153,7 +158,7 @@ public class MyController extends BaseController {
             GenTableColumn dkTableColumn = genTableColumnService.selectGenTableColumnListByColumnId(dkColumnId);
             String dkColumnName = dkTableColumn.getColumnName();
             String fkTableName = fkGenTable.getTableName();
-            Map<String, String> fkInfo = Maps.newConcurrentMap();
+            Map<String, Object> fkInfo = Maps.newConcurrentMap();
             fkInfo.put(FormDataConstant.FK_TABLE_NAME, fkTableName);
             fkInfo.put(FormDataConstant.FK_COLUMN_NAME, fkColumnName);
             fkInfo.put(FormDataConstant.DK_COLUMN_NAME, dkColumnName);
@@ -161,29 +166,6 @@ public class MyController extends BaseController {
         }
     }
 
-
-    /**
-     * 手动更新redis缓存表数据
-     *
-     * @Description
-     * @author tjf
-     * @Date 2021/3/29
-     */
-    public AjaxResult updateRedisTable() {
-        //获取所有的表和表字段,更新到redis中
-        List<GenTable> tableList = genTableService.selectGenTableList(new GenTable());
-        if (null == tableList || tableList.isEmpty()) {
-            return AjaxResult.error("当前没有可更新数据");
-        }
-        List<Long> tableIdList = tableList.stream().map(GenTable::getTableId).collect(Collectors.toList());
-        List<GenTableColumn> genTableColumns = genTableColumnService.listByTableIdList(tableIdList);
-        if (null == genTableColumns || genTableColumns.isEmpty()) {
-            return AjaxResult.error("当前没有可更新数据");
-        }
-        packTableAndInsertToRedis(tableList, genTableColumns);
-        return AjaxResult.success();
-    }
-
     public boolean isContainsBlob(List<GenTableColumn> columnList) {
         if (CollectionUtils.isEmpty(columnList)) {
             return false;

boman-modules/boman-gen/src/main/java/com/boman/gen/util/GenUtils.java

@@ -38,7 +38,7 @@ public class GenUtils
     {
         String dataType = getDbType(column.getColumnType());
         String columnName = column.getColumnName();
-        column.setTableId(table.getTableId());
+        column.setTableId(table.getId());
         column.setCreateBy(table.getCreateBy());
         // 设置java字段名
         column.setJavaField(StringUtils.toCamelCase(columnName));

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">
-        <result property="columnId"       column="column_id"      />
+        <result property="id"       column="id"      />
         <result property="tableId"        column="table_id"       />
         <result property="columnName"     column="column_name"    />
         <result property="columnComment"  column="column_comment" />
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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, regular from gen_table_column
+        select 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">
@@ -65,13 +65,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectGenTableColumnByColumnId" parameterType="GenTableColumn" resultMap="GenTableColumnResult">
+    <select id="selectGenTableColumnByColumnId" parameterType="long"  resultMap="GenTableColumnResult">
         <include refid="selectGenTableColumnVo"/>
-        where column_id = #{columnId}
+        where id = #{columnId}
        limit 1
     </select>
 
-    <select id="listByTableIdList" parameterType="GenTableColumn" resultMap="GenTableColumnResult">
+    <select id="listByTableIdList" parameterType="list" resultMap="GenTableColumnResult">
         <include refid="selectGenTableColumnVo"/>
         where table_id in
         <foreach collection="tableIdList" open="(" close=")" separator="," item="tableId">
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by ordinal_position
 	</select>
     
-    <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
+    <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="id">
         insert into gen_table_column (
 			<if test="tableId != null and tableId != ''">table_id,</if>
 			<if test="columnName != null and columnName != ''">column_name,</if>
@@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="regular != null and regular != ''">regular = #{regular},</if>
             update_time = sysdate()
         </set>
-        where column_id = #{columnId}
+        where id = #{id}
     </update>
 
     <delete id="deleteGenTableColumnByIds" parameterType="Long">
@@ -204,16 +204,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <delete id="deleteGenTableColumns">
-        delete from gen_table_column where column_id in 
+        delete from gen_table_column where id in
         <foreach collection="list" item="item" open="(" separator="," close=")">
-            #{item.columnId}
+            #{item.id}
         </foreach>
     </delete>
 
 
 
     <delete id="deleteGenTableColumnByColumnIds" parameterType="Long">
-        delete from gen_table_column where column_id in
+        delete from gen_table_column where id in
         <foreach collection="array" item="columnId" open="(" separator="," close=")">
             #{columnId}
         </foreach>

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

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.gen.mapper.GenTableMapper">
 
 	<resultMap type="GenTable" id="GenTableResult">
-	    <id     property="tableId"        column="table_id"          />
+	    <id     property="id"        column="id"          />
 		<result property="tableName"      column="table_name"        />
 		<result property="tableComment"   column="table_comment"     />
 		<result property="subTableName"   column="sub_table_name"    />
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<resultMap type="GenTableColumn" id="GenTableColumnResult">
-        <id     property="columnId"       column="column_id"      />
+        <id     property="id"       column="c_id"      />
         <result property="tableId"        column="table_id"       />
         <result property="columnName"     column="column_name"    />
         <result property="columnComment"  column="column_comment" />
@@ -67,15 +67,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectGenTableVo">
-        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options,
+        select id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options,
          create_by, create_time, update_by, update_time, remark, is_menu, menu_role, ak_column, dk_column, trigger_create, trigger_retrieve, trigger_update, trigger_delete, trigger_submit, real_table_name, filter_conditions, extended_attributes, table_primary_key from gen_table
     </sql>
     
     <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
 		<include refid="selectGenTableVo"/>
 		<where>
-			<if test="tableId != null and tableId != ''">
-				AND table_id = #{tableId}
+			<if test="id != null and id != ''">
+				AND id = #{id}
 			</if>
 			<if test="tableName != null and tableName != ''">
 				AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
@@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			create_time,
 			update_time
 		FROM
-			information_schema. TABLES
+			information_schema.TABLES
 		WHERE
 			table_schema = (SELECT DATABASE())
 		  AND table_name NOT LIKE 'qrtz_%'
@@ -122,30 +122,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark, t.is_menu, t.menu_role, t.ak_column, t.dk_column, t.trigger_create, t.trigger_retrieve, t.trigger_update, t.trigger_delete, t.trigger_submit, t.real_table_name, t.filter_conditions, t.extended_attributes, t.table_primary_key,
-			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+	    SELECT t.id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark, t.is_menu, t.menu_role, t.ak_column, t.dk_column, t.trigger_create, t.trigger_retrieve, t.trigger_update, t.trigger_delete, t.trigger_submit, t.real_table_name, t.filter_conditions, t.extended_attributes, t.table_primary_key,
+			   c.id as c_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
 		FROM gen_table t
-			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
-		where t.table_id = #{tableId} order by c.sort
+			 LEFT JOIN gen_table_column c ON t.id = c.table_id
+		where t.id = #{tableId} order by c.sort
 	</select>
 	
 	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark, t.is_menu, t.menu_role, t.ak_column, t.dk_column, t.trigger_create, t.trigger_retrieve, t.trigger_update, t.trigger_delete, t.trigger_submit, t.real_table_name, t.filter_conditions, t.extended_attributes, t.table_primary_key,
-			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+	    SELECT t.id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark, t.is_menu, t.menu_role, t.ak_column, t.dk_column, t.trigger_create, t.trigger_retrieve, t.trigger_update, t.trigger_delete, t.trigger_submit, t.real_table_name, t.filter_conditions, t.extended_attributes, t.table_primary_key,
+			   c.id as c_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
 		FROM gen_table t
-			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+			 LEFT JOIN gen_table_column c ON t.id = c.table_id
 		where t.table_name = #{tableName} order by c.sort
 	</select>
 	
 	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark, t.is_menu, t.menu_role, t.ak_column, t.dk_column, t.trigger_create, t.trigger_retrieve, t.trigger_update, t.trigger_delete, t.trigger_submit, t.real_table_name, t.filter_conditions, t.extended_attributes, t.table_primary_key,
-			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+	    SELECT t.id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark, t.is_menu, t.menu_role, t.ak_column, t.dk_column, t.trigger_create, t.trigger_retrieve, t.trigger_update, t.trigger_delete, t.trigger_submit, t.real_table_name, t.filter_conditions, t.extended_attributes, t.table_primary_key,
+			   c.id as c_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
 		FROM gen_table t
-			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+			 LEFT JOIN gen_table_column c ON t.id = c.table_id
 		order by c.sort
 	</select>
 	
-	<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
+	<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="id">
         insert into gen_table (
 			<if test="tableName != null">table_name,</if>
 			<if test="tableComment != null and tableComment != ''">table_comment,</if>
@@ -239,13 +239,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="tablePrimaryKey != null and tablePrimaryKey !=''">table_primary_key = #{tablePrimaryKey},</if>
             update_time = sysdate()
         </set>
-        where table_id = #{tableId}
+        where id = #{id}
     </update>
     
     <delete id="deleteGenTableByIds" parameterType="Long">
-        delete from gen_table where table_id in 
-        <foreach collection="array" item="tableId" open="(" separator="," close=")">
-            #{tableId}
+        delete from gen_table where id in 
+        <foreach collection="array" item="id" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 

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

@@ -31,8 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select r.id, r.description, r.relation_parent_id, r.relation_child_id, r.relation_type, r.sort, r.embed_edit, r.display_conditions, r.create_by, r.create_time, r.update_by, r.update_time, r.is_del,
 		t.table_name, c.column_name
 		from gen_table_relation r
-		left join gen_table t on t.table_id = r.relation_parent_id
-		left join gen_table_column c on c.column_id = r.relation_child_id
+		left join gen_table t on t.id = r.relation_parent_id
+		left join gen_table_column c on c.id = r.relation_child_id
 		<where>
 			<if test="description != null and description != ''">
 				AND description like concat('%', #{description}, '%')

boman-modules/boman-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -39,6 +39,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    delete from sys_user_role where role_id=#{id} and user_id in
  	    <foreach collection="ids" item="userId" open="(" separator="," close=")">
  	        #{userId}
-            </foreach> 
+        </foreach>
 	</delete>
 </mapper> 

boman-web-core/src/main/java/com/boman/web/core/service/TableServiceCmdService.java

@@ -279,15 +279,15 @@ public class TableServiceCmdService {
             String selfColumnName = column.getColumnName();
             for (JSONObject json : result) {
                 if (json.containsKey(selfColumnName.toUpperCase()) || json.containsKey(selfColumnName.toLowerCase())) {
-                    Map<String, String> fkInfoMap = column.getFkInfo();
-                    String fkTableName = fkInfoMap.get(FK_TABLE_NAME);
-                    String fkColumnName = fkInfoMap.get(FK_COLUMN_NAME);
-                    String dkColumnName = fkInfoMap.get(DK_COLUMN_NAME);
+                    Map<String, Object> fkInfoMap = column.getFkInfo();
+                    Object fkTableName = fkInfoMap.get(FK_TABLE_NAME);
+                    Object fkColumnName = fkInfoMap.get(FK_COLUMN_NAME);
+                    Object dkColumnName = fkInfoMap.get(DK_COLUMN_NAME);
                     Object primaryTableFkValue = json.get(selfColumnName);
 
                     JSONObject param = new JSONObject();
-                    param.put(fkColumnName, primaryTableFkValue);
-                    JSONObject fkInfo = selectService.getOneByMap(fkTableName, param);
+                    param.put(fkColumnName.toString(), primaryTableFkValue);
+                    JSONObject fkInfo = selectService.getOneByMap(fkTableName.toString(), param);
 
                     Object value = fkInfo.get(dkColumnName);
                     jsonObject.put(SINGLE_OBJ_NAME, primaryTableFkValue);
@@ -400,7 +400,7 @@ public class TableServiceCmdService {
         for (GenTableColumn hrColumn : parentColumns) {
             List<GenTableColumn> children = Lists.newArrayListWithCapacity(16);
             for (GenTableColumn column : columns) {
-                if (hrColumn.getColumnId().equals(column.getHrParentId())) {
+                if (hrColumn.getId().equals(column.getHrParentId())) {
                     // handler column
                     if (json.containsKey(column.getColumnName())) {
                         handlerSysDictData(Collections.singletonList(json), Collections.singletonList(column));
@@ -728,7 +728,7 @@ public class TableServiceCmdService {
             for (GenTableColumn hrColumn : parentColumns) {
                 List<GenTableColumn> children = Lists.newArrayListWithCapacity(16);
                 for (GenTableColumn column : allColumns) {
-                    if (hrColumn.getColumnId().equals(column.getHrParentId())) {
+                    if (hrColumn.getId().equals(column.getHrParentId())) {
                         children.add(column);
                     }
                 }
@@ -793,7 +793,8 @@ public class TableServiceCmdService {
 
 
     public AjaxResult listAllColumnsByTableId(GenTable table) {
-        return remoteGenTableColumnService.listColumnsByTableId(table.getTableId());
+        AjaxResult ajaxResult = remoteGenTableColumnService.listColumnsByTableId(table.getId());
+        return ajaxResult;
     }
 
     public List<SysDictData> listSysDictDataByType(String dictType) {

ruoyi-ui/src/settings.js

@@ -1,11 +1,6 @@
 module.exports = {
   title: '潜山市云数据中心',
-
-  urls: `http://192.168.101.11:8090`,
-  // urls: `http://192.168.101.110:8090`,
-  // urls: `http://192.168.101.49:8080`,
-
-  // urls: ``,
+  urls: `http://192.168.101.10:8090`,
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

ruoyi-ui/src/views/tool/gen/index.vue

@@ -67,7 +67,7 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    
+
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="表名称" prop="tableName">
         <el-input
@@ -168,13 +168,13 @@
             @click="handleSynchDb(scope.row)"
             v-hasPermi="['tool:gen:edit']"
           >同步</el-button>
-<!--          <el-button
+          <el-button
             type="text"
             size="small"
             icon="el-icon-download"
             @click="handleGenTable(scope.row)"
             v-hasPermi="['tool:gen:code']"
-          >生成代码</el-button> -->
+          >生成代码</el-button>
         </template>
       </el-table-column>
     </el-table>