lbqms.git - Gitblit

			@@ -1,14 +1,15 @@
			package com.ruoyi.system.service.impl;

			import cn.hutool.core.convert.Convert;
			import com.baomidou.dynamic.datasource.annotation.DS;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.ruoyi.common.annotation.DataSource;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.ruoyi.common.constant.Constants;
			import com.ruoyi.common.constant.UserConstants;
			import com.ruoyi.common.core.domain.PageQuery;
			import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
			import com.ruoyi.common.core.page.TableDataInfo;
			import com.ruoyi.common.core.service.ConfigService;
			import com.ruoyi.common.enums.DataSourceType;
			import com.ruoyi.common.exception.ServiceException;
			import com.ruoyi.common.utils.PageUtils;
			import com.ruoyi.common.utils.RedisUtils;
			@@ -32,7 +33,7 @@
			public class SysConfigServiceImpl extends ServicePlusImpl<SysConfigMapper, SysConfig, SysConfig> implements ISysConfigService, ConfigService {

			@Override
			public TableDataInfo<SysConfig> selectPageConfigList(SysConfig config) {
			public TableDataInfo<SysConfig> selectPageConfigList(SysConfig config, PageQuery pageQuery) {
			Map<String, Object> params = config.getParams();
			LambdaQueryWrapper<SysConfig> lqw = new LambdaQueryWrapper<SysConfig>()
			.like(StringUtils.isNotBlank(config.getConfigName()), SysConfig::getConfigName, config.getConfigName())
			@@ -40,7 +41,8 @@
			.like(StringUtils.isNotBlank(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey())
			.between(params.get("beginTime") != null && params.get("endTime") != null,
			SysConfig::getCreateTime, params.get("beginTime"), params.get("endTime"));
			return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw));
			Page<SysConfig> page = page(PageUtils.buildPage(pageQuery), lqw);
			return PageUtils.buildDataInfo(page);
			}

			/**
			@@ -50,7 +52,7 @@
			* @return 参数配置信息
			*/
			@Override
			@DataSource(DataSourceType.MASTER)
			@DS("master")
			public SysConfig selectConfigById(Long configId) {
			return baseMapper.selectById(configId);
			}