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 3a461a8dd..4bef15965 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 @@ -24,11 +24,14 @@ import java.util.Map; /** * IServicePlus 实现类 * + * @param Mapper类 + * @param 数据实体类 + * @param vo类 * @author Lion Li */ @Slf4j @SuppressWarnings("unchecked") -public class ServicePlusImpl, T, K> extends ServiceImpl implements IServicePlus { +public class ServicePlusImpl, T, V> extends ServiceImpl implements IServicePlus { @Autowired protected M baseMapper; @@ -48,9 +51,9 @@ public class ServicePlusImpl, T, K> extends ServiceI protected Class mapperClass = currentMapperClass(); - protected Class voClass = currentVoClass(); + protected Class voClass = currentVoClass(); - public Class getVoClass() { + public Class getVoClass() { return voClass; } @@ -64,8 +67,8 @@ public class ServicePlusImpl, T, K> extends ServiceI return (Class) this.getResolvableType().as(ServicePlusImpl.class).getGeneric(1).getType(); } - protected Class currentVoClass() { - return (Class) this.getResolvableType().as(ServicePlusImpl.class).getGeneric(2).getType(); + protected Class currentVoClass() { + return (Class) this.getResolvableType().as(ServicePlusImpl.class).getGeneric(2).getType(); } @Override @@ -159,7 +162,7 @@ public class ServicePlusImpl, T, K> extends ServiceI * @param id 主键ID */ @Override - public K getVoById(Serializable id, CopyOptions copyOptions) { + public V getVoById(Serializable id, CopyOptions copyOptions) { T t = getBaseMapper().selectById(id); return BeanCopyUtils.oneCopy(t, copyOptions, voClass); } @@ -170,7 +173,7 @@ public class ServicePlusImpl, T, K> extends ServiceI * @param idList 主键ID列表 */ @Override - public List listVoByIds(Collection idList, CopyOptions copyOptions) { + public List listVoByIds(Collection idList, CopyOptions copyOptions) { List list = getBaseMapper().selectBatchIds(idList); if (list == null) { return null; @@ -184,7 +187,7 @@ public class ServicePlusImpl, T, K> extends ServiceI * @param columnMap 表字段 map 对象 */ @Override - public List listVoByMap(Map columnMap, CopyOptions copyOptions) { + public List listVoByMap(Map columnMap, CopyOptions copyOptions) { List list = getBaseMapper().selectByMap(columnMap); if (list == null) { return null; @@ -199,7 +202,7 @@ public class ServicePlusImpl, T, K> extends ServiceI * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper} */ @Override - public K getVoOne(Wrapper queryWrapper, CopyOptions copyOptions) { + public V getVoOne(Wrapper queryWrapper, CopyOptions copyOptions) { T t = getOne(queryWrapper, true); return BeanCopyUtils.oneCopy(t, copyOptions, voClass); } @@ -210,7 +213,7 @@ public class ServicePlusImpl, T, K> extends ServiceI * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper} */ @Override - public List listVo(Wrapper queryWrapper, CopyOptions copyOptions) { + public List listVo(Wrapper queryWrapper, CopyOptions copyOptions) { List list = getBaseMapper().selectList(queryWrapper); if (list == null) { return null; @@ -225,9 +228,9 @@ public class ServicePlusImpl, T, K> extends ServiceI * @param queryWrapper 实体对象封装操作类 */ @Override - public PagePlus pageVo(PagePlus page, Wrapper queryWrapper, CopyOptions copyOptions) { - PagePlus result = getBaseMapper().selectPage(page, queryWrapper); - List volist = BeanCopyUtils.listCopy(result.getRecords(), copyOptions, voClass); + public PagePlus pageVo(PagePlus page, Wrapper queryWrapper, CopyOptions copyOptions) { + PagePlus result = getBaseMapper().selectPage(page, queryWrapper); + List volist = BeanCopyUtils.listCopy(result.getRecords(), copyOptions, voClass); result.setRecordsVo(volist); return result; }