From 8e31fb5557ff22af4fa16c3887995c96acae22e8 Mon Sep 17 00:00:00 2001 From: Yjoioooo <693337446@qq.com> Date: Mon, 24 Apr 2023 18:38:33 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/gen}/constant/GenConstants.java | 2 +- .../main/java/org/dromara/gen/domain/GenTable.java | 6 +++--- .../org/dromara/gen/mapper/GenTableColumnMapper.java | 2 +- .../java/org/dromara/gen/mapper/GenTableMapper.java | 2 +- .../org/dromara/gen/service/GenTableServiceImpl.java | 12 ++++++------ .../src/main/java/org/dromara/gen/util/GenUtils.java | 8 ++++---- .../java/org/dromara/gen/util/VelocityUtils.java | 8 ++++---- 7 files changed, 20 insertions(+), 20 deletions(-) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core => ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen}/constant/GenConstants.java (98%) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GenConstants.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/constant/GenConstants.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GenConstants.java rename to ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/constant/GenConstants.java index 87edab03..f67b6d40 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GenConstants.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/constant/GenConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package org.dromara.gen.constant; /** * 代码生成通用常量 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTable.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTable.java index 141eee2a..6813c0c8 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTable.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTable.java @@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.core.constant.GenConstants; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.web.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.ArrayUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.web.domain.BaseEntity; +import org.dromara.gen.constant.GenConstants; import javax.validation.Valid; import javax.validation.constraints.NotBlank; diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableColumnMapper.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableColumnMapper.java index b5935d74..a827bb49 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableColumnMapper.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableColumnMapper.java @@ -11,7 +11,7 @@ import java.util.List; * * @author Lion Li */ -@InterceptorIgnore(dataPermission = "true") +@InterceptorIgnore(dataPermission = "true", tenantLine = "true") public interface GenTableColumnMapper extends BaseMapperPlus { /** * 根据表名称查询列信息 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java index 66564342..c36a6644 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java @@ -13,7 +13,7 @@ import java.util.List; * * @author Lion Li */ -@InterceptorIgnore(dataPermission = "true") +@InterceptorIgnore(dataPermission = "true", tenantLine = "true") public interface GenTableMapper extends BaseMapperPlus { Page selectPageDbTableList(@Param("page") Page page, @Param("genTable") GenTable genTable); diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java index 457fb208..d607551e 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java @@ -12,8 +12,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GenConstants; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.JsonUtils; import org.dromara.common.core.utils.StreamUtils; @@ -22,6 +26,7 @@ import org.dromara.common.core.utils.file.FileUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.gen.constant.GenConstants; import org.dromara.gen.domain.GenTable; import org.dromara.gen.domain.GenTableColumn; import org.dromara.gen.mapper.GenTableColumnMapper; @@ -29,11 +34,6 @@ import org.dromara.gen.mapper.GenTableMapper; import org.dromara.gen.util.GenUtils; import org.dromara.gen.util.VelocityInitializer; import org.dromara.gen.util.VelocityUtils; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/GenUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/GenUtils.java index 13304684..0ea572ec 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/GenUtils.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/GenUtils.java @@ -1,13 +1,13 @@ package org.dromara.gen.util; -import org.dromara.common.core.constant.GenConstants; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.RegExUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.gen.config.GenConfig; +import org.dromara.gen.constant.GenConstants; import org.dromara.gen.domain.GenTable; import org.dromara.gen.domain.GenTableColumn; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.apache.commons.lang3.RegExUtils; import java.util.Arrays; diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/VelocityUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/VelocityUtils.java index 9277e662..38f221d0 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/VelocityUtils.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/VelocityUtils.java @@ -4,16 +4,16 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; -import org.dromara.common.core.constant.GenConstants; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.apache.velocity.VelocityContext; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.JsonUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.helper.DataBaseHelper; +import org.dromara.gen.constant.GenConstants; import org.dromara.gen.domain.GenTable; import org.dromara.gen.domain.GenTableColumn; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.apache.velocity.VelocityContext; import java.util.*;