From cd1a68f15e107f036d9c265db88bc775a36f43c7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 10:26:18 +0800
Subject: [PATCH] update 防止 MP 无主键警告
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index bbd09a1..62d5738 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -1,21 +1,21 @@
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.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.domain.PageQuery;
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;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.service.ISysConfigService;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Arrays;
@@ -28,11 +28,14 @@
*
* @author Lion Li
*/
+@RequiredArgsConstructor
@Service
-public class SysConfigServiceImpl extends ServicePlusImpl<SysConfigMapper, SysConfig, SysConfig> implements ISysConfigService, ConfigService {
+public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
+
+ private final SysConfigMapper baseMapper;
@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 +43,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 = baseMapper.selectPage(pageQuery.build(), lqw);
+ return TableDataInfo.build(page);
}
/**
@@ -50,7 +54,7 @@
* @return 鍙傛暟閰嶇疆淇℃伅
*/
@Override
- @DataSource(DataSourceType.MASTER)
+ @DS("master")
public SysConfig selectConfigById(Long configId) {
return baseMapper.selectById(configId);
}
@@ -201,6 +205,11 @@
return UserConstants.UNIQUE;
}
+ @Override
+ public SysConfig getOne(SysConfig config) {
+ return baseMapper.selectOne(new LambdaQueryWrapper<>(config));
+ }
+
/**
* 鏍规嵁鍙傛暟 key 鑾峰彇鍙傛暟鍊�
*
--
Gitblit v1.9.3