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/ServicePlusImpl.java | 86 +++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 52 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
index fab1e48..0650cfa 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
@@ -1,20 +1,19 @@
package com.ruoyi.common.core.mybatisplus.core;
-import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.TableInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
import com.baomidou.mybatisplus.core.toolkit.Assert;
-import com.baomidou.mybatisplus.core.toolkit.ClassUtils;
+import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.page.PagePlus;
import com.ruoyi.common.utils.BeanCopyUtils;
import com.ruoyi.common.utils.reflect.ReflectUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.ResolvableType;
import java.io.Serializable;
import java.util.ArrayList;
@@ -50,7 +49,7 @@
return entityClass;
}
- protected Class<T> mapperClass = currentMapperClass();
+ protected Class<M> mapperClass = currentMapperClass();
protected Class<V> voClass = currentVoClass();
@@ -59,22 +58,17 @@
}
@Override
- protected Class<T> currentMapperClass() {
- return (Class<T>) this.getResolvableType().as(ServicePlusImpl.class).getGeneric(0).getType();
+ protected Class<M> currentMapperClass() {
+ return (Class<M>) ReflectionKit.getSuperClassGenericType(this.getClass(), ServicePlusImpl.class, 0);
}
@Override
protected Class<T> currentModelClass() {
- return (Class<T>) this.getResolvableType().as(ServicePlusImpl.class).getGeneric(1).getType();
+ return (Class<T>) ReflectionKit.getSuperClassGenericType(this.getClass(), ServicePlusImpl.class, 1);
}
protected Class<V> currentVoClass() {
- return (Class<V>) this.getResolvableType().as(ServicePlusImpl.class).getGeneric(2).getType();
- }
-
- @Override
- protected ResolvableType getResolvableType() {
- return ResolvableType.forClass(ClassUtils.getUserClass(getClass()));
+ return (Class<V>) ReflectionKit.getSuperClassGenericType(this.getClass(), ServicePlusImpl.class, 2);
}
/**
@@ -127,6 +121,9 @@
*/
@Override
public boolean saveAll(Collection<T> entityList) {
+ if (CollUtil.isEmpty(entityList)) {
+ return false;
+ }
return baseMapper.insertAll(entityList) == entityList.size();
}
@@ -164,81 +161,66 @@
/**
* 鏍规嵁 ID 鏌ヨ
- *
- * @param id 涓婚敭ID
*/
@Override
- public V getVoById(Serializable id, CopyOptions copyOptions) {
- T t = getBaseMapper().selectById(id);
- return BeanCopyUtils.oneCopy(t, copyOptions, voClass);
+ public V getVoById(Serializable id) {
+ return getBaseMapper().selectVoById(id, voClass);
}
/**
* 鏌ヨ锛堟牴鎹甀D 鎵归噺鏌ヨ锛�
- *
- * @param idList 涓婚敭ID鍒楄〃
*/
@Override
- public List<V> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions) {
- List<T> list = getBaseMapper().selectBatchIds(idList);
- if (list == null) {
- return null;
- }
- return BeanCopyUtils.listCopy(list, copyOptions, voClass);
+ public List<V> listVoByIds(Collection<? extends Serializable> idList) {
+ return getBaseMapper().selectVoBatchIds(idList, voClass);
}
/**
* 鏌ヨ锛堟牴鎹� columnMap 鏉′欢锛�
- *
- * @param columnMap 琛ㄥ瓧娈� map 瀵硅薄
*/
@Override
- public List<V> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions) {
- List<T> list = getBaseMapper().selectByMap(columnMap);
- if (list == null) {
- return null;
- }
- return BeanCopyUtils.listCopy(list, copyOptions, voClass);
+ public List<V> listVoByMap(Map<String, Object> columnMap) {
+ return getBaseMapper().selectVoByMap(columnMap, voClass);
}
/**
* 鏍规嵁 Wrapper锛屾煡璇竴鏉¤褰� <br/>
* <p>缁撴灉闆嗭紝濡傛灉鏄涓細鎶涘嚭寮傚父锛岄殢鏈哄彇涓�鏉″姞涓婇檺鍒舵潯浠� wrapper.last("LIMIT 1")</p>
- *
- * @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫� {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
*/
@Override
- public V getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
- T t = getOne(queryWrapper, true);
- return BeanCopyUtils.oneCopy(t, copyOptions, voClass);
+ public V getVoOne(Wrapper<T> queryWrapper) {
+ return getBaseMapper().selectVoOne(queryWrapper, voClass);
}
/**
* 鏌ヨ鍒楄〃
- *
- * @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫� {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
*/
@Override
- public List<V> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
- List<T> list = getBaseMapper().selectList(queryWrapper);
- if (list == null) {
- return null;
- }
- return BeanCopyUtils.listCopy(list, copyOptions, voClass);
+ public List<V> listVo(Wrapper<T> queryWrapper) {
+ return getBaseMapper().selectVoList(queryWrapper, voClass);
}
/**
* 缈婚〉鏌ヨ
- *
- * @param page 缈婚〉瀵硅薄
- * @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫�
+ * @deprecated 3.6.0 绉婚櫎 璇蜂娇鐢� {@link #pageVo(IPage, Wrapper)}
*/
@Override
- public PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper, CopyOptions copyOptions) {
+ @Deprecated
+ public PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper) {
PagePlus<T, V> result = getBaseMapper().selectPage(page, queryWrapper);
- List<V> volist = BeanCopyUtils.listCopy(result.getRecords(), copyOptions, voClass);
+ List<V> volist = BeanCopyUtils.copyList(result.getRecords(), voClass);
result.setRecordsVo(volist);
return result;
}
+ /**
+ * 缈婚〉鏌ヨ
+ *
+ * @param page 缈婚〉瀵硅薄
+ * @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫�
+ */
+ public <P extends IPage<V>> P pageVo(IPage<T> page, Wrapper<T> queryWrapper) {
+ return getBaseMapper().selectVoPage(page, queryWrapper, voClass);
+ }
+
}
--
Gitblit v1.9.3