public/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-03-10 00:31:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

正式发布 v2.0.0

Browse Source
This commit is contained in:
疯狂的狮子li
2021-05-14 21:39:30 +08:00
parent b608002e89
commit 687d746b1b
82 changed files with 1221 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ruoyi/src/main/java/com/ruoyi/common/core/controller/BaseController.java
View File

@@ -1,16 +1,8 @@
package com.ruoyi.common.core.controller;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpStatus;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.sql.SqlUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.WebDataBinder;
@@ -18,7 +10,6 @@ import org.springframework.web.bind.annotation.InitBinder;
import java.beans.PropertyEditorSupport;
import java.util.Date;
import java.util.List;
/**
* web层通用数据处理
@@ -46,35 +37,6 @@ public class BaseController
});
}
/**
* 设置请求分页数据
*/
protected void startPage()
{
PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
if (Validator.isNotNull(pageNum) && Validator.isNotNull(pageSize))
{
String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
PageHelper.startPage(pageNum, pageSize, orderBy);
}
}
/**
* 响应请求分页数据
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
protected <T> TableDataInfo<T> getDataTable(List<T> list)
{
TableDataInfo<T> rspData = new TableDataInfo();
rspData.setCode(HttpStatus.HTTP_OK);
rspData.setMsg("查询成功");
rspData.setRows(list);
rspData.setTotal(new PageInfo(list).getTotal());
return rspData;
}
/**
* 响应返回结果
*

12
ruoyi/src/main/java/com/ruoyi/common/core/page/BaseMapperPlus.java Normal file
View File

@@ -0,0 +1,12 @@
package com.ruoyi.common.core.page;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 自定义 Mapper 接口, 实现 自定义扩展
*
* @author Lion Li
* @since 2021-05-13
*/
public interface BaseMapperPlus<T> extends BaseMapper<T> {
}

126
ruoyi/src/main/java/com/ruoyi/common/core/page/IServicePlus.java Normal file
View File

@@ -0,0 +1,126 @@
package com.ruoyi.common.core.page;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 自定义 Service 接口, 实现 数据库实体与 vo 对象转换返回
*
* @author Lion Li
* @since 2021-05-13
*/
public interface IServicePlus<T> extends IService<T> {
/**
* 根据 ID 查询
*
* @param kClass vo类型
* @param id 主键ID
*/
default <K> K getVoById(Serializable id, Class<K> kClass) {
T t = getBaseMapper().selectById(id);
return BeanUtil.toBean(t, kClass);
}
/**
* 查询（根据ID 批量查询）
*
* @param kClass vo类型
* @param idList 主键ID列表
*/
default <K> List<K> listVoByIds(Collection<? extends Serializable> idList, Class<K> kClass) {
List<T> list = getBaseMapper().selectBatchIds(idList);
if (list == null) {
return null;
}
return list.stream()
.map(any -> BeanUtil.toBean(any, kClass))
.collect(Collectors.toList());
}
/**
* 查询（根据 columnMap 条件）
*
* @param kClass vo类型
* @param columnMap 表字段 map 对象
*/
default <K> List<K> listVoByMap(Map<String, Object> columnMap, Class<K> kClass) {
List<T> list = getBaseMapper().selectByMap(columnMap);
if (list == null) {
return null;
}
return list.stream()
.map(any -> BeanUtil.toBean(any, kClass))
.collect(Collectors.toList());
}
/**
* 根据 Wrapper，查询一条记录 <br/>
* <p>结果集，如果是多个会抛出异常，随机取一条加上限制条件 wrapper.last("LIMIT 1")</p>
*
* @param kClass vo类型
* @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
*/
default <K> K getVoOne(Wrapper<T> queryWrapper, Class<K> kClass) {
return BeanUtil.toBean(getOne(queryWrapper, true), kClass);
}
/**
* 查询列表
*
* @param kClass vo类型
* @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
*/
default <K> List<K> listVo(Wrapper<T> queryWrapper, Class<K> kClass) {
List<T> list = getBaseMapper().selectList(queryWrapper);
if (list == null) {
return null;
}
return list.stream()
.map(any -> BeanUtil.toBean(any, kClass))
.collect(Collectors.toList());
}
/**
* 查询所有
*
* @param kClass vo类型
* @see Wrappers#emptyWrapper()
*/
default <K> List<K> listVo(Class<K> kClass) {
return listVo(Wrappers.emptyWrapper(), kClass);
}
/**
* 翻页查询
*
* @param page 翻页对象
* @param queryWrapper 实体对象封装操作类
* @param kClass vo类型
*/
default <K> PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, Class<K> kClass) {
PagePlus<T, K> e = getBaseMapper().selectPage(page, queryWrapper);
page.recordsToVo(kClass);
return page;
}
/**
* 无条件翻页查询
*
* @param page 翻页对象
* @param kClass vo类型
*/
default <K> PagePlus<T, K> pageVo(PagePlus<T, K> page, Class<K> kClass) {
return pageVo(page, Wrappers.emptyWrapper(), kClass);
}
}

128
ruoyi/src/main/java/com/ruoyi/common/core/page/PagePlus.java Normal file
View File

