ruoyi
/
ruoyi-vue-server
14
1
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

移除了对mybatis的拓展支持

nacos
DongZeLiang 2023-10-08 19:53:56 +08:00
parent 3bd782cd38
commit 2afa26f57a
30 changed files with 101 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
View File

@ -11,10 +11,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
* @author ruoyi * @author ruoyi
*/ */
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
@MapperScan("com.ruoyi.system.mapper")
public class RuoYiApplication { public class RuoYiApplication {
public static void main (String[] args) { public static void main (String[] args) {
// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args); SpringApplication.run(RuoYiApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" +
" .-------. ____ __ \n" + " .-------. ____ __ \n" +

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/BookInfoController.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.web.controller.system;
import com.ruoyi.common.core.domain.Result; import com.ruoyi.common.core.domain.Result;
import com.ruoyi.system.domain.BookInfo; import com.ruoyi.system.domain.BookInfo;
import com.ruoyi.system.service.BookInfoService; import com.ruoyi.book.service.BookInfoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;

10
ruoyi-admin/src/main/resources/application.yml
View File

@ -75,16 +75,6 @@ token:
# MyBatis配置 # MyBatis配置
mybatis: mybatis:
# 搜索指定包别名
typeAliasesPackage: com.ruoyi.**.domain
# 配置mapper的扫描，找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件
configLocation: classpath:mybatis/mybatis-config.xml
mybatis-plus:
# 搜索指定包别名
typeAliasesPackage: com.ruoyi.**.domain
# 配置mapper的扫描，找到所有的mapper.xml映射文件 # 配置mapper的扫描，找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件 # 加载全局的配置文件

22
ruoyi-admin/src/main/resources/banner.txt
View File

@ -1,24 +1,2 @@
Application Version: ${ruoyi.version} Application Version: ${ruoyi.version}
Spring Boot Version: ${spring-boot.version} Spring Boot Version: ${spring-boot.version}
////////////////////////////////////////////////////////////////////
// _ooOoo_ //
// o8888888o //
// 88" . "88 //
// (| ^_^ |) //
// O\ = /O //
// ____/`---'\____ //
// .' \\| |// `. //
// / \\||| : |||// \ //
// / _||||| -:- |||||- \ //
// | | \\\ - /// | | //
// | \_| ''\---/'' | | //
// \ .-\__ `-` ___/-. / //
// ___`. .' /--.--\ `. . ___ //
// ."" '< `.___\_<|>_/___.' >'"". //
// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
// \ \ `-. \_ __\ /__ _/ .-` / / //
// ========`-.____`-.___\_____/___.-`____.-'======== //
// `=---=' //
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
// 佛祖保佑 永不宕机 永无BUG //
////////////////////////////////////////////////////////////////////

4
ruoyi-admin/src/test/java/com/myplus/BookTestService.java
View File

@ -2,8 +2,8 @@ package com.myplus;
import com.ruoyi.RuoYiApplication; import com.ruoyi.RuoYiApplication;
import com.ruoyi.system.domain.BookInfo; import com.ruoyi.system.domain.BookInfo;
import com.ruoyi.system.mapper.BookInfoMapper; import com.ruoyi.book.mapper.BookInfoMapper;
import com.ruoyi.system.service.BookInfoService; import com.ruoyi.book.service.BookInfoService;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;

10
ruoyi-common/pom.xml
View File

@ -46,6 +46,16 @@
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId> <artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.3.1</version> <version>3.5.3.1</version>
<exclusions>
<exclusion>
<groupId>com.github.jsqlparser</groupId>
<artifactId>jsqlparser</artifactId>
</exclusion>
<exclusion>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- 自定义验证注解 --> <!-- 自定义验证注解 -->

9
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
View File

@ -17,7 +17,14 @@ import java.util.TimeZone;
// 表示通过aop框架暴露该代理对象,AopContext能够访问 // 表示通过aop框架暴露该代理对象,AopContext能够访问
@EnableAspectJAutoProxy(exposeProxy = true) @EnableAspectJAutoProxy(exposeProxy = true)
// 指定要扫描的Mapper类的包的路径 // 指定要扫描的Mapper类的包的路径
@MapperScan("com.ruoyi.**.mapper") @MapperScan(
{
"com.ruoyi.system.mapper",
"com.ruoyi.quartz.mapper",
"com.ruoyi.generator.mapper",
"com.ruoyi.book.mapper",
}
)
public class ApplicationConfig { public class ApplicationConfig {
/** /**
* 时区配置 * 时区配置

109
ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
View File

@ -1,109 +0,0 @@
package com.ruoyi.framework.config;
import com.ruoyi.common.utils.StringUtils;
import org.apache.ibatis.io.VFS;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
import org.springframework.core.type.classreading.MetadataReader;
import org.springframework.core.type.classreading.MetadataReaderFactory;
import org.springframework.util.ClassUtils;
import javax.sql.DataSource;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
/**
* Mybatis支持*匹配扫描包
*
* @author ruoyi
*/
@Configuration
public class MyBatisConfig {
static final String DEFAULT_RESOURCE_PATTERN = "**/*.class";
@Autowired
private Environment env;
public static String setTypeAliasesPackage (String typeAliasesPackage) {
ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver();
MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver);
List<String> allResult = new ArrayList<String>();
try {
for (String aliasesPackage : typeAliasesPackage.split(",")) {
List<String> result = new ArrayList<String>();
aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
+ ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN;
Resource[] resources = resolver.getResources(aliasesPackage);
if (resources != null && resources.length > 0) {
MetadataReader metadataReader = null;
for (Resource resource : resources) {
if (resource.isReadable()) {
metadataReader = metadataReaderFactory.getMetadataReader(resource);
try {
result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName());
} catch (ClassNotFoundException e) {
e.printStackTrace();
}
}
}
}
if (result.size() > 0) {
HashSet<String> hashResult = new HashSet<String>(result);
allResult.addAll(hashResult);
}
}
if (allResult.size() > 0) {
typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0]));
} else {
throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包");
}
} catch (IOException e) {
e.printStackTrace();
}
return typeAliasesPackage;
}
public Resource[] resolveMapperLocations (String[] mapperLocations) {
ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver();
List<Resource> resources = new ArrayList<Resource>();
if (mapperLocations != null) {
for (String mapperLocation : mapperLocations) {
try {
Resource[] mappers = resourceResolver.getResources(mapperLocation);
resources.addAll(Arrays.asList(mappers));
} catch (IOException e) {
// ignore
}
}
}
return resources.toArray(new Resource[resources.size()]);
}
@Bean
public SqlSessionFactory sqlSessionFactory (DataSource dataSource) throws Exception {
String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
String mapperLocations = env.getProperty("mybatis.mapperLocations");
String configLocation = env.getProperty("mybatis.configLocation");
typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
VFS.addImplClass(SpringBootVFS.class);
final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
sessionFactory.setDataSource(dataSource);
sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
return sessionFactory.getObject();
}
}

6
ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.generator.mapper.GenTableColumnMapper"> <mapper namespace="com.ruoyi.generator.mapper.GenTableColumnMapper">
<resultMap type="GenTableColumn" id="GenTableColumnResult"> <resultMap type="com.ruoyi.generator.domain.GenTableColumn" id="GenTableColumnResult">
<id property="columnId" column="column_id"/> <id property="columnId" column="column_id"/>
<result property="tableId" column="table_id"/> <result property="tableId" column="table_id"/>
<result property="columnName" column="column_name"/> <result property="columnName" column="column_name"/>
@ -75,7 +75,7 @@
order by ordinal_position order by ordinal_position
</select> </select>
<insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId"> <insert id="insertGenTableColumn" parameterType="com.ruoyi.generator.domain.GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
insert into gen_table_column ( insert into gen_table_column (
<if test="tableId != null and tableId != ''">table_id,</if> <if test="tableId != null and tableId != ''">table_id,</if>
<if test="columnName != null and columnName != ''">column_name,</if> <if test="columnName != null and columnName != ''">column_name,</if>
@ -119,7 +119,7 @@
) )
</insert> </insert>
<update id="updateGenTableColumn" parameterType="GenTableColumn"> <update id="updateGenTableColumn" parameterType="com.ruoyi.generator.domain.GenTableColumn">
update gen_table_column update gen_table_column
<set> <set>
<if test="columnComment != null">column_comment = #{columnComment},</if> <if test="columnComment != null">column_comment = #{columnComment},</if>

12
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.generator.mapper.GenTableMapper"> <mapper namespace="com.ruoyi.generator.mapper.GenTableMapper">
<resultMap type="GenTable" id="GenTableResult"> <resultMap type="com.ruoyi.generator.domain.GenTable" id="GenTableResult">
<id property="tableId" column="table_id"/> <id property="tableId" column="table_id"/>
<result property="tableName" column="table_name"/> <result property="tableName" column="table_name"/>
<result property="tableComment" column="table_comment"/> <result property="tableComment" column="table_comment"/>
@ -28,7 +28,7 @@
<collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult"/> <collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult"/>
</resultMap> </resultMap>
<resultMap type="GenTableColumn" id="GenTableColumnResult"> <resultMap type="com.ruoyi.generator.domain.GenTableColumn" id="GenTableColumnResult">
<id property="columnId" column="column_id"/> <id property="columnId" column="column_id"/>
<result property="tableId" column="table_id"/> <result property="tableId" column="table_id"/>
<result property="columnName" column="column_name"/> <result property="columnName" column="column_name"/>
@ -77,7 +77,7 @@
from gen_table from gen_table
</sql> </sql>
<select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult"> <select id="selectGenTableList" parameterType="com.ruoyi.generator.domain.GenTable" resultMap="GenTableResult">
<include refid="selectGenTableVo"/> <include refid="selectGenTableVo"/>
<where> <where>
<if test="tableName != null and tableName != ''"> <if test="tableName != null and tableName != ''">
@ -95,7 +95,7 @@
</where> </where>
</select> </select>
<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult"> <select id="selectDbTableList" parameterType="com.ruoyi.generator.domain.GenTable" resultMap="GenTableResult">
select table_name, table_comment, create_time, update_time from information_schema.tables select table_name, table_comment, create_time, update_time from information_schema.tables
where table_schema = (select database()) where table_schema = (select database())
AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%' AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
@ -249,7 +249,7 @@
order by c.sort order by c.sort
</select> </select>
<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId"> <insert id="insertGenTable" parameterType="com.ruoyi.generator.domain.GenTable" useGeneratedKeys="true" keyProperty="tableId">
insert into gen_table ( insert into gen_table (
<if test="tableName != null">table_name,</if> <if test="tableName != null">table_name,</if>
<if test="tableComment != null and tableComment != ''">table_comment,</if> <if test="tableComment != null and tableComment != ''">table_comment,</if>
@ -283,7 +283,7 @@
) )
</insert> </insert>
<update id="updateGenTable" parameterType="GenTable"> <update id="updateGenTable" parameterType="com.ruoyi.generator.domain.GenTable">
update gen_table update gen_table
<set> <set>
<if test="tableName != null">table_name = #{tableName},</if> <if test="tableName != null">table_name = #{tableName},</if>

6
ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.quartz.mapper.SysJobLogMapper"> <mapper namespace="com.ruoyi.quartz.mapper.SysJobLogMapper">
<resultMap type="SysJobLog" id="SysJobLogResult"> <resultMap type="com.ruoyi.quartz.domain.SysJobLog" id="SysJobLogResult">
<id property="jobLogId" column="job_log_id"/> <id property="jobLogId" column="job_log_id"/>
<result property="jobName" column="job_name"/> <result property="jobName" column="job_name"/>
<result property="jobGroup" column="job_group"/> <result property="jobGroup" column="job_group"/>
@ -27,7 +27,7 @@
from sys_job_log from sys_job_log
</sql> </sql>
<select id="selectJobLogList" parameterType="SysJobLog" resultMap="SysJobLogResult"> <select id="selectJobLogList" parameterType="com.ruoyi.quartz.domain.SysJobLog" resultMap="SysJobLogResult">
<include refid="selectJobLogVo"/> <include refid="selectJobLogVo"/>
<where> <where>
<if test="jobName != null and jobName != ''"> <if test="jobName != null and jobName != ''">
@ -77,7 +77,7 @@
truncate table sys_job_log truncate table sys_job_log
</update> </update>
<insert id="insertJobLog" parameterType="SysJobLog"> <insert id="insertJobLog" parameterType="com.ruoyi.quartz.domain.SysJobLog">
insert into sys_job_log( insert into sys_job_log(
<if test="jobLogId != null and jobLogId != 0">job_log_id,</if> <if test="jobLogId != null and jobLogId != 0">job_log_id,</if>
<if test="jobName != null and jobName != ''">job_name,</if> <if test="jobName != null and jobName != ''">job_name,</if>

8
ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.quartz.mapper.SysJobMapper"> <mapper namespace="com.ruoyi.quartz.mapper.SysJobMapper">
<resultMap type="SysJob" id="SysJobResult"> <resultMap type="com.ruoyi.quartz.domain.SysJob" id="SysJobResult">
<id property="jobId" column="job_id"/> <id property="jobId" column="job_id"/>
<result property="jobName" column="job_name"/> <result property="jobName" column="job_name"/>
<result property="jobGroup" column="job_group"/> <result property="jobGroup" column="job_group"/>
@ -35,7 +35,7 @@
from sys_job from sys_job
</sql> </sql>
<select id="selectJobList" parameterType="SysJob" resultMap="SysJobResult"> <select id="selectJobList" parameterType="com.ruoyi.quartz.domain.SysJob" resultMap="SysJobResult">
<include refid="selectJobVo"/> <include refid="selectJobVo"/>
<where> <where>
<if test="jobName != null and jobName != ''"> <if test="jobName != null and jobName != ''">
@ -75,7 +75,7 @@
</foreach> </foreach>
</delete> </delete>
<update id="updateJob" parameterType="SysJob"> <update id="updateJob" parameterType="com.ruoyi.quartz.domain.SysJob">
update sys_job update sys_job
<set> <set>
<if test="jobName != null and jobName != ''">job_name = #{jobName},</if> <if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
@ -92,7 +92,7 @@
where job_id = #{jobId} where job_id = #{jobId}
</update> </update>
<insert id="insertJob" parameterType="SysJob" useGeneratedKeys="true" keyProperty="jobId"> <insert id="insertJob" parameterType="com.ruoyi.quartz.domain.SysJob" useGeneratedKeys="true" keyProperty="jobId">
insert into sys_job( insert into sys_job(
<if test="jobId != null and jobId != 0">job_id,</if> <if test="jobId != null and jobId != 0">job_id,</if>
<if test="jobName != null and jobName != ''">job_name,</if> <if test="jobName != null and jobName != ''">job_name,</if>

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/BookInfoMapper.java → ruoyi-system/src/main/java/com/ruoyi/book/mapper/BookInfoMapper.java
View File

@ -1,14 +1,12 @@
package com.ruoyi.system.mapper; package com.ruoyi.book.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.BookInfo; import com.ruoyi.system.domain.BookInfo;
import org.apache.ibatis.annotations.Mapper;
/** /**
* @author DongZl * @author DongZl
* @description: 书籍mapper层 * @description: 书籍mapper层
* @Date 2023-10-7 上午 09:31 * @Date 2023-10-7 上午 09:31
*/ */
@Mapper
public interface BookInfoMapper extends BaseMapper<BookInfo> { public interface BookInfoMapper extends BaseMapper<BookInfo> {
} }

2
ruoyi-system/src/main/java/com/ruoyi/system/service/BookInfoService.java → ruoyi-system/src/main/java/com/ruoyi/book/service/BookInfoService.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.system.service; package com.ruoyi.book.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.BookInfo; import com.ruoyi.system.domain.BookInfo;

6
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BookInfoServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/book/service/impl/BookInfoServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.system.service.impl; package com.ruoyi.book.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.book.service.BookInfoService;
import com.ruoyi.system.domain.BookInfo; import com.ruoyi.system.domain.BookInfo;
import com.ruoyi.system.mapper.BookInfoMapper; import com.ruoyi.book.mapper.BookInfoMapper;
import com.ruoyi.system.service.BookInfoService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**

10
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysConfigMapper"> <mapper namespace="com.ruoyi.system.mapper.SysConfigMapper">
<resultMap type="SysConfig" id="SysConfigResult"> <resultMap type="com.ruoyi.system.domain.SysConfig" id="SysConfigResult">
<id property="configId" column="config_id"/> <id property="configId" column="config_id"/>
<result property="configName" column="config_name"/> <result property="configName" column="config_name"/>
<result property="configKey" column="config_key"/> <result property="configKey" column="config_key"/>
@ -42,12 +42,12 @@
</where> </where>
</sql> </sql>
<select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult"> <select id="selectConfig" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult">
<include refid="selectConfigVo"/> <include refid="selectConfigVo"/>
<include refid="sqlwhereSearch"/> <include refid="sqlwhereSearch"/>
</select> </select>
<select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult"> <select id="selectConfigList" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult">
<include refid="selectConfigVo"/> <include refid="selectConfigVo"/>
<where> <where>
<if test="configName != null and configName != ''"> <if test="configName != null and configName != ''">
@ -78,7 +78,7 @@
where config_key = #{configKey} limit 1 where config_key = #{configKey} limit 1
</select> </select>
<insert id="insertConfig" parameterType="SysConfig"> <insert id="insertConfig" parameterType="com.ruoyi.system.domain.SysConfig">
insert into sys_config ( insert into sys_config (
<if test="configName != null and configName != '' ">config_name,</if> <if test="configName != null and configName != '' ">config_name,</if>
<if test="configKey != null and configKey != '' ">config_key,</if> <if test="configKey != null and configKey != '' ">config_key,</if>
@ -98,7 +98,7 @@
) )
</insert> </insert>
<update id="updateConfig" parameterType="SysConfig"> <update id="updateConfig" parameterType="com.ruoyi.system.domain.SysConfig">
update sys_config update sys_config
<set> <set>
<if test="configName != null and configName != ''">config_name = #{configName},</if> <if test="configName != null and configName != ''">config_name = #{configName},</if>

8
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDeptMapper"> <mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
<resultMap type="SysDept" id="SysDeptResult"> <resultMap type="com.ruoyi.common.core.domain.entity.SysDept" id="SysDeptResult">
<id property="deptId" column="dept_id"/> <id property="deptId" column="dept_id"/>
<result property="parentId" column="parent_id"/> <result property="parentId" column="parent_id"/>
<result property="ancestors" column="ancestors"/> <result property="ancestors" column="ancestors"/>
@ -38,7 +38,7 @@
from sys_dept d from sys_dept d
</sql> </sql>
<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult"> <select id="selectDeptList" parameterType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="SysDeptResult">
<include refid="selectDeptVo"/> <include refid="selectDeptVo"/>
where d.del_flag = '0' where d.del_flag = '0'
<if test="deptId != null and deptId != 0"> <if test="deptId != null and deptId != 0">
@ -119,7 +119,7 @@
where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1 where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
</select> </select>
<insert id="insertDept" parameterType="SysDept"> <insert id="insertDept" parameterType="com.ruoyi.common.core.domain.entity.SysDept">
insert into sys_dept( insert into sys_dept(
<if test="deptId != null and deptId != 0">dept_id,</if> <if test="deptId != null and deptId != 0">dept_id,</if>
<if test="parentId != null and parentId != 0">parent_id,</if> <if test="parentId != null and parentId != 0">parent_id,</if>
@ -147,7 +147,7 @@
) )
</insert> </insert>
<update id="updateDept" parameterType="SysDept"> <update id="updateDept" parameterType="com.ruoyi.common.core.domain.entity.SysDept">
update sys_dept update sys_dept
<set> <set>
<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if> <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>

10
ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDictDataMapper"> <mapper namespace="com.ruoyi.system.mapper.SysDictDataMapper">
<resultMap type="SysDictData" id="SysDictDataResult"> <resultMap type="com.ruoyi.common.core.domain.entity.SysDictData" id="SysDictDataResult">
<id property="dictCode" column="dict_code"/> <id property="dictCode" column="dict_code"/>
<result property="dictSort" column="dict_sort"/> <result property="dictSort" column="dict_sort"/>
<result property="dictLabel" column="dict_label"/> <result property="dictLabel" column="dict_label"/>
@ -36,7 +36,7 @@
from sys_dict_data from sys_dict_data
</sql> </sql>
<select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult"> <select id="selectDictDataList" parameterType="com.ruoyi.common.core.domain.entity.SysDictData" resultMap="SysDictDataResult">
<include refid="selectDictDataVo"/> <include refid="selectDictDataVo"/>
<where> <where>
<if test="dictType != null and dictType != ''"> <if test="dictType != null and dictType != ''">
@ -52,7 +52,7 @@
order by dict_sort asc order by dict_sort asc
</select> </select>
<select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult"> <select id="selectDictDataByType" parameterType="com.ruoyi.common.core.domain.entity.SysDictData" resultMap="SysDictDataResult">
<include refid="selectDictDataVo"/> <include refid="selectDictDataVo"/>
where status = '0' and dict_type = #{dictType} order by dict_sort asc where status = '0' and dict_type = #{dictType} order by dict_sort asc
</select> </select>
@ -88,7 +88,7 @@
</foreach> </foreach>
</delete> </delete>
<update id="updateDictData" parameterType="SysDictData"> <update id="updateDictData" parameterType="com.ruoyi.common.core.domain.entity.SysDictData">
update sys_dict_data update sys_dict_data
<set> <set>
<if test="dictSort != null">dict_sort = #{dictSort},</if> <if test="dictSort != null">dict_sort = #{dictSort},</if>
@ -112,7 +112,7 @@
where dict_type = #{oldDictType} where dict_type = #{oldDictType}
</update> </update>
<insert id="insertDictData" parameterType="SysDictData"> <insert id="insertDictData" parameterType="com.ruoyi.common.core.domain.entity.SysDictData">
insert into sys_dict_data( insert into sys_dict_data(
<if test="dictSort != null">dict_sort,</if> <if test="dictSort != null">dict_sort,</if>
<if test="dictLabel != null and dictLabel != ''">dict_label,</if> <if test="dictLabel != null and dictLabel != ''">dict_label,</if>

8
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDictTypeMapper"> <mapper namespace="com.ruoyi.system.mapper.SysDictTypeMapper">
<resultMap type="SysDictType" id="SysDictTypeResult"> <resultMap type="com.ruoyi.common.core.domain.entity.SysDictType" id="SysDictTypeResult">
<id property="dictId" column="dict_id"/> <id property="dictId" column="dict_id"/>
<result property="dictName" column="dict_name"/> <result property="dictName" column="dict_name"/>
<result property="dictType" column="dict_type"/> <result property="dictType" column="dict_type"/>
@ -20,7 +20,7 @@
from sys_dict_type from sys_dict_type
</sql> </sql>
<select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult"> <select id="selectDictTypeList" parameterType="com.ruoyi.common.core.domain.entity.SysDictType" resultMap="SysDictTypeResult">
<include refid="selectDictTypeVo"/> <include refid="selectDictTypeVo"/>
<where> <where>
<if test="dictName != null and dictName != ''"> <if test="dictName != null and dictName != ''">
@ -73,7 +73,7 @@
</foreach> </foreach>
</delete> </delete>
<update id="updateDictType" parameterType="SysDictType"> <update id="updateDictType" parameterType="com.ruoyi.common.core.domain.entity.SysDictType">
update sys_dict_type update sys_dict_type
<set> <set>
<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if> <if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
@ -86,7 +86,7 @@
where dict_id = #{dictId} where dict_id = #{dictId}
</update> </update>
<insert id="insertDictType" parameterType="SysDictType"> <insert id="insertDictType" parameterType="com.ruoyi.common.core.domain.entity.SysDictType">
insert into sys_dict_type( insert into sys_dict_type(
<if test="dictName != null and dictName != ''">dict_name,</if> <if test="dictName != null and dictName != ''">dict_name,</if>
<if test="dictType != null and dictType != ''">dict_type,</if> <if test="dictType != null and dictType != ''">dict_type,</if>

6
ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysLogininforMapper"> <mapper namespace="com.ruoyi.system.mapper.SysLogininforMapper">
<resultMap type="SysLogininfor" id="SysLogininforResult"> <resultMap type="com.ruoyi.system.domain.SysLogininfor" id="SysLogininforResult">
<id property="infoId" column="info_id"/> <id property="infoId" column="info_id"/>
<result property="userName" column="user_name"/> <result property="userName" column="user_name"/>
<result property="status" column="status"/> <result property="status" column="status"/>
@ -16,12 +16,12 @@
<result property="loginTime" column="login_time"/> <result property="loginTime" column="login_time"/>
</resultMap> </resultMap>
<insert id="insertLogininfor" parameterType="SysLogininfor"> <insert id="insertLogininfor" parameterType="com.ruoyi.system.domain.SysLogininfor">
insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time) insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate()) values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
</insert> </insert>
<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult"> <select id="selectLogininforList" parameterType="com.ruoyi.system.domain.SysLogininfor" resultMap="SysLogininforResult">
select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
<where> <where>
<if test="ipaddr != null and ipaddr != ''"> <if test="ipaddr != null and ipaddr != ''">

12
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysMenuMapper"> <mapper namespace="com.ruoyi.system.mapper.SysMenuMapper">
<resultMap type="SysMenu" id="SysMenuResult"> <resultMap type="com.ruoyi.common.core.domain.entity.SysMenu" id="SysMenuResult">
<id property="menuId" column="menu_id"/> <id property="menuId" column="menu_id"/>
<result property="menuName" column="menu_name"/> <result property="menuName" column="menu_name"/>
<result property="parentName" column="parent_name"/> <result property="parentName" column="parent_name"/>
@ -46,7 +46,7 @@
from sys_menu from sys_menu
</sql> </sql>
<select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult"> <select id="selectMenuList" parameterType="com.ruoyi.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">
<include refid="selectMenuVo"/> <include refid="selectMenuVo"/>
<where> <where>
<if test="menuName != null and menuName != ''"> <if test="menuName != null and menuName != ''">
@ -84,7 +84,7 @@
order by m.parent_id, m.order_num order by m.parent_id, m.order_num
</select> </select>
<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult"> <select id="selectMenuListByUserId" parameterType="com.ruoyi.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status,
ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m from sys_menu m
@ -181,12 +181,12 @@
where parent_id = #{menuId} where parent_id = #{menuId}
</select> </select>
<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult"> <select id="checkMenuNameUnique" parameterType="com.ruoyi.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">
<include refid="selectMenuVo"/> <include refid="selectMenuVo"/>
where menu_name=#{menuName} and parent_id = #{parentId} limit 1 where menu_name=#{menuName} and parent_id = #{parentId} limit 1
</select> </select>
<update id="updateMenu" parameterType="SysMenu"> <update id="updateMenu" parameterType="com.ruoyi.common.core.domain.entity.SysMenu">
update sys_menu update sys_menu
<set> <set>
<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if> <if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
@ -209,7 +209,7 @@
where menu_id = #{menuId} where menu_id = #{menuId}
</update> </update>
<insert id="insertMenu" parameterType="SysMenu"> <insert id="insertMenu" parameterType="com.ruoyi.common.core.domain.entity.SysMenu">
insert into sys_menu( insert into sys_menu(
<if test="menuId != null and menuId != 0">menu_id,</if> <if test="menuId != null and menuId != 0">menu_id,</if>
<if test="parentId != null and parentId != 0">parent_id,</if> <if test="parentId != null and parentId != 0">parent_id,</if>

8
ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysNoticeMapper"> <mapper namespace="com.ruoyi.system.mapper.SysNoticeMapper">
<resultMap type="SysNotice" id="SysNoticeResult"> <resultMap type="com.ruoyi.system.domain.SysNotice" id="SysNoticeResult">
<result property="noticeId" column="notice_id"/> <result property="noticeId" column="notice_id"/>
<result property="noticeTitle" column="notice_title"/> <result property="noticeTitle" column="notice_title"/>
<result property="noticeType" column="notice_type"/> <result property="noticeType" column="notice_type"/>
@ -36,7 +36,7 @@
where notice_id = #{noticeId} where notice_id = #{noticeId}
</select> </select>
<select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult"> <select id="selectNoticeList" parameterType="com.ruoyi.system.domain.SysNotice" resultMap="SysNoticeResult">
<include refid="selectNoticeVo"/> <include refid="selectNoticeVo"/>
<where> <where>
<if test="noticeTitle != null and noticeTitle != ''"> <if test="noticeTitle != null and noticeTitle != ''">
@ -51,7 +51,7 @@
</where> </where>
</select> </select>
<insert id="insertNotice" parameterType="SysNotice"> <insert id="insertNotice" parameterType="com.ruoyi.system.domain.SysNotice">
insert into sys_notice ( insert into sys_notice (
<if test="noticeTitle != null and noticeTitle != '' ">notice_title,</if> <if test="noticeTitle != null and noticeTitle != '' ">notice_title,</if>
<if test="noticeType != null and noticeType != '' ">notice_type,</if> <if test="noticeType != null and noticeType != '' ">notice_type,</if>
@ -71,7 +71,7 @@
) )
</insert> </insert>
<update id="updateNotice" parameterType="SysNotice"> <update id="updateNotice" parameterType="com.ruoyi.system.domain.SysNotice">
update sys_notice update sys_notice
<set> <set>
<if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle},</if> <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle},</if>

6
ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysOperLogMapper"> <mapper namespace="com.ruoyi.system.mapper.SysOperLogMapper">
<resultMap type="SysOperLog" id="SysOperLogResult"> <resultMap type="com.ruoyi.system.domain.SysOperLog" id="SysOperLogResult">
<id property="operId" column="oper_id"/> <id property="operId" column="oper_id"/>
<result property="title" column="title"/> <result property="title" column="title"/>
<result property="businessType" column="business_type"/> <result property="businessType" column="business_type"/>
@ -45,7 +45,7 @@
from sys_oper_log from sys_oper_log
</sql> </sql>
<insert id="insertOperlog" parameterType="SysOperLog"> <insert id="insertOperlog" parameterType="com.ruoyi.system.domain.SysOperLog">
insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name,
oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg,
cost_time, oper_time) cost_time, oper_time)
@ -54,7 +54,7 @@
#{costTime}, sysdate()) #{costTime}, sysdate())
</insert> </insert>
<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult"> <select id="selectOperLogList" parameterType="com.ruoyi.system.domain.SysOperLog" resultMap="SysOperLogResult">
<include refid="selectOperLogVo"/> <include refid="selectOperLogVo"/>
<where> <where>
<if test="operIp != null and operIp != ''"> <if test="operIp != null and operIp != ''">

8
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysPostMapper"> <mapper namespace="com.ruoyi.system.mapper.SysPostMapper">
<resultMap type="SysPost" id="SysPostResult"> <resultMap type="com.ruoyi.system.domain.SysPost" id="SysPostResult">
<id property="postId" column="post_id"/> <id property="postId" column="post_id"/>
<result property="postCode" column="post_code"/> <result property="postCode" column="post_code"/>
<result property="postName" column="post_name"/> <result property="postName" column="post_name"/>
@ -29,7 +29,7 @@
from sys_post from sys_post
</sql> </sql>
<select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult"> <select id="selectPostList" parameterType="com.ruoyi.system.domain.SysPost" resultMap="SysPostResult">
<include refid="selectPostVo"/> <include refid="selectPostVo"/>
<where> <where>
<if test="postCode != null and postCode != ''"> <if test="postCode != null and postCode != ''">
@ -79,7 +79,7 @@
where post_code=#{postCode} limit 1 where post_code=#{postCode} limit 1
</select> </select>
<update id="updatePost" parameterType="SysPost"> <update id="updatePost" parameterType="com.ruoyi.system.domain.SysPost">
update sys_post update sys_post
<set> <set>
<if test="postCode != null and postCode != ''">post_code = #{postCode},</if> <if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
@ -93,7 +93,7 @@
where post_id = #{postId} where post_id = #{postId}
</update> </update>
<insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId"> <insert id="insertPost" parameterType="com.ruoyi.system.domain.SysPost" useGeneratedKeys="true" keyProperty="postId">
insert into sys_post( insert into sys_post(
<if test="postId != null and postId != 0">post_id,</if> <if test="postId != null and postId != 0">post_id,</if>
<if test="postCode != null and postCode != ''">post_code,</if> <if test="postCode != null and postCode != ''">post_code,</if>

2
ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysRoleDeptMapper"> <mapper namespace="com.ruoyi.system.mapper.SysRoleDeptMapper">
<resultMap type="SysRoleDept" id="SysRoleDeptResult"> <resultMap type="com.ruoyi.system.domain.SysRoleDept" id="SysRoleDeptResult">
<result property="roleId" column="role_id"/> <result property="roleId" column="role_id"/>
<result property="deptId" column="dept_id"/> <result property="deptId" column="dept_id"/>
</resultMap> </resultMap>

8
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysRoleMapper"> <mapper namespace="com.ruoyi.system.mapper.SysRoleMapper">
<resultMap type="SysRole" id="SysRoleResult"> <resultMap type="com.ruoyi.common.core.domain.entity.SysRole" id="SysRoleResult">
<id property="roleId" column="role_id"/> <id property="roleId" column="role_id"/>
<result property="roleName" column="role_name"/> <result property="roleName" column="role_name"/>
<result property="roleKey" column="role_key"/> <result property="roleKey" column="role_key"/>
@ -39,7 +39,7 @@
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
</sql> </sql>
<select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult"> <select id="selectRoleList" parameterType="com.ruoyi.common.core.domain.entity.SysRole" resultMap="SysRoleResult">
<include refid="selectRoleVo"/> <include refid="selectRoleVo"/>
where r.del_flag = '0' where r.del_flag = '0'
<if test="roleId != null and roleId != 0"> <if test="roleId != null and roleId != 0">
@ -102,7 +102,7 @@
where r.role_key=#{roleKey} and r.del_flag = '0' limit 1 where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
</select> </select>
<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId"> <insert id="insertRole" parameterType="com.ruoyi.common.core.domain.entity.SysRole" useGeneratedKeys="true" keyProperty="roleId">
insert into sys_role( insert into sys_role(
<if test="roleId != null and roleId != 0">role_id,</if> <if test="roleId != null and roleId != 0">role_id,</if>
<if test="roleName != null and roleName != ''">role_name,</if> <if test="roleName != null and roleName != ''">role_name,</if>
@ -130,7 +130,7 @@
) )
</insert> </insert>
<update id="updateRole" parameterType="SysRole"> <update id="updateRole" parameterType="com.ruoyi.common.core.domain.entity.SysRole">
update sys_role update sys_role
<set> <set>
<if test="roleName != null and roleName != ''">role_name = #{roleName},</if> <if test="roleName != null and roleName != ''">role_name = #{roleName},</if>

2
ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysRoleMenuMapper"> <mapper namespace="com.ruoyi.system.mapper.SysRoleMenuMapper">
<resultMap type="SysRoleMenu" id="SysRoleMenuResult"> <resultMap type="com.ruoyi.system.domain.SysRoleMenu" id="SysRoleMenuResult">
<result property="roleId" column="role_id"/> <result property="roleId" column="role_id"/>
<result property="menuId" column="menu_id"/> <result property="menuId" column="menu_id"/>
</resultMap> </resultMap>

24
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserMapper"> <mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
<resultMap type="SysUser" id="SysUserResult"> <resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
<id property="userId" column="user_id"/> <id property="userId" column="user_id"/>
<result property="deptId" column="dept_id"/> <result property="deptId" column="dept_id"/>
<result property="userName" column="user_name"/> <result property="userName" column="user_name"/>
@ -23,11 +23,11 @@
<result property="updateBy" column="update_by"/> <result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/> <result property="remark" column="remark"/>
<association property="dept" javaType="SysDept" resultMap="deptResult"/> <association property="dept" javaType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/> <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
</resultMap> </resultMap>
<resultMap id="deptResult" type="SysDept"> <resultMap id="deptResult" type="com.ruoyi.common.core.domain.entity.SysDept">
<id property="deptId" column="dept_id"/> <id property="deptId" column="dept_id"/>
<result property="parentId" column="parent_id"/> <result property="parentId" column="parent_id"/>
<result property="deptName" column="dept_name"/> <result property="deptName" column="dept_name"/>
@ -37,7 +37,7 @@
<result property="status" column="dept_status"/> <result property="status" column="dept_status"/>
</resultMap> </resultMap>
<resultMap id="RoleResult" type="SysRole"> <resultMap id="RoleResult" type="com.ruoyi.common.core.domain.entity.SysRole">
<id property="roleId" column="role_id"/> <id property="roleId" column="role_id"/>
<result property="roleName" column="role_name"/> <result property="roleName" column="role_name"/>
<result property="roleKey" column="role_key"/> <result property="roleKey" column="role_key"/>
@ -82,7 +82,7 @@
left join sys_role r on r.role_id = ur.role_id left join sys_role r on r.role_id = ur.role_id
</sql> </sql>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult"> <select id="selectUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user
u u
@ -114,7 +114,7 @@
${params.dataScope} ${params.dataScope}
</select> </select>
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult"> <select id="selectAllocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u from sys_user u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
@ -131,7 +131,7 @@
${params.dataScope} ${params.dataScope}
</select> </select>
<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult"> <select id="selectUnallocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u from sys_user u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
@ -184,7 +184,7 @@
limit 1 limit 1
</select> </select>
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId"> <insert id="insertUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user( insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if> <if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if> <if test="deptId != null and deptId != 0">dept_id,</if>
@ -216,7 +216,7 @@
) )
</insert> </insert>
<update id="updateUser" parameterType="SysUser"> <update id="updateUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user update sys_user
<set> <set>
<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if> <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
@ -237,19 +237,19 @@
where user_id = #{userId} where user_id = #{userId}
</update> </update>
<update id="updateUserStatus" parameterType="SysUser"> <update id="updateUserStatus" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user update sys_user
set status = #{status} set status = #{status}
where user_id = #{userId} where user_id = #{userId}
</update> </update>
<update id="updateUserAvatar" parameterType="SysUser"> <update id="updateUserAvatar" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user update sys_user
set avatar = #{avatar} set avatar = #{avatar}
where user_name = #{userName} where user_name = #{userName}
</update> </update>
<update id="resetUserPwd" parameterType="SysUser"> <update id="resetUserPwd" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user update sys_user
set password = #{password} set password = #{password}
where user_name = #{userName} where user_name = #{userName}

2
ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserPostMapper"> <mapper namespace="com.ruoyi.system.mapper.SysUserPostMapper">
<resultMap type="SysUserPost" id="SysUserPostResult"> <resultMap type="com.ruoyi.system.domain.SysUserPost" id="SysUserPostResult">
<result property="userId" column="user_id"/> <result property="userId" column="user_id"/>
<result property="postId" column="post_id"/> <result property="postId" column="post_id"/>
</resultMap> </resultMap>

4
ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserRoleMapper"> <mapper namespace="com.ruoyi.system.mapper.SysUserRoleMapper">
<resultMap type="SysUserRole" id="SysUserRoleResult"> <resultMap type="com.ruoyi.system.domain.SysUserRole" id="SysUserRoleResult">
<result property="userId" column="user_id"/> <result property="userId" column="user_id"/>
<result property="roleId" column="role_id"/> <result property="roleId" column="role_id"/>
</resultMap> </resultMap>
@ -35,7 +35,7 @@
</foreach> </foreach>
</insert> </insert>
<delete id="deleteUserRoleInfo" parameterType="SysUserRole"> <delete id="deleteUserRoleInfo" parameterType="com.ruoyi.system.domain.SysUserRole">
delete delete
from sys_user_role from sys_user_role
where user_id = #{userId} where user_id = #{userId}