diff --git a/server/like-generator/src/main/java/com/mdd/generator/controller/GenController.java b/server/like-generator/src/main/java/com/mdd/generator/controller/GenController.java index 3805c21d..bdc56079 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/mdd/generator/controller/GenController.java @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.List; import java.util.Map; @RestController @@ -47,14 +48,12 @@ public class GenController { * 所有库表 * * @author fzr - * @param pageParam 分页参数 * @param params 搜索参数 * @return Object */ @GetMapping("/dbAll") - public Object dbAll(@Validated PageParam pageParam, - @RequestParam Map params) { - PageResult list = iGenerateService.dbAll(pageParam, params); + public Object dbAll(@RequestParam Map params) { + List list = iGenerateService.dbAll(params); return AjaxResult.success(list); } diff --git a/server/like-generator/src/main/java/com/mdd/generator/service/IGenerateService.java b/server/like-generator/src/main/java/com/mdd/generator/service/IGenerateService.java index 8192cbe3..2438b465 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/service/IGenerateService.java +++ b/server/like-generator/src/main/java/com/mdd/generator/service/IGenerateService.java @@ -28,11 +28,10 @@ public interface IGenerateService { * 所有库表 * * @author fzr - * @param pageParam 分页参数 * @param params 搜索参数 * @return PageResult> */ - PageResult dbAll(PageParam pageParam, Map params); + List dbAll(Map params); /** * 生成列表 diff --git a/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java index 4e641e04..f14e999c 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java @@ -89,25 +89,19 @@ public class GenerateServiceImpl implements IGenerateService { * 库列表 * * @author fzr - * @param pageParam 分页参数 * @param params 搜索参数 * @return PageResult> */ @Override - public PageResult dbAll(PageParam pageParam, Map params) { - Integer page = pageParam.getPageNo(); - Integer limit = pageParam.getPageSize(); - - PageHelper.startPage(page, limit); + public List dbAll(Map params) { List tables = genTableMapper.selectDbTableAllList(params); - for (DbTableVo vo : tables) { if (vo.getUpdateTime() == null) { vo.setUpdateTime(""); } } - return PageResult.pageHelper(tables); + return tables; } /**