@@ -0,0 +1,128 @@
package com.ruoyi.common.core.page;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@Data
@Accessors(chain = true)
public class PagePlus<T,K> implements IPage<T> {
protected List<T> records;
protected List<K> recordsVo;
protected long total;
protected long size;
protected long current;
protected List<OrderItem> orders;
protected boolean optimizeCountSql;
protected boolean isSearchCount;
protected boolean hitCount;
protected String countId;
protected Long maxLimit;
public PagePlus() {
this.records = Collections.emptyList();
this.recordsVo = Collections.emptyList();
this.total = 0L;
this.size = 10L;
this.current = 1L;
this.orders = new ArrayList();
this.optimizeCountSql = true;
this.isSearchCount = true;
this.hitCount = false;
}
public PagePlus(long current, long size) {
this(current, size, 0L);
}
public PagePlus(long current, long size, long total) {
this(current, size, total, true);
}
public PagePlus(long current, long size, boolean isSearchCount) {
this(current, size, 0L, isSearchCount);
}
public PagePlus(long current, long size, long total, boolean isSearchCount) {
this.records = Collections.emptyList();
this.total = 0L;
this.size = 10L;
this.current = 1L;
this.orders = new ArrayList();
this.optimizeCountSql = true;
this.isSearchCount = true;
this.hitCount = false;
if (current > 1L) {
this.current = current;
}
this.size = size;
this.total = total;
this.isSearchCount = isSearchCount;
}
public boolean hasPrevious() {
return this.current > 1L;
}
public boolean hasNext() {
return this.current < this.getPages();
}
public void recordsToVo(Class<K> kClass) {
this.recordsVo = this.records.stream()
.map(any -> BeanUtil.toBean(any, kClass))
.collect(Collectors.toList());
}
@Override
public String countId() {
return this.getCountId();
}
@Override
public Long maxLimit() {
return this.getMaxLimit();
}
public PagePlus<T, K> addOrder(OrderItem... items) {
this.orders.addAll(Arrays.asList(items));
return this;
}
public PagePlus<T, K> addOrder(List<OrderItem> items) {
this.orders.addAll(items);
return this;
}
@Override
public List<OrderItem> orders() {
return this.getOrders();
}
@Override
public boolean optimizeCountSql() {
return this.optimizeCountSql;
}
@Override
public boolean isSearchCount() {
return this.total < 0L ? false : this.isSearchCount;
}
public PagePlus<T, K> setSearchCount(boolean isSearchCount) {
this.isSearchCount = isSearchCount;
return this;
}
}

5
ruoyi/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
View File

@@ -1,6 +1,7 @@
package com.ruoyi.common.core.page;
import lombok.*;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
@@ -37,7 +38,7 @@ public class TableDataInfo<T> implements Serializable
* @param list 列表数据
* @param total 总记录数
*/
public TableDataInfo(List<T> list, int total)
public TableDataInfo(List<T> list, long total)
{
this.rows = list;
this.total = total;

101
ruoyi/src/main/java/com/ruoyi/common/utils/PageUtils.java Normal file
View File

@@ -0,0 +1,101 @@
package com.ruoyi.common.utils;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpStatus;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.page.PagePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.sql.SqlUtil;
import java.util.List;
/**
* 分页工具
*
* @author Lion Li
*/
public class PageUtils {
/**
* 当前记录起始索引
*/
public static final String PAGE_NUM = "pageNum";
/**
* 每页显示记录数
*/
public static final String PAGE_SIZE = "pageSize";
/**
* 排序列
*/
public static final String ORDER_BY_COLUMN = "orderByColumn";
/**
* 排序的方向 "desc" 或者 "asc".
*/
public static final String IS_ASC = "isAsc";
public static <T, K> PagePlus<T, K> buildPagePlus() {
Integer pageNum = ServletUtils.getParameterToInt(PAGE_NUM);
Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE);
String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN);
String isAsc = ServletUtils.getParameter(IS_ASC);
PagePlus<T, K> page = new PagePlus<>(pageNum, pageSize);
if (StrUtil.isNotBlank(orderByColumn)) {
String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
if ("asc".equals(isAsc)) {
page.addOrder(OrderItem.asc(orderBy));
} else if ("desc".equals(isAsc)) {
page.addOrder(OrderItem.desc(orderBy));
}
}
return page;
}
public static <T> Page<T> buildPage() {
Integer pageNum = ServletUtils.getParameterToInt(PAGE_NUM);
Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE);
String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN);
String isAsc = ServletUtils.getParameter(IS_ASC);
Page<T> page = new Page<>(pageNum, pageSize);
if (StrUtil.isNotBlank(orderByColumn)) {
String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
if ("asc".equals(isAsc)) {
page.addOrder(OrderItem.asc(orderBy));
} else if ("desc".equals(isAsc)) {
page.addOrder(OrderItem.desc(orderBy));
}
}
return page;
}
public static <T, K> TableDataInfo<K> buildDataInfo(PagePlus<T, K> page) {
TableDataInfo<K> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK);
rspData.setMsg("查询成功");
rspData.setRows(page.getRecordsVo());
rspData.setTotal(page.getTotal());
return rspData;
}
public static <T> TableDataInfo<T> buildDataInfo(Page<T> page) {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK);
rspData.setMsg("查询成功");
rspData.setRows(page.getRecords());
rspData.setTotal(page.getTotal());
return rspData;
}
public static <T> TableDataInfo<T> buildDataInfo(List<T> list) {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK);
rspData.setMsg("查询成功");
rspData.setRows(list);
rspData.setTotal(list.size());
return rspData;
}
}

38
ruoyi/src/main/java/com/ruoyi/generator/controller/GenController.java
View File

