xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-18 01:06:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update 对相关代码改动 进行调整

Browse Source
This commit is contained in:
疯狂的狮子li 2021-06-18 15:31:38 +08:00
parent 46b67fef7a
commit 85ae3a9420
58 changed files with 621 additions and 689 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java
View File

@ -5,7 +5,7 @@ import com.ruoyi.demo.vo.TestDemoVo;
import com.ruoyi.demo.bo.TestDemoQueryBo; import com.ruoyi.demo.bo.TestDemoQueryBo;
import com.ruoyi.demo.bo.TestDemoAddBo; import com.ruoyi.demo.bo.TestDemoAddBo;
import com.ruoyi.demo.bo.TestDemoEditBo; import com.ruoyi.demo.bo.TestDemoEditBo;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import java.util.Collection; import java.util.Collection;

2
ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.demo.service; package com.ruoyi.demo.service;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.demo.bo.TestTreeAddBo; import com.ruoyi.demo.bo.TestTreeAddBo;
import com.ruoyi.demo.bo.TestTreeEditBo; import com.ruoyi.demo.bo.TestTreeEditBo;
import com.ruoyi.demo.bo.TestTreeQueryBo; import com.ruoyi.demo.bo.TestTreeQueryBo;

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

@ -1,6 +1,6 @@
package com.ruoyi.generator.mapper; package com.ruoyi.generator.mapper;
import com.ruoyi.common.core.page.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import com.ruoyi.generator.domain.GenTableColumn; import com.ruoyi.generator.domain.GenTableColumn;
import java.util.List; import java.util.List;

2
ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.generator.mapper; package com.ruoyi.generator.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.page.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import com.ruoyi.generator.domain.GenTable; import com.ruoyi.generator.domain.GenTable;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

