From 3e08a8e1c1ea923035c09af6cf1f802c1f6dd25b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 15 五月 2021 14:34:56 +0800
Subject: [PATCH] update 通用Service接口 增加自定义vo转换函数
---
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java | 93 +++++++++++++---------
ruoyi-common/src/main/java/com/ruoyi/common/core/page/IServicePlus.java | 114 +++++++++++++++++++++++++++-
2 files changed, 164 insertions(+), 43 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/IServicePlus.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/IServicePlus.java
index 864a38e..aeaee0b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/IServicePlus.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/IServicePlus.java
@@ -9,6 +9,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -31,6 +32,18 @@
}
/**
+ * 鏍规嵁 ID 鏌ヨ
+ *
+ * @param id 涓婚敭ID
+ * @param convertor 杞崲鍑芥暟
+ * @param <K> vo绫诲瀷
+ */
+ default <K> K getVoById(Serializable id, Function<T, K> convertor) {
+ T t = getBaseMapper().selectById(id);
+ return convertor.apply(t);
+ }
+
+ /**
* 鏌ヨ锛堟牴鎹甀D 鎵归噺鏌ヨ锛�
*
* @param kClass vo绫诲瀷
@@ -44,6 +57,21 @@
return list.stream()
.map(any -> BeanUtil.toBean(any, kClass))
.collect(Collectors.toList());
+ }
+
+ /**
+ * 鏌ヨ锛堟牴鎹甀D 鎵归噺鏌ヨ锛�
+ *
+ * @param convertor 杞崲鍑芥暟
+ * @param idList 涓婚敭ID鍒楄〃
+ */
+ default <K> List<K> listVoByIds(Collection<? extends Serializable> idList,
+ Function<Collection<T>, List<K>> convertor) {
+ List<T> list = getBaseMapper().selectBatchIds(idList);
+ if (list == null) {
+ return null;
+ }
+ return convertor.apply(list);
}
/**
@@ -63,6 +91,21 @@
}
/**
+ * 鏌ヨ锛堟牴鎹� columnMap 鏉′欢锛�
+ *
+ * @param convertor 杞崲鍑芥暟
+ * @param columnMap 琛ㄥ瓧娈� map 瀵硅薄
+ */
+ default <K> List<K> listVoByMap(Map<String, Object> columnMap,
+ Function<Collection<T>, List<K>> convertor) {
+ List<T> list = getBaseMapper().selectByMap(columnMap);
+ if (list == null) {
+ return null;
+ }
+ return convertor.apply(list);
+ }
+
+ /**
* 鏍规嵁 Wrapper锛屾煡璇竴鏉¤褰� <br/>
* <p>缁撴灉闆嗭紝濡傛灉鏄涓細鎶涘嚭寮傚父锛岄殢鏈哄彇涓�鏉″姞涓婇檺鍒舵潯浠� wrapper.last("LIMIT 1")</p>
*
@@ -71,6 +114,17 @@
*/
default <K> K getVoOne(Wrapper<T> queryWrapper, Class<K> kClass) {
return BeanUtil.toBean(getOne(queryWrapper, true), kClass);
+ }
+
+ /**
+ * 鏍规嵁 Wrapper锛屾煡璇竴鏉¤褰� <br/>
+ * <p>缁撴灉闆嗭紝濡傛灉鏄涓細鎶涘嚭寮傚父锛岄殢鏈哄彇涓�鏉″姞涓婇檺鍒舵潯浠� wrapper.last("LIMIT 1")</p>
+ *
+ * @param convertor 杞崲鍑芥暟
+ * @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫� {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
+ */
+ default <K> K getVoOne(Wrapper<T> queryWrapper, Function<T, K> convertor) {
+ return convertor.apply(getOne(queryWrapper, true));
}
/**
@@ -90,6 +144,20 @@
}
/**
+ * 鏌ヨ鍒楄〃
+ *
+ * @param convertor 杞崲鍑芥暟
+ * @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫� {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
+ */
+ default <K> List<K> listVo(Wrapper<T> queryWrapper, Function<Collection<T>, List<K>> convertor) {
+ List<T> list = getBaseMapper().selectList(queryWrapper);
+ if (list == null) {
+ return null;
+ }
+ return convertor.apply(list);
+ }
+
+ /**
* 鏌ヨ鎵�鏈�
*
* @param kClass vo绫诲瀷
@@ -100,27 +168,63 @@
}
/**
+ * 鏌ヨ鎵�鏈�
+ *
+ * @param convertor 杞崲鍑芥暟
+ * @see Wrappers#emptyWrapper()
+ */
+ default <K> List<K> listVo(Function<Collection<T>, List<K>> convertor) {
+ return listVo(Wrappers.emptyWrapper(), convertor);
+ }
+
+ /**
* 缈婚〉鏌ヨ
*
* @param page 缈婚〉瀵硅薄
* @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫�
- * @param kClass vo绫诲瀷
+ * @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;
+ PagePlus<T, K> result = getBaseMapper().selectPage(page, queryWrapper);
+ List<K> volist = result.getRecords().stream()
+ .map(any -> BeanUtil.toBean(any, kClass))
+ .collect(Collectors.toList());
+ result.setRecordsVo(volist);
+ return result;
+ }
+
+ /**
+ * 缈婚〉鏌ヨ
+ *
+ * @param page 缈婚〉瀵硅薄
+ * @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫�
+ * @param convertor 杞崲鍑芥暟
+ */
+ default <K> PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper,
+ Function<Collection<T>, List<K>> convertor) {
+ PagePlus<T, K> result = getBaseMapper().selectPage(page, queryWrapper);
+ return result.setRecordsVo(convertor.apply(result.getRecords()));
}
/**
* 鏃犳潯浠剁炕椤垫煡璇�
*
- * @param 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);
}
+ /**
+ * 鏃犳潯浠剁炕椤垫煡璇�
+ *
+ * @param page 缈婚〉瀵硅薄
+ * @param convertor 杞崲鍑芥暟
+ */
+ default <K> PagePlus<T, K> pageVo(PagePlus<T, K> page, Function<Collection<T>, List<K>> convertor) {
+ return pageVo(page, Wrappers.emptyWrapper(), convertor);
+ }
+
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java
index 7200fc5..889d549 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java
@@ -1,6 +1,5 @@
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;
@@ -10,34 +9,67 @@
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;
+ /**
+ * domain瀹炰綋鍒楄〃
+ */
+ private List<T> records = Collections.emptyList();
+
+ /**
+ * vo瀹炰綋鍒楄〃
+ */
+ private List<K> recordsVo = Collections.emptyList();
+
+ /**
+ * 鎬绘暟
+ */
+ private long total = 0L;
+
+ /**
+ * 椤甸暱搴�
+ */
+ private long size = 10L;
+
+ /**
+ * 褰撳墠椤�
+ */
+ private long current = 1L;
+
+ /**
+ * 鎺掑簭瀛楁淇℃伅
+ */
+ private List<OrderItem> orders = new ArrayList<>();
+
+ /**
+ * 鑷姩浼樺寲 COUNT SQL
+ */
+ private boolean optimizeCountSql = true;
+
+ /**
+ * 鏄惁杩涜 count 鏌ヨ
+ */
+ private boolean isSearchCount = true;
+
+ /**
+ * 鏄惁鍛戒腑count缂撳瓨
+ */
+ private boolean hitCount = false;
+
+ /**
+ * countId
+ */
+ private String countId;
+
+ /**
+ * 鏈�澶imit
+ */
+ private 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) {
@@ -53,18 +85,9 @@
}
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;
@@ -76,12 +99,6 @@
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
@@ -116,7 +133,7 @@
@Override
public boolean isSearchCount() {
- return this.total < 0L ? false : this.isSearchCount;
+ return this.total >= 0L && this.isSearchCount;
}
public PagePlus<T, K> setSearchCount(boolean isSearchCount) {
--
Gitblit v1.9.3