From 26fc652d33fb82a75d6ec7771ca50ee414b21723 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 11 一月 2022 16:58:47 +0800
Subject: [PATCH] update 统一代码间隔符
---
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java | 219 ++++++++++++++++++++----------------------------------
1 files changed, 80 insertions(+), 139 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..897b246 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,10 +1,8 @@
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.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.common.core.page.PagePlus;
import java.io.Serializable;
import java.util.Collection;
@@ -21,155 +19,98 @@
*/
public interface IServicePlus<T, V> extends IService<T> {
- /**
- * @param id 涓婚敭id
- * @param copyOptions copy鏉′欢
- * @return V瀵硅薄
- */
- V getVoById(Serializable id, CopyOptions copyOptions);
+ /**
+ * @param id 涓婚敭id
+ * @return V瀵硅薄
+ */
+ V getVoById(Serializable id);
- default V getVoById(Serializable id) {
- return getVoById(id, new CopyOptions());
- }
+ /**
+ * @param convertor 鑷畾涔夎浆鎹㈠櫒
+ */
+ default V getVoById(Serializable id, Function<T, V> convertor) {
+ return convertor.apply(getById(id));
+ }
- /**
- * @param convertor 鑷畾涔夎浆鎹㈠櫒
- */
- default V getVoById(Serializable id, Function<T, V> convertor) {
- return convertor.apply(getById(id));
- }
+ /**
+ * @param idList id鍒楄〃
+ * @return V瀵硅薄
+ */
+ List<V> listVoByIds(Collection<? extends Serializable> idList);
- /**
- * @param idList id鍒楄〃
- * @param copyOptions copy鏉′欢
- * @return V瀵硅薄
- */
- List<V> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions);
+ /**
+ * @param convertor 鑷畾涔夎浆鎹㈠櫒
+ */
+ default List<V> listVoByIds(Collection<? extends Serializable> idList,
+ Function<Collection<T>, List<V>> convertor) {
+ List<T> list = getBaseMapper().selectBatchIds(idList);
+ if (list == null) {
+ return null;
+ }
+ return convertor.apply(list);
+ }
- default List<V> listVoByIds(Collection<? extends Serializable> idList) {
- return listVoByIds(idList, new CopyOptions());
- }
+ /**
+ * @param columnMap 琛ㄥ瓧娈� map 瀵硅薄
+ * @return V瀵硅薄
+ */
+ List<V> listVoByMap(Map<String, Object> columnMap);
- /**
- * @param convertor 鑷畾涔夎浆鎹㈠櫒
- */
- default List<V> listVoByIds(Collection<? extends Serializable> idList,
- Function<Collection<T>, List<V>> convertor) {
- List<T> list = getBaseMapper().selectBatchIds(idList);
- if (list == null) {
- return null;
- }
- return convertor.apply(list);
- }
+ /**
+ * @param convertor 鑷畾涔夎浆鎹㈠櫒
+ */
+ default List<V> listVoByMap(Map<String, Object> columnMap,
+ Function<Collection<T>, List<V>> convertor) {
+ List<T> list = getBaseMapper().selectByMap(columnMap);
+ if (list == null) {
+ return null;
+ }
+ return convertor.apply(list);
+ }
- /**
- * @param columnMap 琛ㄥ瓧娈� map 瀵硅薄
- * @param copyOptions copy鏉′欢
- * @return V瀵硅薄
- */
- List<V> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions);
+ /**
+ * @param queryWrapper 鏌ヨ鏉′欢
+ * @return V瀵硅薄
+ */
+ V getVoOne(Wrapper<T> queryWrapper);
- default List<V> listVoByMap(Map<String, Object> columnMap) {
- return listVoByMap(columnMap, new CopyOptions());
- }
+ /**
+ * @param convertor 鑷畾涔夎浆鎹㈠櫒
+ */
+ default V getVoOne(Wrapper<T> queryWrapper, Function<T, V> convertor) {
+ return convertor.apply(getOne(queryWrapper, true));
+ }
- /**
- * @param convertor 鑷畾涔夎浆鎹㈠櫒
- */
- default List<V> listVoByMap(Map<String, Object> columnMap,
- Function<Collection<T>, List<V>> convertor) {
- List<T> list = getBaseMapper().selectByMap(columnMap);
- if (list == null) {
- return null;
- }
- return convertor.apply(list);
- }
+ /**
+ * @param queryWrapper 鏌ヨ鏉′欢
+ * @return V瀵硅薄
+ */
+ List<V> listVo(Wrapper<T> queryWrapper);
- /**
- * @param queryWrapper 鏌ヨ鏉′欢
- * @param copyOptions copy鏉′欢
- * @return V瀵硅薄
- */
- V getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions);
+ /**
+ * @param convertor 鑷畾涔夎浆鎹㈠櫒
+ */
+ default List<V> listVo(Wrapper<T> queryWrapper, Function<Collection<T>, List<V>> convertor) {
+ List<T> list = getBaseMapper().selectList(queryWrapper);
+ if (list == null) {
+ return null;
+ }
+ return convertor.apply(list);
+ }
- default V getVoOne(Wrapper<T> queryWrapper) {
- return getVoOne(queryWrapper, new CopyOptions());
- }
+ default List<V> listVo() {
+ return listVo(Wrappers.emptyWrapper());
+ }
- /**
- * @param convertor 鑷畾涔夎浆鎹㈠櫒
- */
- default V getVoOne(Wrapper<T> queryWrapper, Function<T, V> convertor) {
- return convertor.apply(getOne(queryWrapper, true));
- }
+ /**
+ * @param convertor 鑷畾涔夎浆鎹㈠櫒
+ */
+ default List<V> listVo(Function<Collection<T>, List<V>> convertor) {
+ return listVo(Wrappers.emptyWrapper(), convertor);
+ }
- /**
- * @param queryWrapper 鏌ヨ鏉′欢
- * @param copyOptions copy鏉′欢
- * @return V瀵硅薄
- */
- List<V> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions);
+ boolean saveAll(Collection<T> entityList);
- default List<V> listVo(Wrapper<T> queryWrapper) {
- return listVo(queryWrapper, new CopyOptions());
- }
-
- /**
- * @param convertor 鑷畾涔夎浆鎹㈠櫒
- */
- default List<V> listVo(Wrapper<T> queryWrapper, Function<Collection<T>, List<V>> convertor) {
- List<T> list = getBaseMapper().selectList(queryWrapper);
- if (list == null) {
- return null;
- }
- return convertor.apply(list);
- }
-
- default List<V> listVo() {
- return listVo(Wrappers.emptyWrapper());
- }
-
- /**
- * @param convertor 鑷畾涔夎浆鎹㈠櫒
- */
- default List<V> listVo(Function<Collection<T>, List<V>> convertor) {
- return listVo(Wrappers.emptyWrapper(), convertor);
- }
-
- /**
- * @param page 鍒嗛〉瀵硅薄
- * @param queryWrapper 鏌ヨ鏉′欢
- * @param copyOptions copy鏉′欢
- * @return V瀵硅薄
- */
- PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper, CopyOptions copyOptions);
-
- default PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper) {
- return pageVo(page, queryWrapper, new CopyOptions());
- }
-
- /**
- * @param convertor 鑷畾涔夎浆鎹㈠櫒
- */
- 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()));
- }
-
- default PagePlus<T, V> pageVo(PagePlus<T, V> page) {
- return pageVo(page, Wrappers.emptyWrapper());
- }
-
- /**
- * @param convertor 鑷畾涔夎浆鎹㈠櫒
- */
- default PagePlus<T, V> pageVo(PagePlus<T, V> page, Function<Collection<T>, List<V>> convertor) {
- return pageVo(page, Wrappers.emptyWrapper(), convertor);
- }
-
- boolean saveAll(Collection<T> entityList);
-
- boolean saveOrUpdateAll(Collection<T> entityList);
+ boolean saveOrUpdateAll(Collection<T> entityList);
}
--
Gitblit v1.9.3