4
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.generator.service; package com.ruoyi.generator.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.generator.domain.GenTableColumn; import com.ruoyi.generator.domain.GenTableColumn;
import com.ruoyi.generator.mapper.GenTableColumnMapper; import com.ruoyi.generator.mapper.GenTableColumnMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -15,7 +15,7 @@ import java.util.List;
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class GenTableColumnServiceImpl extends ServiceImpl<GenTableColumnMapper, GenTableColumn> implements IGenTableColumnService { public class GenTableColumnServiceImpl extends ServicePlusImpl<GenTableColumnMapper, GenTableColumn> implements IGenTableColumnService {
/** /**
* 查询业务字段列表 * 查询业务字段列表

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

@ -6,9 +6,9 @@ import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.GenConstants; import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.JsonUtils; import com.ruoyi.common.utils.JsonUtils;
@ -50,7 +50,7 @@ import java.util.zip.ZipOutputStream;
*/ */
@Slf4j @Slf4j
@Service @Service
public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> implements IGenTableService { public class GenTableServiceImpl extends ServicePlusImpl<GenTableMapper, GenTable> implements IGenTableService {
@Autowired @Autowired
private GenTableColumnMapper genTableColumnMapper; private GenTableColumnMapper genTableColumnMapper;

2
ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.generator.service; package com.ruoyi.generator.service;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.generator.domain.GenTableColumn; import com.ruoyi.generator.domain.GenTableColumn;
import java.util.List; import java.util.List;

2
ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.generator.service; package com.ruoyi.generator.service;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.generator.domain.GenTable; import com.ruoyi.generator.domain.GenTable;

4
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
View File

@ -1,8 +1,8 @@
package ${packageName}.mapper; package ${packageName}.mapper;
import ${packageName}.domain.${ClassName}; import ${packageName}.domain.${ClassName};
import com.ruoyi.common.core.page.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import com.ruoyi.common.core.mybatisplus.MybatisPlusRedisCache; import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
import org.apache.ibatis.annotations.CacheNamespace; import org.apache.ibatis.annotations.CacheNamespace;
/** /**

2
ruoyi-generator/src/main/resources/vm/java/service.java.vm
View File

@ -5,7 +5,7 @@ import ${packageName}.vo.${ClassName}Vo;
import ${packageName}.bo.${ClassName}QueryBo; import ${packageName}.bo.${ClassName}QueryBo;
import ${packageName}.bo.${ClassName}AddBo; import ${packageName}.bo.${ClassName}AddBo;
import ${packageName}.bo.${ClassName}EditBo; import ${packageName}.bo.${ClassName}EditBo;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
#if($table.crud || $table.sub) #if($table.crud || $table.sub)
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
#end #end

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

@ -8,7 +8,7 @@ import com.ruoyi.common.core.page.PagePlus;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
#end #end
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import ${packageName}.bo.${ClassName}AddBo; import ${packageName}.bo.${ClassName}AddBo;
@ -30,7 +30,7 @@ import java.util.Collection;
* @date ${datetime} * @date ${datetime}
*/ */
@Service @Service
public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service { public class ${ClassName}ServiceImpl extends ServicePlusImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service {
@Override @Override
public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){ public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){

26
ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java
View File

@ -1,13 +1,13 @@
package com.ruoyi.quartz.mapper; package com.ruoyi.quartz.mapper;
import com.ruoyi.common.core.page.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import com.ruoyi.quartz.domain.SysJobLog; import com.ruoyi.quartz.domain.SysJobLog;
/** /**
* 调度任务日志信息 数据层 * 调度任务日志信息 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysJobLogMapper extends BaseMapperPlus<SysJobLog> { public interface SysJobLogMapper extends BaseMapperPlus<SysJobLog> {
} }

26
ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
View File

@ -1,13 +1,13 @@
package com.ruoyi.quartz.mapper; package com.ruoyi.quartz.mapper;
import com.ruoyi.common.core.page.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import com.ruoyi.quartz.domain.SysJob; import com.ruoyi.quartz.domain.SysJob;
/** /**
* 调度任务信息 数据层 * 调度任务信息 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface SysJobMapper extends BaseMapperPlus<SysJob> { public interface SysJobMapper extends BaseMapperPlus<SysJob> {
} }

124
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java
View File

@ -1,62 +1,62 @@
package com.ruoyi.quartz.service; package com.ruoyi.quartz.service;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.quartz.domain.SysJobLog; import com.ruoyi.quartz.domain.SysJobLog;
import java.util.List; import java.util.List;
/** /**
* 定时任务调度日志信息信息 服务层 * 定时任务调度日志信息信息 服务层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface ISysJobLogService extends IServicePlus<SysJobLog> { public interface ISysJobLogService extends IServicePlus<SysJobLog> {
TableDataInfo<SysJobLog> selectPageJobLogList(SysJobLog jobLog); TableDataInfo<SysJobLog> selectPageJobLogList(SysJobLog jobLog);
/** /**
* 获取quartz调度器日志的计划任务 * 获取quartz调度器日志的计划任务
* *
* @param jobLog 调度日志信息 * @param jobLog 调度日志信息
* @return 调度任务日志集合 * @return 调度任务日志集合
*/ */
public List<SysJobLog> selectJobLogList(SysJobLog jobLog); public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
/** /**
* 通过调度任务日志ID查询调度信息 * 通过调度任务日志ID查询调度信息
* *
* @param jobLogId 调度任务日志ID * @param jobLogId 调度任务日志ID
* @return 调度任务日志对象信息 * @return 调度任务日志对象信息
*/ */
public SysJobLog selectJobLogById(Long jobLogId); public SysJobLog selectJobLogById(Long jobLogId);
/** /**
* 新增任务日志 * 新增任务日志
* *
* @param jobLog 调度日志信息 * @param jobLog 调度日志信息
*/ */
public void addJobLog(SysJobLog jobLog); public void addJobLog(SysJobLog jobLog);
/** /**
* 批量删除调度日志信息 * 批量删除调度日志信息
* *
* @param logIds 需要删除的日志ID * @param logIds 需要删除的日志ID
* @return 结果 * @return 结果
*/ */
public int deleteJobLogByIds(Long[] logIds); public int deleteJobLogByIds(Long[] logIds);
/** /**
* 删除任务日志 * 删除任务日志
* *
* @param jobId 调度日志ID * @param jobId 调度日志ID
* @return 结果 * @return 结果
*/ */
public int deleteJobLogById(Long jobId); public int deleteJobLogById(Long jobId);
/** /**
* 清空任务日志 * 清空任务日志
*/ */
public void cleanJobLog(); public void cleanJobLog();
} }

212
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java
View File

@ -1,106 +1,106 @@
package com.ruoyi.quartz.service; package com.ruoyi.quartz.service;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.job.TaskException; import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.quartz.domain.SysJob; import com.ruoyi.quartz.domain.SysJob;
import org.quartz.SchedulerException; import org.quartz.SchedulerException;
import java.util.List; import java.util.List;
/** /**
* 定时任务调度信息信息 服务层 * 定时任务调度信息信息 服务层
* *
* @author ruoyi * @author ruoyi
*/ */
public interface ISysJobService extends IServicePlus<SysJob> { public interface ISysJobService extends IServicePlus<SysJob> {
/** /**
* 获取quartz调度器的计划任务 * 获取quartz调度器的计划任务
* *
* @param job 调度信息 * @param job 调度信息
* @return 调度任务集合 * @return 调度任务集合
*/ */
public TableDataInfo<SysJob> selectPageJobList(SysJob job); public TableDataInfo<SysJob> selectPageJobList(SysJob job);
public List<SysJob> selectJobList(SysJob job); public List<SysJob> selectJobList(SysJob job);
/** /**
* 通过调度任务ID查询调度信息 * 通过调度任务ID查询调度信息
* *
* @param jobId 调度任务ID * @param jobId 调度任务ID
* @return 调度任务对象信息 * @return 调度任务对象信息
*/ */
public SysJob selectJobById(Long jobId); public SysJob selectJobById(Long jobId);
/** /**
* 暂停任务 * 暂停任务
* *
* @param job 调度信息 * @param job 调度信息
* @return 结果 * @return 结果
*/ */
public int pauseJob(SysJob job) throws SchedulerException; public int pauseJob(SysJob job) throws SchedulerException;
/** /**
* 恢复任务 * 恢复任务
* *
* @param job 调度信息 * @param job 调度信息
* @return 结果 * @return 结果
*/ */
public int resumeJob(SysJob job) throws SchedulerException; public int resumeJob(SysJob job) throws SchedulerException;
/** /**
* 删除任务后，所对应的trigger也将被删除 * 删除任务后，所对应的trigger也将被删除
* *
* @param job 调度信息 * @param job 调度信息
* @return 结果 * @return 结果
*/ */
public int deleteJob(SysJob job) throws SchedulerException; public int deleteJob(SysJob job) throws SchedulerException;
/** /**
* 批量删除调度信息 * 批量删除调度信息
* *
* @param jobIds 需要删除的任务ID * @param jobIds 需要删除的任务ID
* @return 结果 * @return 结果
*/ */
public void deleteJobByIds(Long[] jobIds) throws SchedulerException; public void deleteJobByIds(Long[] jobIds) throws SchedulerException;
/** /**
* 任务调度状态修改 * 任务调度状态修改
* *
* @param job 调度信息 * @param job 调度信息
* @return 结果 * @return 结果
*/ */
public int changeStatus(SysJob job) throws SchedulerException; public int changeStatus(SysJob job) throws SchedulerException;
/** /**
* 立即运行任务 * 立即运行任务
* *
* @param job 调度信息 * @param job 调度信息
* @return 结果 * @return 结果
*/ */
public void run(SysJob job) throws SchedulerException; public void run(SysJob job) throws SchedulerException;
/** /**
* 新增任务 * 新增任务
* *
* @param job 调度信息 * @param job 调度信息
* @return 结果 * @return 结果
*/ */
public int insertJob(SysJob job) throws SchedulerException, TaskException; public int insertJob(SysJob job) throws SchedulerException, TaskException;
/** /**
* 更新任务 * 更新任务
* *
* @param job 调度信息 * @param job 调度信息
* @return 结果 * @return 结果
*/ */
public int updateJob(SysJob job) throws SchedulerException, TaskException; public int updateJob(SysJob job) throws SchedulerException, TaskException;
/** /**
* 校验cron表达式是否有效 * 校验cron表达式是否有效
* *
* @param cronExpression 表达式 * @param cronExpression 表达式
* @return 结果 * @return 结果
*/ */
public boolean checkCronExpressionIsValid(String cronExpression); public boolean checkCronExpressionIsValid(String cronExpression);
} }

228
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java
View File

@ -1,114 +1,114 @@
package com.ruoyi.quartz.service.impl; package com.ruoyi.quartz.service.impl;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.quartz.domain.SysJobLog; import com.ruoyi.quartz.domain.SysJobLog;
import com.ruoyi.quartz.mapper.SysJobLogMapper; import com.ruoyi.quartz.mapper.SysJobLogMapper;
import com.ruoyi.quartz.service.ISysJobLogService; import com.ruoyi.quartz.service.ISysJobLogService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* 定时任务调度日志信息 服务层 * 定时任务调度日志信息 服务层
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysJobLogServiceImpl extends ServiceImpl<SysJobLogMapper, SysJobLog> implements ISysJobLogService { public class SysJobLogServiceImpl extends ServicePlusImpl<SysJobLogMapper, SysJobLog> implements ISysJobLogService {
@Override @Override
public TableDataInfo<SysJobLog> selectPageJobLogList(SysJobLog jobLog) { public TableDataInfo<SysJobLog> selectPageJobLogList(SysJobLog jobLog) {
Map<String, Object> params = jobLog.getParams(); Map<String, Object> params = jobLog.getParams();
LambdaQueryWrapper<SysJobLog> lqw = new LambdaQueryWrapper<SysJobLog>() LambdaQueryWrapper<SysJobLog> lqw = new LambdaQueryWrapper<SysJobLog>()
.like(StrUtil.isNotBlank(jobLog.getJobName()), SysJobLog::getJobName, jobLog.getJobName()) .like(StrUtil.isNotBlank(jobLog.getJobName()), SysJobLog::getJobName, jobLog.getJobName())
.eq(StrUtil.isNotBlank(jobLog.getJobGroup()), SysJobLog::getJobGroup, jobLog.getJobGroup()) .eq(StrUtil.isNotBlank(jobLog.getJobGroup()), SysJobLog::getJobGroup, jobLog.getJobGroup())
.eq(StrUtil.isNotBlank(jobLog.getStatus()), SysJobLog::getStatus, jobLog.getStatus()) .eq(StrUtil.isNotBlank(jobLog.getStatus()), SysJobLog::getStatus, jobLog.getStatus())
.like(StrUtil.isNotBlank(jobLog.getInvokeTarget()), SysJobLog::getInvokeTarget, jobLog.getInvokeTarget()) .like(StrUtil.isNotBlank(jobLog.getInvokeTarget()), SysJobLog::getInvokeTarget, jobLog.getInvokeTarget())
.apply(Validator.isNotEmpty(params.get("beginTime")), .apply(Validator.isNotEmpty(params.get("beginTime")),
"date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')", "date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
params.get("beginTime")) params.get("beginTime"))
.apply(Validator.isNotEmpty(params.get("endTime")), .apply(Validator.isNotEmpty(params.get("endTime")),
"date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')", "date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
params.get("endTime")); params.get("endTime"));
return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw)); return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw));
} }
/** /**
* 获取quartz调度器日志的计划任务 * 获取quartz调度器日志的计划任务
* *
* @param jobLog 调度日志信息 * @param jobLog 调度日志信息
* @return 调度任务日志集合 * @return 调度任务日志集合
*/ */
@Override @Override
public List<SysJobLog> selectJobLogList(SysJobLog jobLog) { public List<SysJobLog> selectJobLogList(SysJobLog jobLog) {
Map<String, Object> params = jobLog.getParams(); Map<String, Object> params = jobLog.getParams();
return list(new LambdaQueryWrapper<SysJobLog>() return list(new LambdaQueryWrapper<SysJobLog>()
.like(StrUtil.isNotBlank(jobLog.getJobName()), SysJobLog::getJobName, jobLog.getJobName()) .like(StrUtil.isNotBlank(jobLog.getJobName()), SysJobLog::getJobName, jobLog.getJobName())
.eq(StrUtil.isNotBlank(jobLog.getJobGroup()), SysJobLog::getJobGroup, jobLog.getJobGroup()) .eq(StrUtil.isNotBlank(jobLog.getJobGroup()), SysJobLog::getJobGroup, jobLog.getJobGroup())
.eq(StrUtil.isNotBlank(jobLog.getStatus()), SysJobLog::getStatus, jobLog.getStatus()) .eq(StrUtil.isNotBlank(jobLog.getStatus()), SysJobLog::getStatus, jobLog.getStatus())
.like(StrUtil.isNotBlank(jobLog.getInvokeTarget()), SysJobLog::getInvokeTarget, jobLog.getInvokeTarget()) .like(StrUtil.isNotBlank(jobLog.getInvokeTarget()), SysJobLog::getInvokeTarget, jobLog.getInvokeTarget())
.apply(Validator.isNotEmpty(params.get("beginTime")), .apply(Validator.isNotEmpty(params.get("beginTime")),
"date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')", "date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
params.get("beginTime")) params.get("beginTime"))
.apply(Validator.isNotEmpty(params.get("endTime")), .apply(Validator.isNotEmpty(params.get("endTime")),
"date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')", "date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
params.get("endTime"))); params.get("endTime")));
} }
/** /**
* 通过调度任务日志ID查询调度信息 * 通过调度任务日志ID查询调度信息
* *
* @param jobLogId 调度任务日志ID * @param jobLogId 调度任务日志ID
* @return 调度任务日志对象信息 * @return 调度任务日志对象信息
*/ */
@Override @Override
public SysJobLog selectJobLogById(Long jobLogId) { public SysJobLog selectJobLogById(Long jobLogId) {
return getById(jobLogId); return getById(jobLogId);
} }
/** /**
* 新增任务日志 * 新增任务日志
* *
* @param jobLog 调度日志信息 * @param jobLog 调度日志信息
*/ */
@Override @Override
public void addJobLog(SysJobLog jobLog) { public void addJobLog(SysJobLog jobLog) {
baseMapper.insert(jobLog); baseMapper.insert(jobLog);
} }
/** /**
* 批量删除调度日志信息 * 批量删除调度日志信息
* *
* @param logIds 需要删除的数据ID * @param logIds 需要删除的数据ID
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteJobLogByIds(Long[] logIds) { public int deleteJobLogByIds(Long[] logIds) {
return baseMapper.deleteBatchIds(Arrays.asList(logIds)); return baseMapper.deleteBatchIds(Arrays.asList(logIds));
} }
/** /**
* 删除任务日志 * 删除任务日志
* *
* @param jobId 调度日志ID * @param jobId 调度日志ID
*/ */
@Override @Override
public int deleteJobLogById(Long jobId) { public int deleteJobLogById(Long jobId) {
return baseMapper.deleteById(jobId); return baseMapper.deleteById(jobId);
} }
/** /**
* 清空任务日志 * 清空任务日志
*/ */
@Override @Override
public void cleanJobLog() { public void cleanJobLog() {
remove(new LambdaQueryWrapper<>()); remove(new LambdaQueryWrapper<>());
} }
} }

