修改代码生成上级菜单字段类型

RuoYi

2024-09-27 18409922a5c913bda18110ab66a5d336db24f7dd

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/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,14 +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.core.constant.Constants;

import com.ruoyi.common.core.constant.GenConstants;

import com.ruoyi.common.core.exception.ServiceException;

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

import com.ruoyi.common.core.utils.SecurityUtils;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.security.utils.SecurityUtils;

import com.ruoyi.gen.domain.GenTable;

import com.ruoyi.gen.domain.GenTableColumn;

import com.ruoyi.gen.mapper.GenTableColumnMapper;

@@ -120,7 +121,7 @@
     * @return 结果

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void updateGenTable(GenTable genTable)

    {

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

@@ -142,7 +143,7 @@
     * @return 结果

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void deleteGenTableByIds(Long[] tableIds)

    {

        genTableMapper.deleteGenTableByIds(tableIds);

@@ -155,7 +156,7 @@
     * @param tableList 导入表列表

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void importGenTable(List<GenTable> tableList)

    {

        String operName = SecurityUtils.getUsername();

@@ -205,7 +206,7 @@
        VelocityContext context = VelocityUtils.prepareContext(table);



        // 获取模板列表

        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());

        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());

        for (String template : templates)

        {

            // 渲染模板

@@ -253,7 +254,7 @@
        VelocityContext context = VelocityUtils.prepareContext(table);



        // 获取模板列表

        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());

        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());

        for (String template : templates)

        {

            if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm"))

@@ -281,12 +282,12 @@
     * @param tableName 表名称

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void synchDb(String tableName)

    {

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

@@ -296,9 +297,29 @@
        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);

            }

        });

@@ -346,7 +367,7 @@
        VelocityContext context = VelocityUtils.prepareContext(table);



        // 获取模板列表

        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());

        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());

        for (String template : templates)

        {

            // 渲染模板

@@ -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,7 +401,7 @@
        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 ServiceException("树编码字段不能为空");

@@ -442,6 +463,7 @@
            }

        }

    }



    /**

     * 设置主子表信息

     * 

@@ -463,15 +485,15 @@
     */

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

            String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE);

            String treeName = paramsObj.getString(GenConstants.TREE_NAME);

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

            Long parentMenuId = paramsObj.getLongValue(GenConstants.PARENT_MENU_ID);

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

            


            genTable.setTreeCode(treeCode);

            genTable.setTreeParentCode(treeParentCode);

            genTable.setTreeName(treeName);