添加新群号：170801498

RuoYi

2022-12-03 b61e578bb8cd3936daff5237786a9020e3bcf9dc

 src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java

@@ -7,8 +7,11 @@
import java.util.LinkedHashMap;

import java.util.List;

import java.util.Map;

import java.util.function.Function;

import java.util.stream.Collectors;

import java.util.zip.ZipEntry;

import java.util.zip.ZipOutputStream;

import org.apache.commons.io.FileUtils;

import org.apache.commons.io.IOUtils;

import org.apache.velocity.Template;

import org.apache.velocity.VelocityContext;

@@ -18,15 +21,14 @@
import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import com.alibaba.fastjson.JSON;

import com.alibaba.fastjson.JSONObject;

import com.alibaba.fastjson2.JSON;

import com.alibaba.fastjson2.JSONObject;

import com.ruoyi.common.constant.Constants;

import com.ruoyi.common.constant.GenConstants;

import com.ruoyi.common.core.text.CharsetKit;

import com.ruoyi.common.exception.CustomException;

import com.ruoyi.common.exception.ServiceException;

import com.ruoyi.common.utils.SecurityUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.common.utils.file.FileUtils;

import com.ruoyi.project.tool.gen.domain.GenTable;

import com.ruoyi.project.tool.gen.domain.GenTableColumn;

import com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper;

@@ -102,6 +104,17 @@
    }



    /**

     * 查询所有表信息

     * 
     * @return 表信息集合

     */

    @Override

    public List<GenTable> selectGenTableAll()

    {

        return genTableMapper.selectGenTableAll();

    }



    /**

     * 修改业务

     * 

     * @param genTable 业务信息

@@ -116,9 +129,9 @@
        int row = genTableMapper.updateGenTable(genTable);

        if (row > 0)

        {

            for (GenTableColumn cenTableColumn : genTable.getColumns())

            for (GenTableColumn genTableColumn : genTable.getColumns())

            {

                genTableColumnMapper.updateGenTableColumn(cenTableColumn);

                genTableColumnMapper.updateGenTableColumn(genTableColumn);

            }

        }

    }

@@ -168,7 +181,7 @@
        }

        catch (Exception e)

        {

            throw new CustomException("导入失败：" + e.getMessage());

            throw new ServiceException("导入失败：" + e.getMessage());

        }

    }



@@ -184,9 +197,10 @@
        Map<String, String> dataMap = new LinkedHashMap<>();

        // 查询表信息

        GenTable table = genTableMapper.selectGenTableById(tableId);

        // 查询列信息

        List<GenTableColumn> columns = table.getColumns();

        setPkColumn(table, columns);

        // 设置主子表信息

        setSubTable(table);

        // 设置主键列信息

        setPkColumn(table);

        VelocityInitializer.initVelocity();



        VelocityContext context = VelocityUtils.prepareContext(table);

@@ -224,16 +238,16 @@
     * 生成代码（自定义路径）

     * 

     * @param tableName 表名称

     * @return 数据

     */

    @Override

    public void generatorCode(String tableName)

    {

        // 查询表信息

        GenTable table = genTableMapper.selectGenTableByName(tableName);

        // 查询列信息

        List<GenTableColumn> columns = table.getColumns();

        setPkColumn(table, columns);

        // 设置主子表信息

        setSubTable(table);

        // 设置主键列信息

        setPkColumn(table);



        VelocityInitializer.initVelocity();



@@ -256,9 +270,64 @@
                }

                catch (IOException e)

                {

                    throw new CustomException("渲染模板失败，表名：" + table.getTableName());

                    throw new ServiceException("渲染模板失败，表名：" + table.getTableName());

                }

            }

        }

    }



    /**

     * 同步数据库

     * 
     * @param tableName 表名称

     */

    @Override

    @Transactional

    public void synchDb(String tableName)

    {

        GenTable table = genTableMapper.selectGenTableByName(tableName);

        List<GenTableColumn> tableColumns = table.getColumns();

        Map<String, GenTableColumn> tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity()));



        List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);

        if (StringUtils.isEmpty(dbTableColumns))

        {

            throw new ServiceException("同步数据失败，原表结构不存在");

        }

        List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());



        dbTableColumns.forEach(column -> {

            GenUtils.initColumnField(column, table);

            if (tableColumnMap.containsKey(column.getColumnName()))

            {

                GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName());

                column.setColumnId(prevColumn.getColumnId());

                if (column.isList())

                {

                    // 如果是列表，继续保留查询方式/字典类型选项

                    column.setDictType(prevColumn.getDictType());

                    column.setQueryType(prevColumn.getQueryType());

                }

                if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk()

                        && (column.isInsert() || column.isEdit())

                        && ((column.isUsableColumn()) || (!column.isSuperColumn())))

                {

                    // 如果是(新增/修改&非主键/非忽略及父属性)，继续保留必填/显示类型选项

                    column.setIsRequired(prevColumn.getIsRequired());

                    column.setHtmlType(prevColumn.getHtmlType());

                }

                genTableColumnMapper.updateGenTableColumn(column);

            }

            else

            {

                genTableColumnMapper.insertGenTableColumn(column);

            }

        });



        List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());

        if (StringUtils.isNotEmpty(delColumns))

        {

            genTableColumnMapper.deleteGenTableColumns(delColumns);

        }

    }