492
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
View File

@ -1,246 +1,246 @@
package com.ruoyi.quartz.service.impl; package com.ruoyi.quartz.service.impl;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.constant.ScheduleConstants;
import com.ruoyi.common.constant.ScheduleConstants; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.job.TaskException; import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.quartz.domain.SysJob; import com.ruoyi.quartz.domain.SysJob;
import com.ruoyi.quartz.mapper.SysJobMapper; import com.ruoyi.quartz.mapper.SysJobMapper;
import com.ruoyi.quartz.service.ISysJobService; import com.ruoyi.quartz.service.ISysJobService;
import com.ruoyi.quartz.util.CronUtils; import com.ruoyi.quartz.util.CronUtils;
import com.ruoyi.quartz.util.ScheduleUtils; import com.ruoyi.quartz.util.ScheduleUtils;
import org.quartz.JobDataMap; import org.quartz.JobDataMap;
import org.quartz.JobKey; import org.quartz.JobKey;
import org.quartz.Scheduler; import org.quartz.Scheduler;
import org.quartz.SchedulerException; import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.util.List; import java.util.List;
/** /**
* 定时任务调度信息 服务层 * 定时任务调度信息 服务层
* *
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysJobServiceImpl extends ServiceImpl<SysJobMapper, SysJob> implements ISysJobService { public class SysJobServiceImpl extends ServicePlusImpl<SysJobMapper, SysJob> implements ISysJobService {
@Autowired @Autowired
private Scheduler scheduler; private Scheduler scheduler;
/** /**
* 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据） * 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据）
*/ */
@PostConstruct @PostConstruct
public void init() throws SchedulerException, TaskException { public void init() throws SchedulerException, TaskException {
scheduler.clear(); scheduler.clear();
List<SysJob> jobList = list(); List<SysJob> jobList = list();
for (SysJob job : jobList) { for (SysJob job : jobList) {
ScheduleUtils.createScheduleJob(scheduler, job); ScheduleUtils.createScheduleJob(scheduler, job);
} }
} }
@Override @Override
public TableDataInfo<SysJob> selectPageJobList(SysJob job) { public TableDataInfo<SysJob> selectPageJobList(SysJob job) {
LambdaQueryWrapper<SysJob> lqw = new LambdaQueryWrapper<SysJob>() LambdaQueryWrapper<SysJob> lqw = new LambdaQueryWrapper<SysJob>()
.like(StrUtil.isNotBlank(job.getJobName()), SysJob::getJobName, job.getJobName()) .like(StrUtil.isNotBlank(job.getJobName()), SysJob::getJobName, job.getJobName())
.eq(StrUtil.isNotBlank(job.getJobGroup()), SysJob::getJobGroup, job.getJobGroup()) .eq(StrUtil.isNotBlank(job.getJobGroup()), SysJob::getJobGroup, job.getJobGroup())
.eq(StrUtil.isNotBlank(job.getStatus()), SysJob::getStatus, job.getStatus()) .eq(StrUtil.isNotBlank(job.getStatus()), SysJob::getStatus, job.getStatus())
.like(StrUtil.isNotBlank(job.getInvokeTarget()), SysJob::getInvokeTarget, job.getInvokeTarget()); .like(StrUtil.isNotBlank(job.getInvokeTarget()), SysJob::getInvokeTarget, job.getInvokeTarget());
return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw)); return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw));
} }
/** /**
* 获取quartz调度器的计划任务列表 * 获取quartz调度器的计划任务列表
* *
* @param job 调度信息 * @param job 调度信息
* @return * @return
*/ */
@Override @Override
public List<SysJob> selectJobList(SysJob job) { public List<SysJob> selectJobList(SysJob job) {
return list(new LambdaQueryWrapper<SysJob>() return list(new LambdaQueryWrapper<SysJob>()
.like(StrUtil.isNotBlank(job.getJobName()), SysJob::getJobName, job.getJobName()) .like(StrUtil.isNotBlank(job.getJobName()), SysJob::getJobName, job.getJobName())
.eq(StrUtil.isNotBlank(job.getJobGroup()), SysJob::getJobGroup, job.getJobGroup()) .eq(StrUtil.isNotBlank(job.getJobGroup()), SysJob::getJobGroup, job.getJobGroup())
.eq(StrUtil.isNotBlank(job.getStatus()), SysJob::getStatus, job.getStatus()) .eq(StrUtil.isNotBlank(job.getStatus()), SysJob::getStatus, job.getStatus())
.like(StrUtil.isNotBlank(job.getInvokeTarget()), SysJob::getInvokeTarget, job.getInvokeTarget())); .like(StrUtil.isNotBlank(job.getInvokeTarget()), SysJob::getInvokeTarget, job.getInvokeTarget()));
} }
/** /**
* 通过调度任务ID查询调度信息 * 通过调度任务ID查询调度信息
* *
* @param jobId 调度任务ID * @param jobId 调度任务ID
* @return 调度任务对象信息 * @return 调度任务对象信息
*/ */
@Override @Override
public SysJob selectJobById(Long jobId) { public SysJob selectJobById(Long jobId) {
return getById(jobId); return getById(jobId);
} }
/** /**
* 暂停任务 * 暂停任务
* *
* @param job 调度信息 * @param job 调度信息
*/ */
@Override @Override
@Transactional @Transactional
public int pauseJob(SysJob job) throws SchedulerException { public int pauseJob(SysJob job) throws SchedulerException {
Long jobId = job.getJobId(); Long jobId = job.getJobId();
String jobGroup = job.getJobGroup(); String jobGroup = job.getJobGroup();
job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
int rows = baseMapper.updateById(job); int rows = baseMapper.updateById(job);
if (rows > 0) { if (rows > 0) {
scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
} }
return rows; return rows;
} }
/** /**
* 恢复任务 * 恢复任务
* *
* @param job 调度信息 * @param job 调度信息
*/ */
@Override @Override
@Transactional @Transactional
public int resumeJob(SysJob job) throws SchedulerException { public int resumeJob(SysJob job) throws SchedulerException {
Long jobId = job.getJobId(); Long jobId = job.getJobId();
String jobGroup = job.getJobGroup(); String jobGroup = job.getJobGroup();
job.setStatus(ScheduleConstants.Status.NORMAL.getValue()); job.setStatus(ScheduleConstants.Status.NORMAL.getValue());
int rows = baseMapper.updateById(job); int rows = baseMapper.updateById(job);
if (rows > 0) { if (rows > 0) {
scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup)); scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup));
} }
return rows; return rows;
} }
/** /**
* 删除任务后，所对应的trigger也将被删除 * 删除任务后，所对应的trigger也将被删除
* *
* @param job 调度信息 * @param job 调度信息
*/ */
@Override @Override
@Transactional @Transactional
public int deleteJob(SysJob job) throws SchedulerException { public int deleteJob(SysJob job) throws SchedulerException {
Long jobId = job.getJobId(); Long jobId = job.getJobId();
String jobGroup = job.getJobGroup(); String jobGroup = job.getJobGroup();
int rows = baseMapper.deleteById(jobId); int rows = baseMapper.deleteById(jobId);
if (rows > 0) { if (rows > 0) {
scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup)); scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup));
} }
return rows; return rows;
} }
/** /**
* 批量删除调度信息 * 批量删除调度信息
* *
* @param jobIds 需要删除的任务ID * @param jobIds 需要删除的任务ID
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public void deleteJobByIds(Long[] jobIds) throws SchedulerException { public void deleteJobByIds(Long[] jobIds) throws SchedulerException {
for (Long jobId : jobIds) { for (Long jobId : jobIds) {
SysJob job = getById(jobId); SysJob job = getById(jobId);
deleteJob(job); deleteJob(job);
} }
} }
/** /**
* 任务调度状态修改 * 任务调度状态修改
* *
* @param job 调度信息 * @param job 调度信息
*/ */
@Override @Override
@Transactional @Transactional
public int changeStatus(SysJob job) throws SchedulerException { public int changeStatus(SysJob job) throws SchedulerException {
int rows = 0; int rows = 0;
String status = job.getStatus(); String status = job.getStatus();
if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) { if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) {
rows = resumeJob(job); rows = resumeJob(job);
} else if (ScheduleConstants.Status.PAUSE.getValue().equals(status)) { } else if (ScheduleConstants.Status.PAUSE.getValue().equals(status)) {
rows = pauseJob(job); rows = pauseJob(job);
} }
return rows; return rows;
} }
/** /**
* 立即运行任务 * 立即运行任务
* *
* @param job 调度信息 * @param job 调度信息
*/ */
@Override @Override
@Transactional @Transactional
public void run(SysJob job) throws SchedulerException { public void run(SysJob job) throws SchedulerException {
Long jobId = job.getJobId(); Long jobId = job.getJobId();
String jobGroup = job.getJobGroup(); String jobGroup = job.getJobGroup();
SysJob properties = selectJobById(job.getJobId()); SysJob properties = selectJobById(job.getJobId());
// 参数 // 参数
JobDataMap dataMap = new JobDataMap(); JobDataMap dataMap = new JobDataMap();
dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties); dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties);
scheduler.triggerJob(ScheduleUtils.getJobKey(jobId, jobGroup), dataMap); scheduler.triggerJob(ScheduleUtils.getJobKey(jobId, jobGroup), dataMap);
} }
/** /**
* 新增任务 * 新增任务
* *
* @param job 调度信息 调度信息 * @param job 调度信息 调度信息
*/ */
@Override @Override
@Transactional @Transactional
public int insertJob(SysJob job) throws SchedulerException, TaskException { public int insertJob(SysJob job) throws SchedulerException, TaskException {
job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
int rows = baseMapper.insert(job); int rows = baseMapper.insert(job);
if (rows > 0) { if (rows > 0) {
ScheduleUtils.createScheduleJob(scheduler, job); ScheduleUtils.createScheduleJob(scheduler, job);
} }
return rows; return rows;
} }
/** /**
* 更新任务的时间表达式 * 更新任务的时间表达式
* *
* @param job 调度信息 * @param job 调度信息
*/ */
@Override @Override
@Transactional @Transactional
public int updateJob(SysJob job) throws SchedulerException, TaskException { public int updateJob(SysJob job) throws SchedulerException, TaskException {
SysJob properties = selectJobById(job.getJobId()); SysJob properties = selectJobById(job.getJobId());
int rows = baseMapper.updateById(job); int rows = baseMapper.updateById(job);
if (rows > 0) { if (rows > 0) {
updateSchedulerJob(job, properties.getJobGroup()); updateSchedulerJob(job, properties.getJobGroup());
} }
return rows; return rows;
} }
/** /**
* 更新任务 * 更新任务
* *
* @param job 任务对象 * @param job 任务对象
* @param jobGroup 任务组名 * @param jobGroup 任务组名
*/ */
public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException { public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException {
Long jobId = job.getJobId(); Long jobId = job.getJobId();
// 判断是否存在 // 判断是否存在
JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup); JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup);
if (scheduler.checkExists(jobKey)) { if (scheduler.checkExists(jobKey)) {
// 防止创建时存在数据问题 先移除，然后在执行创建操作 // 防止创建时存在数据问题 先移除，然后在执行创建操作
scheduler.deleteJob(jobKey); scheduler.deleteJob(jobKey);
} }
ScheduleUtils.createScheduleJob(scheduler, job); ScheduleUtils.createScheduleJob(scheduler, job);
} }
/** /**
* 校验cron表达式是否有效 * 校验cron表达式是否有效
* *
* @param cronExpression 表达式 * @param cronExpression 表达式
* @return 结果 * @return 结果
*/ */
@Override @Override
public boolean checkCronExpressionIsValid(String cronExpression) { public boolean checkCronExpressionIsValid(String cronExpression) {
return CronUtils.isValid(cronExpression); return CronUtils.isValid(cronExpression);
} }
} }

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

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

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.page.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;

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

