From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 20 十月 2021 13:07:16 +0800 Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像 --- ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java | 362 ++++++++++++++++++++------------------------------ 1 files changed, 146 insertions(+), 216 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 21b0ecc..815791b 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,6 +1,6 @@ package com.ruoyi.common.core.mybatisplus.core; -import cn.hutool.core.bean.BeanUtil; +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; @@ -11,235 +11,165 @@ import java.util.List; import java.util.Map; import java.util.function.Function; -import java.util.stream.Collectors; /** * 鑷畾涔� Service 鎺ュ彛, 瀹炵幇 鏁版嵁搴撳疄浣撲笌 vo 瀵硅薄杞崲杩斿洖 * + * @param <T> 鏁版嵁瀹炰綋绫� + * @param <V> vo绫� * @author Lion Li - * @since 2021-05-13 */ -public interface IServicePlus<T> extends IService<T> { +public interface IServicePlus<T, V> extends IService<T> { - /** - * 鏍规嵁 ID 鏌ヨ - * - * @param kClass vo绫诲瀷 - * @param id 涓婚敭ID - */ - default <K> K getVoById(Serializable id, Class<K> kClass) { - T t = getBaseMapper().selectById(id); - return BeanUtil.toBean(t, kClass); - } + /** + * @param id 涓婚敭id + * @param copyOptions copy鏉′欢 + * @return V瀵硅薄 + */ + V getVoById(Serializable id, CopyOptions copyOptions); - /** - * 鏍规嵁 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绫诲瀷 - * @param idList 涓婚敭ID鍒楄〃 - */ - default <K> List<K> listVoByIds(Collection<? extends Serializable> idList, Class<K> kClass) { - List<T> list = getBaseMapper().selectBatchIds(idList); - if (list == null) { - return null; - } - 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); - } - - /** - * 鏌ヨ锛堟牴鎹� columnMap 鏉′欢锛� - * - * @param kClass vo绫诲瀷 - * @param columnMap 琛ㄥ瓧娈� map 瀵硅薄 - */ - default <K> List<K> listVoByMap(Map<String, Object> columnMap, Class<K> kClass) { - List<T> list = getBaseMapper().selectByMap(columnMap); - if (list == null) { - return null; - } - return list.stream() - .map(any -> BeanUtil.toBean(any, kClass)) - .collect(Collectors.toList()); - } - - /** - * 鏌ヨ锛堟牴鎹� 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> - * - * @param kClass vo绫诲瀷 - * @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫� {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper} - */ - 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)); - } - - /** - * 鏌ヨ鍒楄〃 - * - * @param kClass vo绫诲瀷 - * @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫� {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper} - */ - default <K> List<K> listVo(Wrapper<T> queryWrapper, Class<K> kClass) { - List<T> list = getBaseMapper().selectList(queryWrapper); - if (list == null) { - return null; - } - return list.stream() - .map(any -> BeanUtil.toBean(any, kClass)) - .collect(Collectors.toList()); - } - - /** - * 鏌ヨ鍒楄〃 - * - * @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绫诲瀷 - * @see Wrappers#emptyWrapper() - */ - default <K> List<K> listVo(Class<K> kClass) { - return listVo(Wrappers.emptyWrapper(), kClass); - } - - /** - * 鏌ヨ鎵�鏈� - * - * @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 瀹炰綋瀵硅薄灏佽鎿嶄綔绫� - */ - default <K> PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, Class<K> kClass) { - 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 缈婚〉瀵硅薄 - */ - 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); - } - - @Override - default boolean saveBatch(Collection<T> entityList) { - return saveBatch(entityList, DEFAULT_BATCH_SIZE); + default V getVoById(Serializable id) { + return getVoById(id, new CopyOptions()); } - @Override - default boolean saveOrUpdateBatch(Collection<T> entityList) { - return saveOrUpdateBatch(entityList, DEFAULT_BATCH_SIZE); + /** + * @param convertor 鑷畾涔夎浆鎹㈠櫒 + */ + default V getVoById(Serializable id, Function<T, V> convertor) { + return convertor.apply(getById(id)); } - @Override - default boolean updateBatchById(Collection<T> entityList) { - return updateBatchById(entityList, DEFAULT_BATCH_SIZE); + /** + * @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()); + } + + /** + * @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 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()); + } + + /** + * @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 鏌ヨ鏉′欢 + * @param copyOptions copy鏉′欢 + * @return V瀵硅薄 + */ + V getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions); + + default V getVoOne(Wrapper<T> queryWrapper) { + return getVoOne(queryWrapper, new CopyOptions()); + } + + /** + * @param convertor 鑷畾涔夎浆鎹㈠櫒 + */ + default V getVoOne(Wrapper<T> queryWrapper, Function<T, V> convertor) { + return convertor.apply(getOne(queryWrapper, true)); + } + + /** + * @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()); + } + + /** + * @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); } -- Gitblit v1.9.3