zccbbg/wms-ruoyi
1
1
Fork 0
mirror of https://github.com/zccbbg/wms-ruoyi.git synced 2024-09-20 03:05:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix:报名错误问题修复

Browse source
This commit is contained in:
zccbbg 2024-07-02 09:06:50 +08:00
parent 539c30f49f
commit e2c95565aa
104 changed files with 185 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/rouyi/common/mybatis/annotation/DataColumn.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/annotation/DataColumn.java
View file

@ -1,4 +1,4 @@
package com.rouyi.common.mybatis.annotation;
package com.ruoyi.common.mybatis.annotation;
import java.lang.annotation.*;

2
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/rouyi/common/mybatis/annotation/DataPermission.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/annotation/DataPermission.java
View file

@ -1,4 +1,4 @@
package com.rouyi.common.mybatis.annotation;
package com.ruoyi.common.mybatis.annotation;
import java.lang.annotation.*;

8
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/rouyi/common/mybatis/config/MybatisPlusConfig.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/config/MybatisPlusConfig.java
View file

@ -1,4 +1,4 @@
package com.rouyi.common.mybatis.config;
package com.ruoyi.common.mybatis.config;
import cn.hutool.core.net.NetUtil;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
@ -8,11 +8,11 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
import com.rouyi.common.mybatis.handler.InjectionMetaObjectHandler;
import com.rouyi.common.mybatis.handler.MybatisExceptionHandler;
import com.ruoyi.common.mybatis.handler.InjectionMetaObjectHandler;
import com.ruoyi.common.mybatis.handler.MybatisExceptionHandler;
import com.ruoyi.common.core.factory.YmlPropertySourceFactory;
import com.ruoyi.common.core.utils.SpringUtils;
import com.rouyi.common.mybatis.interceptor.PlusDataPermissionInterceptor;
import com.ruoyi.common.mybatis.interceptor.PlusDataPermissionInterceptor;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.BeansException;
import org.springframework.context.annotation.Bean;

2
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/rouyi/common/mybatis/core/domain/BaseEntity.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/domain/BaseEntity.java
View file

@ -1,4 +1,4 @@
package com.rouyi.common.mybatis.core.domain;
package com.ruoyi.common.mybatis.core.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;

2
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/rouyi/common/mybatis/core/mapper/BaseMapperPlus.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/mapper/BaseMapperPlus.java
View file

@ -1,4 +1,4 @@
package com.rouyi.common.mybatis.core.mapper;
package com.ruoyi.common.mybatis.core.mapper;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;

2
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/rouyi/common/mybatis/core/page/PageQuery.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/page/PageQuery.java
View file

@ -1,4 +1,4 @@
package com.rouyi.common.mybatis.core.page;
package com.ruoyi.common.mybatis.core.page;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;

2
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/rouyi/common/mybatis/core/page/TableDataInfo.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/page/TableDataInfo.java
View file

@ -1,4 +1,4 @@
package com.rouyi.common.mybatis.core.page;
package com.ruoyi.common.mybatis.core.page;
import cn.hutool.http.HttpStatus;
import com.baomidou.mybatisplus.core.metadata.IPage;

2
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/rouyi/common/mybatis/enums/DataBaseType.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/enums/DataBaseType.java
View file

@ -1,4 +1,4 @@
package com.rouyi.common.mybatis.enums;
package com.ruoyi.common.mybatis.enums;
import com.ruoyi.common.core.utils.StringUtils;
import lombok.AllArgsConstructor;

4
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/rouyi/common/mybatis/enums/DataScopeType.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/enums/DataScopeType.java
View file

@ -1,6 +1,6 @@
package com.rouyi.common.mybatis.enums;
package com.ruoyi.common.mybatis.enums;
import com.rouyi.common.mybatis.helper.DataPermissionHelper;
import com.ruoyi.common.mybatis.helper.DataPermissionHelper;
import com.ruoyi.common.core.utils.StringUtils;
import lombok.AllArgsConstructor;
import lombok.Getter;

4
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/rouyi/common/mybatis/handler/InjectionMetaObjectHandler.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/InjectionMetaObjectHandler.java
View file

@ -1,11 +1,11 @@
package com.rouyi.common.mybatis.handler;
package com.ruoyi.common.mybatis.handler;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpStatus;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.ruoyi.common.core.domain.bo.LoginUser;
import com.ruoyi.common.core.exception.ServiceException;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.satoken.utils.LoginHelper;
import com.ruoyi.common.core.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;