@ -2,7 +2,7 @@ package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import java.util.List; import java.util.List;

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

@ -1,7 +1,7 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import com.ruoyi.common.core.domain.entity.SysDictType; import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.page.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
/** /**
* 字典表 数据层 * 字典表 数据层

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

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

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

@ -1,7 +1,7 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.page.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;

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

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

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

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

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

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

12
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
View File

@ -1,10 +1,8 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import com.ruoyi.common.core.page.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import com.ruoyi.system.domain.SysRoleDept; import com.ruoyi.system.domain.SysRoleDept;
import java.util.List;
/** /**
* 角色与部门关联表 数据层 * 角色与部门关联表 数据层
* *
@ -12,12 +10,4 @@ import java.util.List;
*/ */
public interface SysRoleDeptMapper extends BaseMapperPlus<SysRoleDept> { public interface SysRoleDeptMapper extends BaseMapperPlus<SysRoleDept> {
/**
* 批量新增角色部门信息
*
* @param roleDeptList 角色部门列表
* @return 结果
*/
public int batchRoleDept(List<SysRoleDept> roleDeptList);
} }

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.page.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;

12
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
View File

@ -1,10 +1,8 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import com.ruoyi.common.core.page.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import com.ruoyi.system.domain.SysRoleMenu; import com.ruoyi.system.domain.SysRoleMenu;
import java.util.List;
/** /**
* 角色与菜单关联表 数据层 * 角色与菜单关联表 数据层
* *
@ -12,12 +10,4 @@ import java.util.List;
*/ */
public interface SysRoleMenuMapper extends BaseMapperPlus<SysRoleMenu> { public interface SysRoleMenuMapper extends BaseMapperPlus<SysRoleMenu> {
/**
* 批量新增角色菜单信息
*
* @param roleMenuList 角色菜单列表
* @return 结果
*/
public int batchRoleMenu(List<SysRoleMenu> roleMenuList);
} }

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;

