|
@@ -3,6 +3,7 @@ package com.ruoyi.common.core.mybatisplus.core;
|
|
|
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;
|
|
@@ -160,74 +161,47 @@ public class ServicePlusImpl<M extends BaseMapperPlus<T>, T, V> extends ServiceI
|
|
|
|
|
|
/**
|
|
|
* 根据 ID 查询
|
|
|
- *
|
|
|
- * @param id 主键ID
|
|
|
*/
|
|
|
@Override
|
|
|
public V getVoById(Serializable id) {
|
|
|
- T t = getBaseMapper().selectById(id);
|
|
|
- return BeanCopyUtils.copy(t, voClass);
|
|
|
+ return getBaseMapper().selectVoById(id, voClass);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 查询(根据ID 批量查询)
|
|
|
- *
|
|
|
- * @param idList 主键ID列表
|
|
|
*/
|
|
|
@Override
|
|
|
public List<V> listVoByIds(Collection<? extends Serializable> idList) {
|
|
|
- List<T> list = getBaseMapper().selectBatchIds(idList);
|
|
|
- if (list == null) {
|
|
|
- return null;
|
|
|
- }
|
|
|
- return BeanCopyUtils.copyList(list, voClass);
|
|
|
+ return getBaseMapper().selectVoBatchIds(idList, voClass);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 查询(根据 columnMap 条件)
|
|
|
- *
|
|
|
- * @param columnMap 表字段 map 对象
|
|
|
*/
|
|
|
@Override
|
|
|
public List<V> listVoByMap(Map<String, Object> columnMap) {
|
|
|
- List<T> list = getBaseMapper().selectByMap(columnMap);
|
|
|
- if (list == null) {
|
|
|
- return null;
|
|
|
- }
|
|
|
- return BeanCopyUtils.copyList(list, voClass);
|
|
|
+ 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) {
|
|
|
- T t = getOne(queryWrapper, true);
|
|
|
- return BeanCopyUtils.copy(t, voClass);
|
|
|
+ return getBaseMapper().selectVoOne(queryWrapper, voClass);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 查询列表
|
|
|
- *
|
|
|
- * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
|
|
|
*/
|
|
|
@Override
|
|
|
public List<V> listVo(Wrapper<T> queryWrapper) {
|
|
|
- List<T> list = getBaseMapper().selectList(queryWrapper);
|
|
|
- if (list == null) {
|
|
|
- return null;
|
|
|
- }
|
|
|
- return BeanCopyUtils.copyList(list, voClass);
|
|
|
+ return getBaseMapper().selectVoList(queryWrapper, voClass);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 翻页查询
|
|
|
- *
|
|
|
- * @param page 翻页对象
|
|
|
- * @param queryWrapper 实体对象封装操作类
|
|
|
*/
|
|
|
@Override
|
|
|
public PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper) {
|
|
@@ -237,4 +211,14 @@ public class ServicePlusImpl<M extends BaseMapperPlus<T>, T, V> extends ServiceI
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 翻页查询
|
|
|
+ *
|
|
|
+ * @param page 翻页对象
|
|
|
+ * @param queryWrapper 实体对象封装操作类
|
|
|
+ */
|
|
|
+ public IPage<V> pageVo(IPage<T> page, Wrapper<T> queryWrapper) {
|
|
|
+ return getBaseMapper().selectVoPage(page, queryWrapper, voClass);
|
|
|
+ }
|
|
|
+
|
|
|
}
|