@@ -288,9 +357,10 @@
    {

        // 查询表信息

        GenTable table = genTableMapper.selectGenTableByName(tableName);

        // 查询列信息

        List<GenTableColumn> columns = table.getColumns();

        setPkColumn(table, columns);

        // 设置主子表信息

        setSubTable(table);

        // 设置主键列信息

        setPkColumn(table);



        VelocityInitializer.initVelocity();



@@ -310,7 +380,7 @@
                zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));

                IOUtils.write(sw.toString(), zip, Constants.UTF8);

                IOUtils.closeQuietly(sw);

            zip.flush();

                zip.flush();

                zip.closeEntry();

            }

            catch (IOException e)

@@ -331,18 +401,29 @@
        if (GenConstants.TPL_TREE.equals(genTable.getTplCategory()))

        {

            String options = JSON.toJSONString(genTable.getParams());

            JSONObject paramsObj = JSONObject.parseObject(options);

            JSONObject paramsObj = JSON.parseObject(options);

            if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE)))

            {

                throw new CustomException("树编码字段不能为空");

                throw new ServiceException("树编码字段不能为空");

            }

            else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE)))

            {

                throw new CustomException("树父编码字段不能为空");

                throw new ServiceException("树父编码字段不能为空");

            }

            else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME)))

            {

                throw new CustomException("树名称字段不能为空");

                throw new ServiceException("树名称字段不能为空");

            }

        }

        else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory()))

        {

            if (StringUtils.isEmpty(genTable.getSubTableName()))

            {

                throw new ServiceException("关联子表的表名不能为空");

            }

            else if (StringUtils.isEmpty(genTable.getSubTableFkName()))

            {

                throw new ServiceException("子表关联的外键名不能为空");

            }

        }

    }

@@ -351,11 +432,10 @@
     * 设置主键列信息

     * 

     * @param table 业务表信息

     * @param columns 业务字段列表

     */

    public void setPkColumn(GenTable table, List<GenTableColumn> columns)

    public void setPkColumn(GenTable table)

    {

        for (GenTableColumn column : columns)

        for (GenTableColumn column : table.getColumns())

        {

            if (column.isPk())

            {

@@ -365,7 +445,36 @@
        }

        if (StringUtils.isNull(table.getPkColumn()))

        {

            table.setPkColumn(columns.get(0));

            table.setPkColumn(table.getColumns().get(0));

        }

        if (GenConstants.TPL_SUB.equals(table.getTplCategory()))

        {

            for (GenTableColumn column : table.getSubTable().getColumns())

            {

                if (column.isPk())

                {

                    table.getSubTable().setPkColumn(column);

                    break;

                }

            }

            if (StringUtils.isNull(table.getSubTable().getPkColumn()))

            {

                table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));

            }

        }

    }



    /**

     * 设置主子表信息

     * 
     * @param table 业务表信息

     */

    public void setSubTable(GenTable table)

    {

        String subTableName = table.getSubTableName();

        if (StringUtils.isNotEmpty(subTableName))

        {

            table.setSubTable(genTableMapper.selectGenTableByName(subTableName));

        }

    }



@@ -376,7 +485,7 @@
     */

    public void setTableFromOptions(GenTable genTable)

    {

        JSONObject paramsObj = JSONObject.parseObject(genTable.getOptions());

        JSONObject paramsObj = JSON.parseObject(genTable.getOptions());

        if (StringUtils.isNotNull(paramsObj))

        {

            String treeCode = paramsObj.getString(GenConstants.TREE_CODE);

@@ -384,7 +493,7 @@
            String treeName = paramsObj.getString(GenConstants.TREE_NAME);

            String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID);

            String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);

            


            genTable.setTreeCode(treeCode);

            genTable.setTreeParentCode(treeParentCode);

            genTable.setTreeName(treeName);