@@ -1,32 +1,26 @@
package com.ruoyi.generator.controller;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import cn.hutool.core.convert.Convert;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import cn.hutool.core.convert.Convert;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
import com.ruoyi.generator.service.IGenTableColumnService;
import com.ruoyi.generator.service.IGenTableService;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 代码生成 操作处理
@@ -50,9 +44,7 @@ public class GenController extends BaseController
@GetMapping("/list")
public TableDataInfo genList(GenTable genTable)
{
startPage();
List<GenTable> list = genTableService.selectGenTableList(genTable);
return getDataTable(list);
return genTableService.selectPageGenTableList(genTable);
}
/**
@@ -79,9 +71,7 @@ public class GenController extends BaseController
@GetMapping("/db/list")
public TableDataInfo dataList(GenTable genTable)
{
startPage();
List<GenTable> list = genTableService.selectDbTableList(genTable);
return getDataTable(list);
return genTableService.selectPageDbTableList(genTable);
}
/**

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

@@ -1,6 +1,6 @@
package com.ruoyi.generator.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.generator.domain.GenTableColumn;
import java.util.List;
@@ -10,7 +10,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface GenTableColumnMapper extends BaseMapper<GenTableColumn> {
public interface GenTableColumnMapper extends BaseMapperPlus<GenTableColumn> {
/**
* 根据表名称查询列信息
*

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

@@ -1,7 +1,9 @@
package com.ruoyi.generator.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.generator.domain.GenTable;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -10,7 +12,13 @@ import java.util.List;
*
* @author ruoyi
*/
public interface GenTableMapper extends BaseMapper<GenTable> {
public interface GenTableMapper extends BaseMapperPlus<GenTable> {
Page<GenTable> selectPageGenTableList(@Param("page") Page<GenTable> page, @Param("genTable") GenTable genTable);
Page<GenTable> selectPageDbTableList(@Param("page") Page<GenTable> page, @Param("genTable") GenTable genTable);
/**
* 查询业务列表
*

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

@@ -10,7 +10,9 @@ 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.GenConstants;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.generator.domain.GenTable;
@@ -66,6 +68,16 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
return genTable;
}
@Override
public TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable) {
return PageUtils.buildDataInfo(baseMapper.selectPageGenTableList(PageUtils.buildPage(), genTable));
}
@Override
public TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable) {
return PageUtils.buildDataInfo(baseMapper.selectPageDbTableList(PageUtils.buildPage(), genTable));
}
/**
* 查询业务列表
*

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

@@ -1,6 +1,6 @@
package com.ruoyi.generator.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.page.IServicePlus;
import com.ruoyi.generator.domain.GenTableColumn;
import java.util.List;
@@ -10,7 +10,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface IGenTableColumnService extends IService<GenTableColumn> {
public interface IGenTableColumnService extends IServicePlus<GenTableColumn> {
/**
* 查询业务字段列表
*

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

@@ -1,6 +1,7 @@
package com.ruoyi.generator.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.page.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.generator.domain.GenTable;
import java.util.List;
@@ -11,7 +12,14 @@ import java.util.Map;
*
* @author ruoyi
*/
public interface IGenTableService extends IService<GenTable> {
public interface IGenTableService extends IServicePlus<GenTable> {
TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable);
TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable);
/**
* 查询业务列表
*

50
ruoyi/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
View File

@@ -1,57 +1,13 @@
package com.ruoyi.quartz.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.quartz.SchedulerFactoryBean;
import javax.sql.DataSource;
import java.util.Properties;
/**
* 定时任务配置
*
* @author ruoyi
*
* @author Lion Li
*/
@Configuration
public class ScheduleConfig
{
@Bean
public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource)
{
SchedulerFactoryBean factory = new SchedulerFactoryBean();
factory.setDataSource(dataSource);
public class ScheduleConfig {
// quartz参数
Properties prop = new Properties();
prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler");
prop.put("org.quartz.scheduler.instanceId", "AUTO");
// 线程池配置
prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool");
prop.put("org.quartz.threadPool.threadCount", "20");
prop.put("org.quartz.threadPool.threadPriority", "5");
// JobStore配置
prop.put("org.quartz.jobStore.class", "org.quartz.impl.jdbcjobstore.JobStoreTX");
// 集群配置
prop.put("org.quartz.jobStore.isClustered", "true");
prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000");
prop.put("org.quartz.jobStore.maxMisfiresToHandleAtATime", "1");
prop.put("org.quartz.jobStore.txIsolationLevelSerializable", "true");
// sqlserver 启用
// prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?");
prop.put("org.quartz.jobStore.misfireThreshold", "12000");
prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
factory.setQuartzProperties(prop);
factory.setSchedulerName("RuoyiScheduler");
// 延时启动
factory.setStartupDelay(1);
factory.setApplicationContextSchedulerContextKey("applicationContextKey");
// 可选，QuartzScheduler
// 启动时更新己存在的Job，这样就不用每次修改targetObject后删除qrtz_job_details表对应记录了
factory.setOverwriteExistingJobs(true);
// 设置自动启动，默认为true
factory.setAutoStartup(true);
return factory;
}
}

22
ruoyi/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
View File

@@ -1,17 +1,5 @@
package com.ruoyi.quartz.controller;
import java.util.List;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -23,6 +11,12 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.quartz.domain.SysJob;
import com.ruoyi.quartz.service.ISysJobService;
import com.ruoyi.quartz.util.CronUtils;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 调度任务信息操作处理
@@ -43,9 +37,7 @@ public class SysJobController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysJob sysJob)
{
startPage();
List<SysJob> list = jobService.selectJobList(sysJob);
return getDataTable(list);
return jobService.selectPageJobList(sysJob);
}
/**

17
ruoyi/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
View File

@@ -1,13 +1,5 @@
package com.ruoyi.quartz.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -16,6 +8,11 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.quartz.domain.SysJobLog;
import com.ruoyi.quartz.service.ISysJobLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 调度日志操作处理
@@ -36,9 +33,7 @@ public class SysJobLogController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysJobLog sysJobLog)
{
startPage();
List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
return getDataTable(list);
return jobLogService.selectPageJobLogList(sysJobLog);
}
/**

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

@@ -1,6 +1,6 @@
package com.ruoyi.quartz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.quartz.domain.SysJobLog;
/**
@@ -8,6 +8,6 @@ import com.ruoyi.quartz.domain.SysJobLog;
*
* @author ruoyi
*/
public interface SysJobLogMapper extends BaseMapper<SysJobLog> {
public interface SysJobLogMapper extends BaseMapperPlus<SysJobLog> {
}

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

@@ -1,6 +1,6 @@
package com.ruoyi.quartz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.quartz.domain.SysJob;
/**
@@ -8,6 +8,6 @@ import com.ruoyi.quartz.domain.SysJob;
*
* @author ruoyi
*/
public interface SysJobMapper extends BaseMapper<SysJob> {
public interface SysJobMapper extends BaseMapperPlus<SysJob> {
}

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

@@ -1,6 +1,7 @@
package com.ruoyi.quartz.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.page.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.quartz.domain.SysJobLog;
import java.util.List;
@@ -10,7 +11,11 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysJobLogService extends IService<SysJobLog> {
public interface ISysJobLogService extends IServicePlus<SysJobLog> {
TableDataInfo<SysJobLog> selectPageJobLogList(SysJobLog jobLog);
/**
* 获取quartz调度器日志的计划任务
*

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

@@ -1,6 +1,7 @@
package com.ruoyi.quartz.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.page.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.quartz.domain.SysJob;
import org.quartz.SchedulerException;
@@ -12,13 +13,15 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysJobService extends IService<SysJob> {
public interface ISysJobService extends IServicePlus<SysJob> {
/**
* 获取quartz调度器的计划任务
*
* @param job 调度信息
* @return 调度任务集合
*/
public TableDataInfo<SysJob> selectPageJobList(SysJob job);
public List<SysJob> selectJobList(SysJob job);
/**

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

@@ -4,6 +4,8 @@ import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.quartz.domain.SysJobLog;
import com.ruoyi.quartz.mapper.SysJobLogMapper;
import com.ruoyi.quartz.service.ISysJobLogService;
@@ -21,6 +23,23 @@ import java.util.Map;
@Service
public class SysJobLogServiceImpl extends ServiceImpl<SysJobLogMapper, SysJobLog> implements ISysJobLogService {
@Override
public TableDataInfo<SysJobLog> selectPageJobLogList(SysJobLog jobLog) {
Map<String, Object> params = jobLog.getParams();
LambdaQueryWrapper<SysJobLog> lqw = new LambdaQueryWrapper<SysJobLog>()
.like(StrUtil.isNotBlank(jobLog.getJobName()), SysJobLog::getJobName, jobLog.getJobName())
.eq(StrUtil.isNotBlank(jobLog.getJobGroup()), SysJobLog::getJobGroup, jobLog.getJobGroup())
.eq(StrUtil.isNotBlank(jobLog.getStatus()), SysJobLog::getStatus, jobLog.getStatus())
.like(StrUtil.isNotBlank(jobLog.getInvokeTarget()), SysJobLog::getInvokeTarget, jobLog.getInvokeTarget())
.apply(Validator.isNotEmpty(params.get("beginTime")),
"date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
params.get("beginTime"))
.apply(Validator.isNotEmpty(params.get("endTime")),
"date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
params.get("endTime"));
return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw));
}
/**
* 获取quartz调度器日志的计划任务
*

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

@@ -4,7 +4,9 @@ import cn.hutool.core.util.StrUtil;
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.core.page.TableDataInfo;
import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.quartz.domain.SysJob;
import com.ruoyi.quartz.mapper.SysJobMapper;
import com.ruoyi.quartz.service.ISysJobService;
@@ -43,6 +45,16 @@ public class SysJobServiceImpl extends ServiceImpl<SysJobMapper, SysJob> impleme
}
}
@Override
public TableDataInfo<SysJob> selectPageJobList(SysJob job) {
LambdaQueryWrapper<SysJob> lqw = new LambdaQueryWrapper<SysJob>()
.like(StrUtil.isNotBlank(job.getJobName()), SysJob::getJobName, job.getJobName())
.eq(StrUtil.isNotBlank(job.getJobGroup()), SysJob::getJobGroup, job.getJobGroup())
.eq(StrUtil.isNotBlank(job.getStatus()), SysJob::getStatus, job.getStatus())
.like(StrUtil.isNotBlank(job.getInvokeTarget()), SysJob::getInvokeTarget, job.getInvokeTarget());
return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw));
}
/**
* 获取quartz调度器的计划任务列表
*

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

@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysConfig;
/**
@@ -8,6 +8,6 @@ import com.ruoyi.system.domain.SysConfig;
*
* @author ruoyi
*/
public interface SysConfigMapper extends BaseMapper<SysConfig> {
public interface SysConfigMapper extends BaseMapperPlus<SysConfig> {
}

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

@@ -1,7 +1,7 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.page.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -11,7 +11,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface SysDeptMapper extends BaseMapper<SysDept> {
public interface SysDeptMapper extends BaseMapperPlus<SysDept> {
/**
* 查询部门管理数据

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

@@ -1,13 +1,13 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.BaseMapperPlus;
/**
* 字典表 数据层
*
* @author ruoyi
*/
public interface SysDictDataMapper extends BaseMapper<SysDictData> {
public interface SysDictDataMapper extends BaseMapperPlus<SysDictData> {
}

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

@@ -1,13 +1,13 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.page.BaseMapperPlus;
/**
* 字典表 数据层
*
* @author ruoyi
*/
public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
public interface SysDictTypeMapper extends BaseMapperPlus<SysDictType> {
}

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

@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysLogininfor;
/**
@@ -8,6 +8,6 @@ import com.ruoyi.system.domain.SysLogininfor;
*
* @author ruoyi
*/
public interface SysLogininforMapper extends BaseMapper<SysLogininfor> {
public interface SysLogininforMapper extends BaseMapperPlus<SysLogininfor> {
}

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

@@ -1,7 +1,7 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.page.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -11,7 +11,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface SysMenuMapper extends BaseMapper<SysMenu> {
public interface SysMenuMapper extends BaseMapperPlus<SysMenu> {
/**
* 根据用户所有权限

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

@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysNotice;
/**
@@ -8,6 +8,6 @@ import com.ruoyi.system.domain.SysNotice;
*
* @author ruoyi
*/
public interface SysNoticeMapper extends BaseMapper<SysNotice> {
public interface SysNoticeMapper extends BaseMapperPlus<SysNotice> {
}

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

@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysOperLog;
/**
@@ -8,6 +8,6 @@ import com.ruoyi.system.domain.SysOperLog;
*
* @author ruoyi
*/
public interface SysOperLogMapper extends BaseMapper<SysOperLog> {
public interface SysOperLogMapper extends BaseMapperPlus<SysOperLog> {
}

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

@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysPost;
import java.util.List;
@@ -10,7 +10,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface SysPostMapper extends BaseMapper<SysPost> {
public interface SysPostMapper extends BaseMapperPlus<SysPost> {
/**
* 根据用户ID获取岗位选择框列表

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

@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysRoleDept;
/**
@@ -8,6 +8,6 @@ import com.ruoyi.system.domain.SysRoleDept;
*
* @author ruoyi
*/
public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept> {
public interface SysRoleDeptMapper extends BaseMapperPlus<SysRoleDept> {
}

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

@@ -1,7 +1,9 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.page.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -10,7 +12,9 @@ import java.util.List;
*
* @author ruoyi
*/
public interface SysRoleMapper extends BaseMapper<SysRole> {
public interface SysRoleMapper extends BaseMapperPlus<SysRole> {
Page<SysRole> selectPageRoleList(@Param("page") Page<SysRole> page, @Param("role") SysRole role);
/**
* 根据条件分页查询角色数据

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

@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysRoleMenu;
/**
@@ -8,6 +8,6 @@ import com.ruoyi.system.domain.SysRoleMenu;
*
* @author ruoyi
*/
public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
public interface SysRoleMenuMapper extends BaseMapperPlus<SysRoleMenu> {
}

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

@@ -1,7 +1,9 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -10,7 +12,10 @@ import java.util.List;
*
* @author ruoyi
*/
public interface SysUserMapper extends BaseMapper<SysUser> {
public interface SysUserMapper extends BaseMapperPlus<SysUser> {
Page<SysUser> selectPageUserList(@Param("page") Page<SysUser> page, @Param("user") SysUser user);
/**
* 根据条件分页查询用户列表
*

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

@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysUserPost;
/**
@@ -8,6 +8,6 @@ import com.ruoyi.system.domain.SysUserPost;
*
* @author ruoyi
*/
public interface SysUserPostMapper extends BaseMapper<SysUserPost> {
public interface SysUserPostMapper extends BaseMapperPlus<SysUserPost> {
}

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

@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysUserRole;
/**
@@ -8,6 +8,6 @@ import com.ruoyi.system.domain.SysUserRole;
*
* @author ruoyi
*/
public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
public interface SysUserRoleMapper extends BaseMapperPlus<SysUserRole> {
}

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

@@ -1,6 +1,7 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.page.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.SysConfig;
import java.util.List;
@@ -10,7 +11,11 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysConfigService extends IService<SysConfig> {
public interface ISysConfigService extends IServicePlus<SysConfig> {
TableDataInfo<SysConfig> selectPageConfigList(SysConfig config);
/**
* 查询参数配置信息
*

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

@@ -1,8 +1,8 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.page.IServicePlus;
import java.util.List;
@@ -11,7 +11,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysDeptService extends IService<SysDept> {
public interface ISysDeptService extends IServicePlus<SysDept> {
/**
* 查询部门管理数据
*

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

@@ -1,7 +1,8 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import java.util.List;
@@ -10,7 +11,11 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysDictDataService extends IService<SysDictData> {
public interface ISysDictDataService extends IServicePlus<SysDictData> {
TableDataInfo<SysDictData> selectPageDictDataList(SysDictData dictData);
/**
* 根据条件分页查询字典数据
*

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

@@ -1,8 +1,9 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.page.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import java.util.List;
@@ -11,7 +12,11 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysDictTypeService extends IService<SysDictType> {
public interface ISysDictTypeService extends IServicePlus<SysDictType> {
TableDataInfo<SysDictType> selectPageDictTypeList(SysDictType dictType);
/**
* 根据条件分页查询字典类型
*

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

@@ -1,6 +1,7 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.page.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.SysLogininfor;
import java.util.List;
@@ -10,7 +11,11 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysLogininforService extends IService<SysLogininfor> {
public interface ISysLogininforService extends IServicePlus<SysLogininfor> {
TableDataInfo<SysLogininfor> selectPageLogininforList(SysLogininfor logininfor);
/**
* 新增系统登录日志
*

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

@@ -1,8 +1,8 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.page.IServicePlus;
import com.ruoyi.system.domain.vo.RouterVo;
import java.util.List;
@@ -13,7 +13,7 @@ import java.util.Set;
*
* @author ruoyi
*/
public interface ISysMenuService extends IService<SysMenu> {
public interface ISysMenuService extends IServicePlus<SysMenu> {
/**
* 根据用户查询系统菜单列表
*

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

@@ -1,6 +1,7 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.page.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.SysNotice;
import java.util.List;
@@ -10,7 +11,11 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysNoticeService extends IService<SysNotice> {
public interface ISysNoticeService extends IServicePlus<SysNotice> {
TableDataInfo<SysNotice> selectPageNoticeList(SysNotice notice);
/**
* 查询公告信息
*

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

@@ -1,6 +1,7 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.page.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.SysOperLog;
import java.util.List;
@@ -10,7 +11,10 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysOperLogService extends IService<SysOperLog> {
public interface ISysOperLogService extends IServicePlus<SysOperLog> {
TableDataInfo<SysOperLog> selectPageOperLogList(SysOperLog operLog);
/**
* 新增操作日志
*

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

@@ -1,6 +1,7 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.page.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.SysPost;
import java.util.List;
@@ -10,7 +11,11 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysPostService extends IService<SysPost> {
public interface ISysPostService extends IServicePlus<SysPost> {
TableDataInfo<SysPost> selectPagePostList(SysPost post);
/**
* 查询岗位信息集合
*

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

@@ -1,7 +1,8 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.page.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import java.util.List;
import java.util.Set;
@@ -11,7 +12,11 @@ import java.util.Set;
*
* @author ruoyi
*/
public interface ISysRoleService extends IService<SysRole> {
public interface ISysRoleService extends IServicePlus<SysRole> {
TableDataInfo<SysRole> selectPageRoleList(SysRole role);
/**
* 根据条件分页查询角色数据
*

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

@@ -1,7 +1,8 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import java.util.List;
@@ -10,7 +11,11 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysUserService extends IService<SysUser> {
public interface ISysUserService extends IServicePlus<SysUser> {
TableDataInfo<SysUser> selectPageUserList(SysUser user);
/**
* 根据条件分页查询用户列表
*

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

@@ -8,9 +8,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataSource;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.DataSourceType;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.service.ISysConfigService;
@@ -45,6 +47,22 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
}
}
@Override
public TableDataInfo<SysConfig> selectPageConfigList(SysConfig config) {
Map<String, Object> params = config.getParams();
LambdaQueryWrapper<SysConfig> lqw = new LambdaQueryWrapper<SysConfig>()
.like(StrUtil.isNotBlank(config.getConfigName()), SysConfig::getConfigName, config.getConfigName())
.eq(StrUtil.isNotBlank(config.getConfigType()), SysConfig::getConfigType, config.getConfigType())
.like(StrUtil.isNotBlank(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey())
.apply(Validator.isNotEmpty(params.get("beginTime")),
"date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
params.get("beginTime"))
.apply(Validator.isNotEmpty(params.get("endTime")),
"date_format(create_time,'%y%m%d') <= date_format(#{0},'%y%m%d')",
params.get("endTime"));
return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw));
}
/**
* 查询参数配置信息
*
@@ -86,17 +104,17 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
*/
@Override
public List<SysConfig> selectConfigList(SysConfig config) {
LambdaQueryWrapper<SysConfig> lqw = new LambdaQueryWrapper<>();
lqw.like(StrUtil.isNotBlank(config.getConfigName()), SysConfig::getConfigName, config.getConfigName());
lqw.eq(StrUtil.isNotBlank(config.getConfigType()), SysConfig::getConfigType, config.getConfigType());
lqw.like(StrUtil.isNotBlank(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey());
Map<String, Object> params = config.getParams();
lqw.apply(Validator.isNotEmpty(params.get("beginTime")),
"date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
params.get("beginTime"));
lqw.apply(Validator.isNotEmpty(params.get("endTime")),
"date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
params.get("endTime"));
LambdaQueryWrapper<SysConfig> lqw = new LambdaQueryWrapper<SysConfig>()
.like(StrUtil.isNotBlank(config.getConfigName()), SysConfig::getConfigName, config.getConfigName())
.eq(StrUtil.isNotBlank(config.getConfigType()), SysConfig::getConfigType, config.getConfigType())
.like(StrUtil.isNotBlank(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey())
.apply(Validator.isNotEmpty(params.get("beginTime")),
"date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
params.get("beginTime"))
.apply(Validator.isNotEmpty(params.get("endTime")),
"date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
params.get("endTime"));
return baseMapper.selectList(lqw);
}

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

@@ -4,7 +4,9 @@ import cn.hutool.core.util.StrUtil;
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.page.TableDataInfo;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.service.ISysDictDataService;
import org.springframework.stereotype.Service;
@@ -20,6 +22,16 @@ import java.util.List;
@Service
public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDictData> implements ISysDictDataService {
@Override
public TableDataInfo<SysDictData> selectPageDictDataList(SysDictData dictData) {
LambdaQueryWrapper<SysDictData> lqw = new LambdaQueryWrapper<SysDictData>()
.eq(StrUtil.isNotBlank(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType())
.like(StrUtil.isNotBlank(dictData.getDictLabel()), SysDictData::getDictLabel, dictData.getDictLabel())
.eq(StrUtil.isNotBlank(dictData.getStatus()), SysDictData::getStatus, dictData.getStatus())
.orderByAsc(SysDictData::getDictSort);
return PageUtils.buildDataInfo(page(PageUtils.buildPage(),lqw));
}
/**
* 根据条件分页查询字典数据
*
@@ -28,7 +40,8 @@ public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDi
*/
@Override
public List<SysDictData> selectDictDataList(SysDictData dictData) {
return list(new LambdaQueryWrapper<SysDictData>().eq(StrUtil.isNotBlank(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType())
return list(new LambdaQueryWrapper<SysDictData>()
.eq(StrUtil.isNotBlank(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType())
.like(StrUtil.isNotBlank(dictData.getDictLabel()), SysDictData::getDictLabel, dictData.getDictLabel())
.eq(StrUtil.isNotBlank(dictData.getStatus()), SysDictData::getStatus, dictData.getStatus())
.orderByAsc(SysDictData::getDictSort));

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

@@ -9,8 +9,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.mapper.SysDictTypeMapper;
import com.ruoyi.system.service.ISysDictTypeService;
@@ -50,6 +52,22 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
}
}
@Override
public TableDataInfo<SysDictType> selectPageDictTypeList(SysDictType dictType) {
Map<String, Object> params = dictType.getParams();
LambdaQueryWrapper<SysDictType> lqw = new LambdaQueryWrapper<SysDictType>()
.like(StrUtil.isNotBlank(dictType.getDictName()), SysDictType::getDictName, dictType.getDictName())
.eq(StrUtil.isNotBlank(dictType.getStatus()), SysDictType::getStatus, dictType.getStatus())
.like(StrUtil.isNotBlank(dictType.getDictType()), SysDictType::getDictType, dictType.getDictType())
.apply(Validator.isNotEmpty(params.get("beginTime")),
"date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
params.get("beginTime"))
.apply(Validator.isNotEmpty(params.get("endTime")),
"date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
params.get("endTime"));
return PageUtils.buildDataInfo(page(PageUtils.buildPage(),lqw));
}
/**
* 根据条件分页查询字典类型
*

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

@@ -4,6 +4,8 @@ import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.mapper.SysLogininforMapper;
import com.ruoyi.system.service.ISysLogininforService;
@@ -22,6 +24,23 @@ import java.util.Map;
@Service
public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, SysLogininfor> implements ISysLogininforService {
@Override
public TableDataInfo<SysLogininfor> selectPageLogininforList(SysLogininfor logininfor) {
Map<String, Object> params = logininfor.getParams();
LambdaQueryWrapper<SysLogininfor> lqw = new LambdaQueryWrapper<SysLogininfor>()
.like(StrUtil.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr())
.eq(StrUtil.isNotBlank(logininfor.getStatus()), SysLogininfor::getStatus, logininfor.getStatus())
.like(StrUtil.isNotBlank(logininfor.getUserName()), SysLogininfor::getUserName, logininfor.getUserName())
.apply(Validator.isNotEmpty(params.get("beginTime")),
"date_format(login_time,'%y%m%d') >= date_format({0},'%y%m%d')",
params.get("beginTime"))
.apply(Validator.isNotEmpty(params.get("endTime")),
"date_format(login_time,'%y%m%d') <= date_format({0},'%y%m%d')",
params.get("endTime"))
.orderByDesc(SysLogininfor::getInfoId);
return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw));
}
/**
* 新增系统登录日志
*

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

@@ -3,6 +3,8 @@ package com.ruoyi.system.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.domain.SysNotice;
import com.ruoyi.system.mapper.SysNoticeMapper;
import com.ruoyi.system.service.ISysNoticeService;
@@ -19,6 +21,15 @@ import java.util.List;
@Service
public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService {
@Override
public TableDataInfo<SysNotice> selectPageNoticeList(SysNotice notice) {
LambdaQueryWrapper<SysNotice> lqw = new LambdaQueryWrapper<SysNotice>()
.like(StrUtil.isNotBlank(notice.getNoticeTitle()), SysNotice::getNoticeTitle, notice.getNoticeTitle())
.eq(StrUtil.isNotBlank(notice.getNoticeType()), SysNotice::getNoticeType, notice.getNoticeType())
.like(StrUtil.isNotBlank(notice.getCreateBy()), SysNotice::getCreateBy, notice.getCreateBy());
return PageUtils.buildDataInfo(page(PageUtils.buildPage(),lqw));
}
/**
* 查询公告信息
*

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

@@ -5,6 +5,8 @@ import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.mapper.SysOperLogMapper;
import com.ruoyi.system.service.ISysOperLogService;
@@ -23,6 +25,31 @@ import java.util.Map;
@Service
public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOperLog> implements ISysOperLogService {
@Override
public TableDataInfo<SysOperLog> selectPageOperLogList(SysOperLog operLog) {
Map<String, Object> params = operLog.getParams();
LambdaQueryWrapper<SysOperLog> lqw = new LambdaQueryWrapper<SysOperLog>()
.like(StrUtil.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle())
.eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
SysOperLog::getBusinessType, operLog.getBusinessType())
.func(f -> {
if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())) {
f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes()));
}
})
.eq(operLog.getStatus() != null && operLog.getStatus() > 0,
SysOperLog::getStatus, operLog.getStatus())
.like(StrUtil.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName())
.apply(Validator.isNotEmpty(params.get("beginTime")),
"date_format(oper_time,'%y%m%d') >= date_format({0},'%y%m%d')",
params.get("beginTime"))
.apply(Validator.isNotEmpty(params.get("endTime")),
"date_format(oper_time,'%y%m%d') <= date_format({0},'%y%m%d')",
params.get("endTime"))
.orderByDesc(SysOperLog::getOperId);
return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw));
}
/**
* 新增操作日志
*

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

@@ -5,7 +5,9 @@ import cn.hutool.core.util.StrUtil;
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.core.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.mapper.SysPostMapper;
@@ -28,6 +30,15 @@ public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPost> impl
@Autowired
private SysUserPostMapper userPostMapper;
@Override
public TableDataInfo<SysPost> selectPagePostList(SysPost post) {
LambdaQueryWrapper<SysPost> lqw = new LambdaQueryWrapper<SysPost>()
.like(StrUtil.isNotBlank(post.getPostCode()), SysPost::getPostCode, post.getPostCode())
.eq(StrUtil.isNotBlank(post.getStatus()), SysPost::getStatus, post.getStatus())
.like(StrUtil.isNotBlank(post.getPostName()), SysPost::getPostName, post.getPostName());
return PageUtils.buildDataInfo(page(PageUtils.buildPage(),lqw));
}
/**
* 查询岗位信息集合
*

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

@@ -1,13 +1,14 @@
package com.ruoyi.system.service.impl;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
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.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysRoleDept;
import com.ruoyi.system.domain.SysRoleMenu;
@@ -40,6 +41,12 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
@Autowired
private SysRoleDeptMapper roleDeptMapper;
@Override
@DataScope(deptAlias = "d")
public TableDataInfo<SysRole> selectPageRoleList(SysRole role) {
return PageUtils.buildDataInfo(baseMapper.selectPageRoleList(PageUtils.buildPage(), role));
}
/**
* 根据条件分页查询角色数据
*

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

@@ -8,7 +8,9 @@ import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
@@ -49,6 +51,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Autowired
private ISysConfigService configService;
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public TableDataInfo<SysUser> selectPageUserList(SysUser user) {
return PageUtils.buildDataInfo(baseMapper.selectPageUserList(PageUtils.buildPage(), user));
}
/**
* 根据条件分页查询用户列表
*

17
ruoyi/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
View File

@@ -1,13 +1,5 @@
package com.ruoyi.web.controller.monitor;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -16,6 +8,11 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 系统访问记录
@@ -33,9 +30,7 @@ public class SysLogininforController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysLogininfor logininfor)
{
startPage();
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
return getDataTable(list);
return logininforService.selectPageLogininforList(logininfor);
}
@Log(title = "登录日志", businessType = BusinessType.EXPORT)

17
ruoyi/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
View File

@@ -1,13 +1,5 @@
package com.ruoyi.web.controller.monitor;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -16,6 +8,11 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.service.ISysOperLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 操作日志记录
@@ -33,9 +30,7 @@ public class SysOperlogController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysOperLog operLog)
{
startPage();
List<SysOperLog> list = operLogService.selectOperLogList(operLog);
return getDataTable(list);
return operLogService.selectPageOperLogList(operLog);
}
@Log(title = "操作日志", businessType = BusinessType.EXPORT)

3
ruoyi/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
View File

@@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -73,7 +74,7 @@ public class SysUserOnlineController extends BaseController
}
Collections.reverse(userOnlineList);
userOnlineList.removeAll(Collections.singleton(null));
return getDataTable(userOnlineList);
return PageUtils.buildDataInfo(userOnlineList);
}
/**

22
ruoyi/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
View File

@@ -1,17 +1,5 @@
package com.ruoyi.web.controller.system;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.constant.UserConstants;
@@ -23,6 +11,12 @@ import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 参数配置 信息操作处理
@@ -43,9 +37,7 @@ public class SysConfigController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysConfig config)
{
startPage();
List<SysConfig> list = configService.selectConfigList(config);
return getDataTable(list);
return configService.selectPageConfigList(config);
}
@Log(title = "参数管理", businessType = BusinessType.EXPORT)

4
ruoyi/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
View File

@@ -38,9 +38,7 @@ public class SysDictDataController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysDictData dictData)
{
startPage();
List<SysDictData> list = dictDataService.selectDictDataList(dictData);
return getDataTable(list);
return dictDataService.selectPageDictDataList(dictData);
}
@Log(title = "字典数据", businessType = BusinessType.EXPORT)

22
ruoyi/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
View File

@@ -1,17 +1,5 @@
package com.ruoyi.web.controller.system;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
@@ -22,6 +10,12 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 数据字典信息
@@ -39,9 +33,7 @@ public class SysDictTypeController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysDictType dictType)
{
startPage();
List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
return getDataTable(list);
return dictTypeService.selectPageDictTypeList(dictType);
}
@Log(title = "字典类型", businessType = BusinessType.EXPORT)

4
ruoyi/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
View File

@@ -40,9 +40,7 @@ public class SysNoticeController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysNotice notice)
{
startPage();
List<SysNotice> list = noticeService.selectNoticeList(notice);
return getDataTable(list);
return noticeService.selectPageNoticeList(notice);
}
/**

4
ruoyi/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
View File

@@ -42,9 +42,7 @@ public class SysPostController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysPost post)
{
startPage();
List<SysPost> list = postService.selectPostList(post);
return getDataTable(list);
return postService.selectPagePostList(post);
}
@Log(title = "岗位管理", businessType = BusinessType.EXPORT)

4
ruoyi/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
View File

@@ -48,9 +48,7 @@ public class SysRoleController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysRole role)
{
startPage();
List<SysRole> list = roleService.selectRoleList(role);
return getDataTable(list);
return roleService.selectPageRoleList(role);
}
@Log(title = "角色管理", businessType = BusinessType.EXPORT)

4
ruoyi/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@@ -54,9 +54,7 @@ public class SysUserController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysUser user)
{
startPage();
List<SysUser> list = userService.selectUserList(user);
return getDataTable(list);
return userService.selectPageUserList(user);
}
@Log(title = "用户管理", businessType = BusinessType.EXPORT)