12
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
View File

@ -1,10 +1,8 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import com.ruoyi.common.core.page.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import com.ruoyi.system.domain.SysUserPost; import com.ruoyi.system.domain.SysUserPost;
import java.util.List;
/** /**
* 用户与岗位关联表 数据层 * 用户与岗位关联表 数据层
* *
@ -12,12 +10,4 @@ import java.util.List;
*/ */
public interface SysUserPostMapper extends BaseMapperPlus<SysUserPost> { public interface SysUserPostMapper extends BaseMapperPlus<SysUserPost> {
/**
* 批量新增用户岗位信息
*
* @param userPostList 用户角色列表
* @return 结果
*/
public int batchUserPost(List<SysUserPost> userPostList);
} }

12
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
View File

@ -1,10 +1,8 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import com.ruoyi.common.core.page.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.domain.SysUserRole;
import java.util.List;
/** /**
* 用户与角色关联表 数据层 * 用户与角色关联表 数据层
* *
@ -12,12 +10,4 @@ import java.util.List;
*/ */
public interface SysUserRoleMapper extends BaseMapperPlus<SysUserRole> { public interface SysUserRoleMapper extends BaseMapperPlus<SysUserRole> {
/**
* 批量新增用户角色信息
*
* @param userRoleList 用户角色列表
* @return 结果
*/
public int batchUserRole(List<SysUserRole> userRoleList);
} }

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.domain.SysConfig;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import java.util.List; import java.util.List;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import java.util.List; import java.util.List;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysDictType; import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import java.util.List; import java.util.List;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.SysLogininfor; import com.ruoyi.system.domain.SysLogininfor;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.system.domain.vo.RouterVo; import com.ruoyi.system.domain.vo.RouterVo;
import java.util.List; import java.util.List;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.domain.SysNotice;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.domain.SysOperLog;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysPost;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import java.util.List; import java.util.List;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.IServicePlus; import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import java.util.List; import java.util.List;

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

