github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

修复分页

pull/445/head
Candyメ奶糖 2020-07-28 19:01:44 +08:00
parent fca640426e
commit bdd5ff3e6d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java
View File

@ -24,6 +24,7 @@ import me.zhengjie.service.GenConfigService;
import me.zhengjie.service.GeneratorService;
import me.zhengjie.utils.PageUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@ -55,10 +56,8 @@ public class GeneratorController {
@ApiOperation("查询数据库数据")
@GetMapping(value = "/tables")
public ResponseEntity<Object> queryTables(@RequestParam(defaultValue = "") String name,
@RequestParam(defaultValue = "0")Integer page,
@RequestParam(defaultValue = "10")Integer size){
int[] startEnd = PageUtil.transToStartEnd(page, size);
public ResponseEntity<Object> queryTables(@RequestParam(defaultValue = "") String name, Pageable pageable) {
int[] startEnd = PageUtil.transToStartEnd(pageable.getPageNumber() + 1, pageable.getPageSize());
return new ResponseEntity<>(generatorService.getTables(name,startEnd), HttpStatus.OK);
}

5
eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java
View File

@ -86,8 +86,9 @@ public class GeneratorServiceImpl implements GeneratorService {
Object[] arr = (Object[]) obj;
tableInfos.add(new TableInfo(arr[0], arr[1], arr[2], arr[3], ObjectUtil.isNotEmpty(arr[4]) ? arr[4] : "-"));
}
Query query1 = em.createNativeQuery("SELECT COUNT(*) from information_schema.tables where table_schema = (select database())");
Object totalElements = query1.getSingleResult();
Query totalQuery = em.createNativeQuery("SELECT COUNT(*) from information_schema.tables where table_schema = (select database()) and table_name like ? ");
totalQuery.setParameter(1, StringUtils.isNotBlank(name) ? ("%" + name + "%") : "%%");
Object totalElements = totalQuery.getSingleResult();
return PageUtil.toPage(tableInfos, totalElements);
}