2
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/rouyi/common/mybatis/handler/MybatisExceptionHandler.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/MybatisExceptionHandler.java
View file

@ -1,4 +1,4 @@
package com.rouyi.common.mybatis.handler;
package com.ruoyi.common.mybatis.handler;
import com.ruoyi.common.core.domain.R;
import lombok.extern.slf4j.Slf4j;

10
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/rouyi/common/mybatis/handler/PlusDataPermissionHandler.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/PlusDataPermissionHandler.java
View file

@ -1,10 +1,12 @@
package com.rouyi.common.mybatis.handler;
package com.ruoyi.common.mybatis.handler;
import cn.hutool.core.annotation.AnnotationUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.rouyi.common.mybatis.annotation.DataColumn;
import com.rouyi.common.mybatis.annotation.DataPermission;
import com.ruoyi.common.mybatis.annotation.DataColumn;
import com.ruoyi.common.mybatis.annotation.DataPermission;
import com.ruoyi.common.mybatis.enums.DataScopeType;
import com.ruoyi.common.mybatis.helper.DataPermissionHelper;
import lombok.extern.slf4j.Slf4j;
import net.sf.jsqlparser.JSQLParserException;
import net.sf.jsqlparser.expression.Expression;
@ -18,8 +20,6 @@ import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.SpringUtils;
import com.ruoyi.common.core.utils.StreamUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.rouyi.common.mybatis.enums.DataScopeType;
import com.rouyi.common.mybatis.helper.DataPermissionHelper;
import com.ruoyi.common.satoken.utils.LoginHelper;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.expression.BeanFactoryResolver;

4
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/rouyi/common/mybatis/helper/DataBaseHelper.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/DataBaseHelper.java
View file

@ -1,10 +1,10 @@
package com.rouyi.common.mybatis.helper;
package com.ruoyi.common.mybatis.helper;
import cn.hutool.core.convert.Convert;
import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.SpringUtils;
import com.rouyi.common.mybatis.enums.DataBaseType;
import com.ruoyi.common.mybatis.enums.DataBaseType;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/rouyi/common/mybatis/helper/DataPermissionHelper.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/DataPermissionHelper.java
View file

@ -1,4 +1,4 @@
package com.rouyi.common.mybatis.helper;
package com.ruoyi.common.mybatis.helper;
import cn.dev33.satoken.context.SaHolder;
import cn.dev33.satoken.context.model.SaStorage;

4
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/rouyi/common/mybatis/interceptor/PlusDataPermissionInterceptor.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/interceptor/PlusDataPermissionInterceptor.java
View file

@ -1,11 +1,11 @@
package com.rouyi.common.mybatis.interceptor;
package com.ruoyi.common.mybatis.interceptor;
import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
import com.baomidou.mybatisplus.extension.plugins.handler.MultiDataPermissionHandler;
import com.baomidou.mybatisplus.extension.plugins.inner.BaseMultiTableInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
import com.rouyi.common.mybatis.handler.PlusDataPermissionHandler;
import com.ruoyi.common.mybatis.handler.PlusDataPermissionHandler;
import lombok.extern.slf4j.Slf4j;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.schema.Table;

2
ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View file

@ -1 +1 @@
com.rouyi.common.mybatis.config.MybatisPlusConfig
com.ruoyi.common.mybatis.config.MybatisPlusConfig

4
ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
View file

@ -1,8 +1,8 @@
package com.ruoyi.demo.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.MapstructUtils;
import com.ruoyi.common.core.utils.ValidatorUtils;

2
ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.demo.domain.bo;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.demo.domain.entity.TestDemo;

2
ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.demo.domain.bo;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.demo.domain.entity.TestTree;

2
ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/entity/TestDemo.java
View file

