Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

2 天以前 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

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

@@ -1,26 +1,5 @@
package com.ruoyi.project.tool.gen.service;



import java.io.ByteArrayOutputStream;

import java.io.File;

import java.io.IOException;

import java.io.StringWriter;

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;

import org.apache.velocity.app.Velocity;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import com.alibaba.fastjson2.JSON;

import com.alibaba.fastjson2.JSONObject;

import com.ruoyi.common.constant.Constants;

@@ -35,6 +14,28 @@
import com.ruoyi.project.tool.gen.util.GenUtils;

import com.ruoyi.project.tool.gen.util.VelocityInitializer;

import com.ruoyi.project.tool.gen.util.VelocityUtils;

import lombok.RequiredArgsConstructor;

import org.apache.commons.io.FileUtils;

import org.apache.commons.io.IOUtils;

import org.apache.velocity.Template;

import org.apache.velocity.VelocityContext;

import org.apache.velocity.app.Velocity;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



import java.io.ByteArrayOutputStream;

import java.io.File;

import java.io.IOException;

import java.io.StringWriter;

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;



/**

 * 业务 服务层实现

@@ -42,15 +43,13 @@
 * @author ruoyi

 */

@Service

@RequiredArgsConstructor

public class GenTableServiceImpl implements IGenTableService

{

    private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class);



    @Autowired

    private GenTableMapper genTableMapper;



    @Autowired

    private GenTableColumnMapper genTableColumnMapper;

    private final GenTableMapper genTableMapper;

    private final GenTableColumnMapper genTableColumnMapper;



    /**

     * 查询业务信息

@@ -501,7 +500,7 @@
            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);