@ -4,10 +4,10 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.annotation.DataSource;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.enums.DataSourceType;
@ -31,7 +31,7 @@ import java.util.Map;
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements ISysConfigService { public class SysConfigServiceImpl extends ServicePlusImpl<SysConfigMapper, SysConfig> implements ISysConfigService {
@Autowired @Autowired
private RedisCache redisCache; private RedisCache redisCache;

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View File

@ -4,13 +4,13 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.system.mapper.SysDeptMapper; import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.mapper.SysRoleMapper; import com.ruoyi.system.mapper.SysRoleMapper;
@ -30,7 +30,7 @@ import java.util.stream.Collectors;
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> implements ISysDeptService { public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept> implements ISysDeptService {
@Autowired @Autowired
private SysRoleMapper roleMapper; private SysRoleMapper roleMapper;

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

@ -2,8 +2,8 @@ package com.ruoyi.system.service.impl;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.DictUtils; import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.PageUtils;
@ -20,7 +20,7 @@ import java.util.List;
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDictData> implements ISysDictDataService { public class SysDictDataServiceImpl extends ServicePlusImpl<SysDictDataMapper, SysDictData> implements ISysDictDataService {
@Override @Override
public TableDataInfo<SysDictData> selectPageDictDataList(SysDictData dictData) { public TableDataInfo<SysDictData> selectPageDictDataList(SysDictData dictData) {

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

@ -5,10 +5,10 @@ import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysDictType; import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.DictUtils; import com.ruoyi.common.utils.DictUtils;
@ -31,7 +31,7 @@ import java.util.Map;
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService { public class SysDictTypeServiceImpl extends ServicePlusImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService {
@Autowired @Autowired
private SysDictDataMapper dictDataMapper; private SysDictDataMapper dictDataMapper;

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

@ -3,7 +3,7 @@ package com.ruoyi.system.service.impl;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.domain.SysLogininfor; import com.ruoyi.system.domain.SysLogininfor;
@ -22,7 +22,7 @@ import java.util.Map;
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, SysLogininfor> implements ISysLogininforService { public class SysLogininforServiceImpl extends ServicePlusImpl<SysLogininforMapper, SysLogininfor> implements ISysLogininforService {
@Override @Override
public TableDataInfo<SysLogininfor> selectPageLogininforList(SysLogininfor logininfor) { public TableDataInfo<SysLogininfor> selectPageLogininforList(SysLogininfor logininfor) {

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
View File

@ -3,12 +3,12 @@ package com.ruoyi.system.service.impl;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.domain.SysRoleMenu; import com.ruoyi.system.domain.SysRoleMenu;
import com.ruoyi.system.domain.vo.MetaVo; import com.ruoyi.system.domain.vo.MetaVo;
@ -29,7 +29,7 @@ import java.util.stream.Collectors;
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements ISysMenuService { public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu> implements ISysMenuService {
public static final String PREMISSION_STRING = "perms[\"{0}\"]"; public static final String PREMISSION_STRING = "perms[\"{0}\"]";
@Autowired @Autowired

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

@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.domain.SysNotice;
@ -19,7 +19,7 @@ import java.util.List;
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService { public class SysNoticeServiceImpl extends ServicePlusImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService {
@Override @Override
public TableDataInfo<SysNotice> selectPageNoticeList(SysNotice notice) { public TableDataInfo<SysNotice> selectPageNoticeList(SysNotice notice) {

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

@ -4,7 +4,7 @@ import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.domain.SysOperLog;
@ -23,7 +23,7 @@ import java.util.Map;
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOperLog> implements ISysOperLogService { public class SysOperLogServiceImpl extends ServicePlusImpl<SysOperLogMapper, SysOperLog> implements ISysOperLogService {
@Override @Override
public TableDataInfo<SysOperLog> selectPageOperLogList(SysOperLog operLog) { public TableDataInfo<SysOperLog> selectPageOperLogList(SysOperLog operLog) {

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
View File

@ -3,8 +3,8 @@ package com.ruoyi.system.service.impl;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.PageUtils;
@ -25,7 +25,7 @@ import java.util.List;
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPost> implements ISysPostService { public class SysPostServiceImpl extends ServicePlusImpl<SysPostMapper, SysPost> implements ISysPostService {
@Autowired @Autowired
private SysUserPostMapper userPostMapper; private SysUserPostMapper userPostMapper;

8
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
View File

@ -2,10 +2,10 @@ package com.ruoyi.system.service.impl;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.PageUtils;
@ -30,7 +30,7 @@ import java.util.*;
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService { public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole> implements ISysRoleService {
@Autowired @Autowired
private SysRoleMenuMapper roleMenuMapper; private SysRoleMenuMapper roleMenuMapper;
@ -240,7 +240,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
list.add(rm); list.add(rm);
} }
if (list.size() > 0) { if (list.size() > 0) {
rows = roleMenuMapper.batchRoleMenu(list); rows = roleMenuMapper.insertAll(list);
} }
return rows; return rows;
} }
@ -261,7 +261,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
list.add(rd); list.add(rd);
} }
if (list.size() > 0) { if (list.size() > 0) {
rows = roleDeptMapper.batchRoleDept(list); rows = roleDeptMapper.insertAll(list);
} }
return rows; return rows;
} }

8
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@ -3,11 +3,11 @@ package com.ruoyi.system.service.impl;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.PageUtils;
@ -34,7 +34,7 @@ import java.util.List;
*/ */
@Slf4j @Slf4j
@Service @Service
public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService { public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser> implements ISysUserService {
@Autowired @Autowired
private SysRoleMapper roleMapper; private SysRoleMapper roleMapper;
@ -311,7 +311,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
list.add(ur); list.add(ur);
} }
if (list.size() > 0) { if (list.size() > 0) {
userRoleMapper.batchUserRole(list); userRoleMapper.insertAll(list);
} }
} }
} }
@ -333,7 +333,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
list.add(up); list.add(up);
} }
if (list.size() > 0) { if (list.size() > 0) {
userPostMapper.batchUserPost(list); userPostMapper.insertAll(list);
} }
} }
} }

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

@ -9,11 +9,4 @@
<result property="deptId" column="dept_id"/> <result property="deptId" column="dept_id"/>
</resultMap> </resultMap>
<insert id="batchRoleDept">
insert into sys_role_dept(role_id, dept_id) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.roleId},#{item.deptId})
</foreach>
</insert>
</mapper> </mapper>

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

@ -9,11 +9,4 @@
<result property="menuId" column="menu_id"/> <result property="menuId" column="menu_id"/>
</resultMap> </resultMap>
<insert id="batchRoleMenu">
insert into sys_role_menu(role_id, menu_id) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.roleId},#{item.menuId})
</foreach>
</insert>
</mapper> </mapper>

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

@ -9,11 +9,4 @@
<result property="postId" column="post_id"/> <result property="postId" column="post_id"/>
</resultMap> </resultMap>
<insert id="batchUserPost">
insert into sys_user_post(user_id, post_id) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.userId},#{item.postId})
</foreach>
</insert>
</mapper> </mapper>

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

@ -9,11 +9,4 @@
<result property="roleId" column="role_id"/> <result property="roleId" column="role_id"/>
</resultMap> </resultMap>
<insert id="batchUserRole">
insert into sys_user_role(user_id, role_id) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.userId},#{item.roleId})
</foreach>
</insert>
</mapper> </mapper>