@ -1,7 +1,7 @@
package com.ruoyi.demo.domain.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/entity/TestTree.java
View file

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoEncryptMapper.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.demo.mapper;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.demo.domain.entity.TestDemoEncrypt;
/**

6
ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java
View file

@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.rouyi.common.mybatis.annotation.DataColumn;
import com.rouyi.common.mybatis.annotation.DataPermission;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.annotation.DataColumn;
import com.ruoyi.common.mybatis.annotation.DataPermission;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.demo.domain.entity.TestDemo;
import com.ruoyi.demo.domain.vo.TestDemoVo;
import org.apache.ibatis.annotations.Param;

6
ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java
View file

@ -1,8 +1,8 @@
package com.ruoyi.demo.mapper;
import com.rouyi.common.mybatis.annotation.DataColumn;
import com.rouyi.common.mybatis.annotation.DataPermission;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.annotation.DataColumn;
import com.ruoyi.common.mybatis.annotation.DataPermission;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.demo.domain.entity.TestTree;
import com.ruoyi.demo.domain.vo.TestTreeVo;

4
ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java
View file

@ -1,7 +1,7 @@
package com.ruoyi.demo.service;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.demo.domain.entity.TestDemo;
import com.ruoyi.demo.domain.bo.TestDemoBo;
import com.ruoyi.demo.domain.vo.TestDemoVo;

4
ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java
View file

@ -3,8 +3,8 @@ package com.ruoyi.demo.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.core.utils.MapstructUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.demo.domain.entity.TestDemo;

4
ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
View file

@ -3,8 +3,8 @@ package com.ruoyi.generator.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.io.IoUtil;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;

8
ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
View file

@ -2,7 +2,7 @@ package com.ruoyi.generator.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.generator.constant.GenConstants;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.core.utils.StringUtils;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -203,4 +203,10 @@ public class GenTable extends BaseEntity {
}
return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
}
/**
* 数据源名称
*/
@NotBlank(message = "数据源名称不能为空")
private String dataName;
}

2
ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
View file

@ -4,7 +4,7 @@ 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 com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.core.utils.StringUtils;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java
View file

@ -1,7 +1,7 @@
package com.ruoyi.generator.mapper;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.generator.domain.GenTableColumn;
import java.util.List;

3
ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java
View file

@ -2,7 +2,7 @@ package com.ruoyi.generator.mapper;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.generator.domain.GenTable;
import org.apache.ibatis.annotations.Param;
@ -54,5 +54,4 @@ public interface GenTableMapper extends BaseMapperPlus<GenTable, GenTable> {
* @return 业务信息
*/
GenTable selectGenTableByName(String tableName);
}

4
ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
View file

@ -12,8 +12,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.generator.constant.GenConstants;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.json.utils.JsonUtils;
import com.ruoyi.common.core.utils.StreamUtils;

4
ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
View file

@ -1,7 +1,7 @@
package com.ruoyi.generator.service;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;

2
ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
View file

@ -5,7 +5,7 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.generator.constant.GenConstants;
import com.rouyi.common.mybatis.helper.DataBaseHelper;
import com.ruoyi.common.mybatis.helper.DataBaseHelper;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.json.utils.JsonUtils;
import com.ruoyi.common.core.utils.StringUtils;

24
ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
View file

