From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 24 十二月 2021 11:36:02 +0800
Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework
---
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java | 60 ++++++++++++++++++++----------------------------------------
1 files changed, 20 insertions(+), 40 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
index 815791b..e645562 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
@@ -1,7 +1,7 @@
package com.ruoyi.common.core.mybatisplus.core;
-import cn.hutool.core.bean.copier.CopyOptions;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.page.PagePlus;
@@ -23,14 +23,9 @@
/**
* @param id 涓婚敭id
- * @param copyOptions copy鏉′欢
* @return V瀵硅薄
*/
- V getVoById(Serializable id, CopyOptions copyOptions);
-
- default V getVoById(Serializable id) {
- return getVoById(id, new CopyOptions());
- }
+ V getVoById(Serializable id);
/**
* @param convertor 鑷畾涔夎浆鎹㈠櫒
@@ -41,14 +36,9 @@
/**
* @param idList id鍒楄〃
- * @param copyOptions copy鏉′欢
* @return V瀵硅薄
*/
- List<V> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions);
-
- default List<V> listVoByIds(Collection<? extends Serializable> idList) {
- return listVoByIds(idList, new CopyOptions());
- }
+ List<V> listVoByIds(Collection<? extends Serializable> idList);
/**
* @param convertor 鑷畾涔夎浆鎹㈠櫒
@@ -64,14 +54,9 @@
/**
* @param columnMap 琛ㄥ瓧娈� map 瀵硅薄
- * @param copyOptions copy鏉′欢
* @return V瀵硅薄
*/
- List<V> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions);
-
- default List<V> listVoByMap(Map<String, Object> columnMap) {
- return listVoByMap(columnMap, new CopyOptions());
- }
+ List<V> listVoByMap(Map<String, Object> columnMap);
/**
* @param convertor 鑷畾涔夎浆鎹㈠櫒
@@ -87,14 +72,9 @@
/**
* @param queryWrapper 鏌ヨ鏉′欢
- * @param copyOptions copy鏉′欢
* @return V瀵硅薄
*/
- V getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions);
-
- default V getVoOne(Wrapper<T> queryWrapper) {
- return getVoOne(queryWrapper, new CopyOptions());
- }
+ V getVoOne(Wrapper<T> queryWrapper);
/**
* @param convertor 鑷畾涔夎浆鎹㈠櫒
@@ -105,14 +85,9 @@
/**
* @param queryWrapper 鏌ヨ鏉′欢
- * @param copyOptions copy鏉′欢
* @return V瀵硅薄
*/
- List<V> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions);
-
- default List<V> listVo(Wrapper<T> queryWrapper) {
- return listVo(queryWrapper, new CopyOptions());
- }
+ List<V> listVo(Wrapper<T> queryWrapper);
/**
* @param convertor 鑷畾涔夎浆鎹㈠櫒
@@ -139,31 +114,36 @@
/**
* @param page 鍒嗛〉瀵硅薄
* @param queryWrapper 鏌ヨ鏉′欢
- * @param copyOptions copy鏉′欢
* @return V瀵硅薄
+ * @deprecated 3.6.0 绉婚櫎 璇蜂娇鐢� {@link ServicePlusImpl#pageVo(IPage, Wrapper)}
*/
- PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper, CopyOptions copyOptions);
+ @Deprecated
+ PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper);
- default PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper) {
- return pageVo(page, queryWrapper, new CopyOptions());
- }
-
- /**
- * @param convertor 鑷畾涔夎浆鎹㈠櫒
- */
+ /**
+ * @param convertor 鑷畾涔夎浆鎹㈠櫒
+ * @deprecated 3.6.0 绉婚櫎 璇蜂娇鐢� {@link ServicePlusImpl#pageVo(IPage, Wrapper)}
+ */
+ @Deprecated
default PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper,
Function<Collection<T>, List<V>> convertor) {
PagePlus<T, V> result = getBaseMapper().selectPage(page, queryWrapper);
return result.setRecordsVo(convertor.apply(result.getRecords()));
}
+ /**
+ * @deprecated 3.6.0 绉婚櫎 璇蜂娇鐢� {@link ServicePlusImpl#pageVo(IPage, Wrapper)}
+ */
+ @Deprecated
default PagePlus<T, V> pageVo(PagePlus<T, V> page) {
return pageVo(page, Wrappers.emptyWrapper());
}
/**
* @param convertor 鑷畾涔夎浆鎹㈠櫒
+ * @deprecated 3.6.0 绉婚櫎 璇蜂娇鐢� {@link ServicePlusImpl#pageVo(IPage, Wrapper)}
*/
+ @Deprecated
default PagePlus<T, V> pageVo(PagePlus<T, V> page, Function<Collection<T>, List<V>> convertor) {
return pageVo(page, Wrappers.emptyWrapper(), convertor);
}
--
Gitblit v1.9.3