添加新群号：170801498

RuoYi

2022-12-03 b61e578bb8cd3936daff5237786a9020e3bcf9dc

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

@@ -7,6 +7,7 @@
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;

@@ -20,12 +21,12 @@
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.project.tool.gen.domain.GenTable;

@@ -128,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);

            }

        }

    }

@@ -180,7 +181,7 @@
        }

        catch (Exception e)

        {

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

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

        }

    }



@@ -269,7 +270,7 @@
                }

                catch (IOException e)

                {

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

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

                }

            }

        }

@@ -286,19 +287,39 @@
    {

        GenTable table = genTableMapper.selectGenTableByName(tableName);

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

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

        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 CustomException("同步数据失败，原表结构不存在");

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

        }

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



        dbTableColumns.forEach(column -> {

            if (!tableColumnNames.contains(column.getColumnName()))

            GenUtils.initColumnField(column, table);

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

            {

                GenUtils.initColumnField(column, table);

                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);

            }

        });

@@ -359,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)

@@ -380,29 +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 CustomException("关联子表的表名不能为空");

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

            }

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

            {

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

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

            }

        }

    }

@@ -464,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);

@@ -472,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);