@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<select id="selectPageDbTableList" resultMap="GenTableResult">
<if test="@com.ruoyi.common.helper.DataBaseHelper@isMySql()">
<if test="@com.ruoyi.common.mybatis.helper.DataBaseHelper@isMySql()">
select table_name, table_comment, create_time, update_time
from information_schema.tables
where table_schema = (select database())
@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
order by create_time desc
</if>
<if test="@com.ruoyi.common.helper.DataBaseHelper@isOracle()">
<if test="@com.ruoyi.common.mybatis.helper.DataBaseHelper@isOracle()">
select lower(dt.table_name) as table_name, dtc.comments as table_comment, uo.created as create_time, uo.last_ddl_time as update_time
from user_tables dt, user_tab_comments dtc, user_objects uo
where dt.table_name = dtc.table_name
@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
order by create_time desc
</if>
<if test="@com.ruoyi.common.helper.DataBaseHelper@isPostgerSql()">
<if test="@com.ruoyi.common.mybatis.helper.DataBaseHelper@isPostgerSql()">
select table_name, table_comment, create_time, update_time
from (
SELECT c.relname AS table_name,
@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
order by create_time desc
</if>
<if test="@com.ruoyi.common.helper.DataBaseHelper@isSqlServer()">
<if test="@com.ruoyi.common.mybatis.helper.DataBaseHelper@isSqlServer()">
SELECT cast(D.NAME as nvarchar) as table_name,
cast(F.VALUE as nvarchar) as table_comment,
crdate as create_time,
@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectDbTableListByNames" resultMap="GenTableResult">
<if test="@com.ruoyi.common.helper.DataBaseHelper@isMySql()">
<if test="@com.ruoyi.common.mybatis.helper.DataBaseHelper@isMySql()">
select table_name, table_comment, create_time, update_time from information_schema.tables
where table_name NOT LIKE 'xxl_job_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
and table_name in
@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{name}
</foreach>
</if>
<if test="@com.ruoyi.common.helper.DataBaseHelper@isOracle()">
<if test="@com.ruoyi.common.mybatis.helper.DataBaseHelper@isOracle()">
select lower(dt.table_name) as table_name, dtc.comments as table_comment, uo.created as create_time, uo.last_ddl_time as update_time
from user_tables dt, user_tab_comments dtc, user_objects uo
where dt.table_name = dtc.table_name
@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{name}
</foreach>
</if>
<if test="@com.ruoyi.common.helper.DataBaseHelper@isPostgerSql()">
<if test="@com.ruoyi.common.mybatis.helper.DataBaseHelper@isPostgerSql()">
select table_name, table_comment, create_time, update_time
from (
SELECT c.relname AS table_name,
@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{name}
</foreach>
</if>
<if test="@com.ruoyi.common.helper.DataBaseHelper@isSqlServer()">
<if test="@com.ruoyi.common.mybatis.helper.DataBaseHelper@isSqlServer()">
SELECT cast(D.NAME as nvarchar) as table_name,
cast(F.VALUE as nvarchar) as table_comment,
crdate as create_time,
@ -148,12 +148,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
<if test="@com.ruoyi.common.helper.DataBaseHelper@isMySql()">
<if test="@com.ruoyi.common.mybatis.helper.DataBaseHelper@isMySql()">
select table_name, table_comment, create_time, update_time from information_schema.tables
where table_name NOT LIKE 'xxl_job_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
and table_name = #{tableName}
</if>
<if test="@com.ruoyi.common.helper.DataBaseHelper@isOracle()">
<if test="@com.ruoyi.common.mybatis.helper.DataBaseHelper@isOracle()">
select lower(dt.table_name) as table_name, dtc.comments as table_comment, uo.created as create_time, uo.last_ddl_time as update_time
from user_tables dt, user_tab_comments dtc, user_objects uo
where dt.table_name = dtc.table_name
@ -163,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND dt.table_name NOT IN (select table_name from gen_table)
and lower(dt.table_name) = #{tableName}
</if>
<if test="@com.ruoyi.common.helper.DataBaseHelper@isPostgerSql()">
<if test="@com.ruoyi.common.mybatis.helper.DataBaseHelper@isPostgerSql()">
select table_name, table_comment, create_time, update_time
from (
SELECT c.relname AS table_name,
@ -180,7 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where table_name NOT LIKE 'xxl_job_%' and table_name NOT LIKE 'gen_%'
and table_name = #{tableName}
</if>
<if test="@com.ruoyi.common.helper.DataBaseHelper@isSqlServer()">
<if test="@com.ruoyi.common.mybatis.helper.DataBaseHelper@isSqlServer()">
SELECT cast(D.NAME as nvarchar) as table_name,
cast(F.VALUE as nvarchar) as table_comment,
crdate as create_time,

4
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
View file

@ -11,7 +11,7 @@ import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.core.annotation.RepeatSubmit;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.web.core.BaseController;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
@ -21,7 +21,7 @@ import ${packageName}.domain.vo.${ClassName}Vo;
import ${packageName}.domain.bo.${ClassName}Bo;
import ${packageName}.service.I${ClassName}Service;
#if($table.crud || $table.sub)
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
#elseif($table.tree)
#end

4
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm
View file

@ -4,8 +4,8 @@ import ${packageName}.domain.${ClassName};
import ${packageName}.domain.vo.${ClassName}Vo;
import ${packageName}.domain.bo.${ClassName}Bo;
#if($table.crud || $table.sub)
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
#end
import java.util.Collection;

4
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
View file

@ -2,8 +2,8 @@ package ${packageName}.service.impl;
import com.ruoyi.common.core.utils.MapstructUtils;
#if($table.crud || $table.sub)
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
#end
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysLogininforController.java
View file

@ -4,9 +4,9 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.web.core.BaseController;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.redis.utils.RedisUtils;
import com.ruoyi.common.excel.utils.ExcelUtil;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysOperlogController.java
View file

@ -3,9 +3,9 @@ package com.ruoyi.system.controller.monitor;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.web.core.BaseController;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.excel.utils.ExcelUtil;
import com.ruoyi.system.domain.entity.SysOperLog;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysUserOnlineController.java
View file

@ -9,7 +9,7 @@ import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.web.core.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.vo.UserOnlineVO;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.core.utils.StreamUtils;
import com.ruoyi.common.core.utils.StringUtils;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java
View file

@ -3,9 +3,9 @@ package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.web.core.BaseController;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.excel.utils.ExcelUtil;
import com.ruoyi.system.domain.entity.SysConfig;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java
View file

@ -4,9 +4,9 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.web.core.BaseController;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.excel.utils.ExcelUtil;
import com.ruoyi.system.domain.entity.SysDictData;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java
View file

@ -3,9 +3,9 @@ package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.web.core.BaseController;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.excel.utils.ExcelUtil;
import com.ruoyi.system.domain.entity.SysDictType;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java
View file

@ -3,9 +3,9 @@ package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.web.core.BaseController;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.system.domain.entity.SysNotice;
import com.ruoyi.system.service.ISysNoticeService;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssConfigController.java
View file

@ -1,8 +1,8 @@
package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java
View file

@ -5,9 +5,9 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.web.core.BaseController;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.core.exception.ServiceException;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysPostController.java
View file

@ -4,9 +4,9 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.web.core.BaseController;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.excel.utils.ExcelUtil;
import com.ruoyi.system.domain.entity.SysPost;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java
View file

@ -3,9 +3,9 @@ package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.web.core.BaseController;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.excel.utils.ExcelUtil;
import com.ruoyi.system.domain.entity.SysDept;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java
View file

@ -8,9 +8,9 @@ import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.web.core.BaseController;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.satoken.utils.LoginHelper;
import com.ruoyi.common.core.utils.MapstructUtils;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.system.domain.bo;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.system.domain.entity.SysOss;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.system.domain.bo;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.system.domain.entity.SysOssConfig;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/SysConfig.java
View file

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.excel.annotation.ExcelDictFormat;
import com.ruoyi.common.excel.convert.ExcelDictConvert;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/SysDept.java
View file

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/SysDictData.java
View file

@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.excel.annotation.ExcelDictFormat;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.excel.convert.ExcelDictConvert;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/SysDictType.java
View file

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.excel.annotation.ExcelDictFormat;
import com.ruoyi.common.excel.convert.ExcelDictConvert;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/SysMenu.java
View file

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/SysNotice.java
View file

@ -2,7 +2,7 @@ package com.ruoyi.system.domain.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.core.xss.Xss;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/SysOss.java
View file

@ -2,7 +2,7 @@ package com.ruoyi.system.domain.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/SysOssConfig.java
View file

@ -2,7 +2,7 @@ package com.ruoyi.system.domain.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/SysPost.java
View file

@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.excel.annotation.ExcelDictFormat;
import com.ruoyi.common.excel.convert.ExcelDictConvert;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/SysRole.java
View file

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.excel.annotation.ExcelDictFormat;
import com.ruoyi.common.excel.convert.ExcelDictConvert;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/SysUser.java
View file

@ -3,7 +3,7 @@ package com.ruoyi.system.domain.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.rouyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.xss.Xss;
import com.ruoyi.common.sensitive.annotation.Sensitive;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.system.domain.entity.SysConfig;
/**

6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
View file

@ -2,9 +2,9 @@ package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.rouyi.common.mybatis.annotation.DataColumn;
import com.rouyi.common.mybatis.annotation.DataPermission;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.annotation.DataColumn;
import com.ruoyi.common.mybatis.annotation.DataPermission;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.system.domain.entity.SysDept;
import org.apache.ibatis.annotations.Param;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
View file

@ -1,7 +1,7 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.system.domain.entity.SysDictData;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.system.domain.entity.SysDictType;
/**

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.system.domain.entity.SysLogininfor;
/**

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
View file

@ -3,7 +3,7 @@ package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.system.domain.entity.SysMenu;
import org.apache.ibatis.annotations.Param;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.system.domain.entity.SysNotice;
/**

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.system.domain.entity.SysOperLog;
/**

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.system.domain.entity.SysOssConfig;
import com.ruoyi.system.domain.vo.SysOssConfigVo;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.system.domain.entity.SysOss;
import com.ruoyi.system.domain.vo.SysOssVo;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.system.domain.entity.SysPost;
import java.util.List;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.system.domain.entity.SysRoleDept;
/**

6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
View file

@ -3,9 +3,9 @@ package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.rouyi.common.mybatis.annotation.DataColumn;
import com.rouyi.common.mybatis.annotation.DataPermission;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.annotation.DataColumn;
import com.ruoyi.common.mybatis.annotation.DataPermission;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.system.domain.entity.SysRole;
import org.apache.ibatis.annotations.Param;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.system.domain.entity.SysRoleMenu;
/**

6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
View file

@ -3,9 +3,9 @@ package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.rouyi.common.mybatis.annotation.DataColumn;
import com.rouyi.common.mybatis.annotation.DataPermission;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.annotation.DataColumn;
import com.ruoyi.common.mybatis.annotation.DataPermission;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.system.domain.entity.SysUser;
import org.apache.ibatis.annotations.Param;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.system.domain.entity.SysUserPost;
/**

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
View file

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.rouyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import com.ruoyi.system.domain.entity.SysUserRole;
import java.util.List;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
View file

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.system.domain.entity.SysConfig;
import java.util.List;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
View file

@ -1,8 +1,8 @@
package com.ruoyi.system.service;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.system.domain.entity.SysDictData;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import java.util.List;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
View file

@ -1,9 +1,9 @@
package com.ruoyi.system.service;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.system.domain.entity.SysDictData;
import com.ruoyi.system.domain.entity.SysDictType;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import java.util.List;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
View file

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.system.domain.entity.SysLogininfor;
import java.util.List;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java
View file

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.system.domain.entity.SysNotice;
import java.util.List;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java
View file

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.system.domain.entity.SysOperLog;
import java.util.List;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java
View file

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.system.domain.bo.SysOssConfigBo;
import com.ruoyi.system.domain.vo.SysOssConfigVo;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java
View file

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.system.domain.bo.SysOssBo;
import com.ruoyi.system.domain.vo.SysOssVo;
import org.springframework.web.multipart.MultipartFile;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
View file

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.system.domain.entity.SysPost;
import java.util.List;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
View file

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.system.domain.entity.SysRole;
import com.ruoyi.system.domain.entity.SysUserRole;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
View file

@ -1,8 +1,8 @@
package com.ruoyi.system.service;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.system.domain.entity.SysUser;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import java.util.List;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
View file

@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.CacheNames;
import com.ruoyi.common.core.constant.UserConstants;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.core.service.ConfigService;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java
View file

@ -3,7 +3,7 @@ package com.ruoyi.system.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.rouyi.common.mybatis.helper.DataBaseHelper;
import com.ruoyi.common.mybatis.helper.DataBaseHelper;
import com.ruoyi.common.core.utils.StreamUtils;
import com.ruoyi.system.domain.entity.SysDept;
import com.ruoyi.system.domain.entity.SysRoleDept;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View file

@ -13,7 +13,7 @@ import com.ruoyi.system.domain.entity.SysRole;
import com.ruoyi.system.domain.entity.SysUser;
import com.ruoyi.common.core.service.DeptService;
import com.ruoyi.common.core.exception.ServiceException;
import com.rouyi.common.mybatis.helper.DataBaseHelper;
import com.ruoyi.common.mybatis.helper.DataBaseHelper;
import com.ruoyi.common.satoken.utils.LoginHelper;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.TreeBuildUtils;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
View file

@ -3,9 +3,9 @@ package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.CacheNames;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.system.domain.entity.SysDictData;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.redis.utils.CacheUtils;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
View file

@ -9,10 +9,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.CacheNames;
import com.ruoyi.common.core.constant.UserConstants;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.system.domain.entity.SysDictData;
import com.ruoyi.system.domain.entity.SysDictType;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.core.service.DictService;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StreamUtils;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
View file

@ -4,8 +4,8 @@ import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.StringUtils;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
View file

@ -2,8 +2,8 @@ package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.system.domain.entity.SysNotice;
import com.ruoyi.system.mapper.SysNoticeMapper;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
View file

@ -3,8 +3,8 @@ package com.ruoyi.system.service.impl;
import cn.hutool.core.util.ArrayUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.core.utils.MapstructUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.ip.AddressUtils;

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java
View file

@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.CacheNames;
import com.rouyi.common.mybatis.core.page.PageQuery;
import com.rouyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.json.utils.JsonUtils;
import com.ruoyi.common.core.utils.MapstructUtils;

Some files were not shown because too many files have changed in this diff Show more