数据权限注解支持自定义字段名

RuoYi

2026-04-03 cc4fe8f7cb80bdc7bdf264271e68777324f89f40

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

@@ -4,6 +4,8 @@
import java.io.File;

import java.io.IOException;

import java.io.StringWriter;

import java.util.Arrays;

import java.util.HashMap;

import java.util.LinkedHashMap;

import java.util.List;

import java.util.Map;

@@ -21,8 +23,8 @@
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;

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

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void updateGenTable(GenTable genTable)

    {

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

@@ -129,9 +131,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);

            }

        }

    }

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

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void deleteGenTableByIds(Long[] tableIds)

    {

        genTableMapper.deleteGenTableByIds(tableIds);

@@ -156,8 +158,8 @@
     * @param tableList 导入表列表

     */

    @Override

    @Transactional

    public void importGenTable(List<GenTable> tableList)

    @Transactional(rollbackFor = Exception.class)

    public void importGenTable(List<GenTable> tableList, String tplWebType)

    {

        String operName = SecurityUtils.getUsername();

        try

@@ -165,6 +167,7 @@
            for (GenTable table : tableList)

            {

                String tableName = table.getTableName();

                table.setTplWebType(tplWebType);

                GenUtils.initTable(table, operName);

                int row = genTableMapper.insertGenTable(table);

                if (row > 0)

@@ -206,7 +209,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)

        {

            // 渲染模板

@@ -227,11 +230,7 @@
    @Override

    public byte[] downloadCode(String tableName)

    {

        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

        ZipOutputStream zip = new ZipOutputStream(outputStream);

        generatorCode(tableName, zip);

        IOUtils.closeQuietly(zip);

        return outputStream.toByteArray();

        return downloadCode(new String[] { tableName });

    }



    /**

@@ -254,7 +253,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"))

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

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void synchDb(String tableName)

    {

        GenTable table = genTableMapper.selectGenTableByName(tableName);

@@ -342,9 +341,14 @@
    {

        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

        ZipOutputStream zip = new ZipOutputStream(outputStream);

        Map<String, StringBuffer> typeFiles = new HashMap<>();

        for (String tableName : tableNames)

        {

            generatorCode(tableName, zip);

            generatorCode(tableName, zip, typeFiles);

        }

        for (Map.Entry<String, StringBuffer> entry : typeFiles.entrySet())

        {

            writeToZip(zip, entry.getKey(), entry.getValue().toString());

        }

        IOUtils.closeQuietly(zip);

        return outputStream.toByteArray();

@@ -353,7 +357,7 @@
    /**

     * 查询表信息并生成代码

     */

    private void generatorCode(String tableName, ZipOutputStream zip)

    private void generatorCode(String tableName, ZipOutputStream zip, Map<String, StringBuffer> typeFiles)

    {

        // 查询表信息

        GenTable table = genTableMapper.selectGenTableByName(tableName);

@@ -367,26 +371,53 @@
        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)

        {

            // 渲染模板

            StringWriter sw = new StringWriter();

            Template tpl = Velocity.getTemplate(template, Constants.UTF8);

            tpl.merge(context, sw);

            try

            String fileName = VelocityUtils.getFileName(template, table);

            // index-bak.ts 模版，追加内容

            if (fileName.contains("index-bak.ts"))

            {

                // 添加到zip

                zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));

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

                IOUtils.closeQuietly(sw);

                zip.flush();

                zip.closeEntry();

                if (!typeFiles.containsKey(fileName))

                {

                    typeFiles.put(fileName, new StringBuffer(sw.toString()));

                }

                else

                {

                    Arrays.stream(sw.toString().split("\n")).filter(line -> line.startsWith("export * from")).forEach(line -> typeFiles.get(fileName).append("\n").append(line));

                }

            }

            catch (IOException e)

            else

            {

                log.error("渲染模板失败，表名：" + table.getTableName(), e);

                // 其他文件正常添加

                writeToZip(zip, fileName, sw.toString());

            }

        }

    }



    /**

     * 将字符串内容写入ZIP输出流

     * 
     * @param zip ZIP输出流

     * @param fileName ZIP条目名称（即文件名）

     * @param content 要写入的内容

     */

    private void writeToZip(ZipOutputStream zip, String fileName, String content)

    {

        try

        {

            zip.putNextEntry(new ZipEntry(fileName));

            IOUtils.write(content, zip, Constants.UTF8);

            zip.flush();

            zip.closeEntry();

        }

        catch (IOException e)

        {

            log.error("写入ZIP文件失败，文件名: " + fileName, e);

        }

    }



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

@@ -414,16 +445,16 @@
            {

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

            }

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

        }

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

        {

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

            {

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

                {

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

                }

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

                {

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

                }

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

            }

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

            {

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

            }

        }

    }

@@ -485,13 +516,13 @@
     */

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