diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/SysGeneratorController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/SysGeneratorController.java index 1c25ce0d3..25f3cdfad 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/SysGeneratorController.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/SysGeneratorController.java @@ -21,6 +21,7 @@ import cn.hutool.core.io.IoUtil; import com.baomidou.mybatisplus.plugins.Page; import com.pig4cloud.pigx.codegen.entity.GenConfig; import com.pig4cloud.pigx.codegen.service.SysGeneratorService; +import com.pig4cloud.pigx.common.core.util.Query; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -48,7 +49,9 @@ public class SysGeneratorController { */ @GetMapping("/page") public Page list(@RequestParam Map params) { - return sysGeneratorService.queryPage(params); + Query query = new Query(params); + query.setRecords(sysGeneratorService.queryPage(query)); + return query; } /** diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/SysGeneratorMapper.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/SysGeneratorMapper.java index 12dbb9bc4..dce9db073 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/SysGeneratorMapper.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/SysGeneratorMapper.java @@ -17,6 +17,8 @@ package com.pig4cloud.pigx.codegen.mapper; +import com.pig4cloud.pigx.common.core.util.Query; + import java.util.List; import java.util.Map; @@ -31,10 +33,10 @@ public interface SysGeneratorMapper { /** * 分页查询表格 * - * @param query + * @param params * @return */ - List> queryList(Map query); + List> queryList(Query params); /** * 查询表数量 diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/SysGeneratorService.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/SysGeneratorService.java index 3014472f7..f5cc97811 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/SysGeneratorService.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/SysGeneratorService.java @@ -17,9 +17,10 @@ package com.pig4cloud.pigx.codegen.service; -import com.baomidou.mybatisplus.plugins.Page; import com.pig4cloud.pigx.codegen.entity.GenConfig; +import com.pig4cloud.pigx.common.core.util.Query; +import java.util.List; import java.util.Map; /** @@ -40,5 +41,5 @@ public interface SysGeneratorService { * @param query 查询条件 * @return */ - Page queryPage(Map query); + List> queryPage(Query query); } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java index 899b17f7b..731f756e7 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java @@ -17,13 +17,12 @@ package com.pig4cloud.pigx.codegen.service.impl; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; -import com.baomidou.mybatisplus.plugins.Page; import com.pig4cloud.pigx.codegen.entity.GenConfig; import com.pig4cloud.pigx.codegen.mapper.SysGeneratorMapper; import com.pig4cloud.pigx.codegen.service.SysGeneratorService; import com.pig4cloud.pigx.codegen.util.GenUtils; +import com.pig4cloud.pigx.common.core.util.Query; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -51,20 +50,8 @@ public class SysGeneratorServiceImpl implements SysGeneratorService { * @return */ @Override - public Page queryPage(Map query) { - - Integer current = Integer.parseInt(query.getOrDefault("page", "1").toString()); - Integer limit = Integer.parseInt(query.getOrDefault("limit", "1").toString()); - Page page = new Page(current, limit); - - List> list = sysGeneratorMapper.queryList(query); - if (CollUtil.isEmpty(list)) { - return page; - } - - page.setTotal(sysGeneratorMapper.queryTotal(query)); - page.setRecords(list); - return page; + public List> queryPage(Query query) { + return sysGeneratorMapper.queryList(query); } /** diff --git a/pom.xml b/pom.xml index 305c0affc..863ffe837 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ - 1.4.0 + 1.4.1 2.0.3.RELEASE Finchley.RELEASE UTF-8