zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix PageBuilder泛型

V0.5.x
jay 2023-06-01 15:08:01 +08:00
parent f3dbe69e00
commit 6084ef4333
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysConfigDataImpl.java
View File

@ -77,7 +77,7 @@ public class SysConfigDataImpl implements ISysConfigData, IJPACommData<SysConfig
.and(StringUtils.isNotEmpty(query.getConfigKey()), () -> tbSysConfig.configKey.like(query.getConfigKey()))
.build();
Page<TbSysConfig> all = baseRepository.findAll(predicate, PageBuilder.toPageable(pageRequest));
return PageBuilder.toPaging(all, SysConfig.class);
return PageBuilder.toPaging(all, SysConfig.class);
}

2
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysLogininfoDataImpl.java
View File

@ -68,7 +68,7 @@ public class SysLogininfoDataImpl implements ISysLogininforData, IJPACommData<Sy
@Override
public Paging<SysLogininfor> findByConditions(SysLogininfor cond, int page, int size) {
Page<TbSysLogininfor> all = logininfoRepository.findAll(genPredicate(cond), PageBuilder.buildPageable(page, size));
return PageBuilder.toPaging(all, SysConfig.class);
return PageBuilder.toPaging(all, SysLogininfor.class);
}
@Override

4
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/util/PageBuilder.java
View File

@ -65,12 +65,12 @@ public class PageBuilder {
return orders;
}
public static Paging toPaging(Page all, Class clz) {
public static <T> Paging<T> toPaging(Page all, Class clz) {
return new Paging<>(all.getTotalElements(),
MapstructUtils.convert(all.getContent(), clz));
}
public static Paging<?> toPaging(Page all) {
public static <T> Paging<T> toPaging(Page all) {
return new Paging<>(all.getTotalElements(), all.getContent());
}