From 085277bf83e54ed644abe7a51fd9679fcb9cf6c1 Mon Sep 17 00:00:00 2001 From: 86173 <3139166962@qq.com> Date: Fri, 23 Aug 2024 09:58:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=A0=E9=99=A4c00db4a90e9d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-market-common/pom.xml | 6 + .../muyu/market/domian/config/PageParam.java | 129 ++++++++++++++++++ .../master/controller/DefinedController.java | 33 ++++- .../muyu/master/service/DefinedService.java | 3 +- .../service/impl/DefinedServiceImpl.java | 21 +-- 5 files changed, 166 insertions(+), 26 deletions(-) create mode 100644 cloud-market-common/src/main/java/com/muyu/market/domian/config/PageParam.java diff --git a/cloud-market-common/pom.xml b/cloud-market-common/pom.xml index 53a2aa3..c30b770 100644 --- a/cloud-market-common/pom.xml +++ b/cloud-market-common/pom.xml @@ -23,6 +23,12 @@ com.muyu cloud-common-core + + org.springdoc + springdoc-openapi-starter-common + 2.0.4 + compile + diff --git a/cloud-market-common/src/main/java/com/muyu/market/domian/config/PageParam.java b/cloud-market-common/src/main/java/com/muyu/market/domian/config/PageParam.java new file mode 100644 index 0000000..04f0df4 --- /dev/null +++ b/cloud-market-common/src/main/java/com/muyu/market/domian/config/PageParam.java @@ -0,0 +1,129 @@ + +package com.muyu.market.domian.config; + +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.media.Schema; +import org.springdoc.core.annotations.ParameterObject; + +import java.util.Collections; +import java.util.List; + +/** + * 分页参数 + * @author yami + */ +@Schema +@ParameterObject +public class PageParam extends PageDTO { + + private static final int PAGE_LIMIT = 100; + /** + * 每页显示条数，默认 10 + */ + @Schema(description = "每页大小，默认10") + private long size = 10; + + /** + * 当前页 + */ + @Schema(description = "当前页，默认1") + private long current = 1; + + /** + * 查询数据列表 + */ + @Hidden + private List records; + /** + * 总数 + */ + @Hidden + private long total = 0; + + + /** + * 是否进行 count 查询 + */ + @Hidden + private boolean searchCount = true; + + @Hidden + private String countId; + @Hidden + private Long maxLimit; + @Hidden + private boolean optimizeCountSql; + @Hidden + private List orders; + + @Override + public List getRecords() { + return this.records; + } + + @Override + public Page setRecords(List records) { + this.records = records; + return this; + } + + @Override + public long getTotal() { + return this.total; + } + + @Override + public Page setTotal(long total) { + this.total = total; + return this; + } + + @Hidden + public boolean searchCount() { + if (total < 0) { + return false; + } + return searchCount; + } + + @Override + public Page setSearchCount(boolean searchCount) { + this.searchCount = searchCount; + return this; + } + + @Override + public long getSize() { + return this.size; + } + + @Override + public Page setSize(long size) { + if (size > PAGE_LIMIT) { + this.size = PAGE_LIMIT; + } else { + this.size = size; + } + return this; + } + + @Override + public long getCurrent() { + return this.current; + } + + @Override + public Page setCurrent(long current) { + this.current = current; + return this; + } + + @Override + public void setOrders(List orders) { + super.setOrders(Collections.emptyList()); + } + +} diff --git a/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java b/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java index 504182b..dc8c3f7 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java +++ b/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java @@ -1,21 +1,24 @@ package com.muyu.master.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.dtflys.forest.springboot.annotation.ForestScannerRegister; import com.muyu.common.core.domain.Result; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.market.domian.Defined; +import com.muyu.market.domian.config.PageParam; import com.muyu.market.domian.req.DefinedReq; import com.muyu.master.service.DefinedService; +import io.micrometer.common.util.StringUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.stream.Collectors; /** * @Author：ChenYan @@ -48,10 +51,32 @@ public class DefinedController { */ @RequestMapping(path = "/list",method = RequestMethod.POST) @Operation(summary = "查询",description = "根据接口的名称、编码，是否开启等可以进行筛选") - public Result> selectList( - @Validated @RequestBody DefinedReq definedReq) { + public Result> selectList(PageParam page, + @Validated @RequestBody DefinedReq definedReq) { + + /**模糊查询 名称**/ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like( + StringUtils.isNotEmpty(definedReq.getDefinedName()), + Defined::getDefinedName,definedReq.getDefinedName() + ); + + /**模糊查询 有效期**/ + queryWrapper.like( + StringUtils.isNotEmpty(String.valueOf(definedReq.getDefinedDateValidity())), + Defined::getDefinedDateValidity, + definedReq.getDefinedDateValidity() + ); + + PageParampageDTO=definedService.page(page,queryWrapper); + List list = pageDTO.getRecords(); + + list.stream() + .map(Defined::getDefinedId) + .collect(Collectors.toList()); + return Result.success( - definedService.selectList(definedReq) + pageDTO ); } diff --git a/cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java b/cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java index 0a22128..1bcc6c0 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java +++ b/cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java @@ -2,6 +2,7 @@ package com.muyu.master.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.market.domian.Defined; +import com.muyu.market.domian.config.PageParam; import com.muyu.market.domian.req.DefinedReq; import java.util.List; @@ -16,8 +17,6 @@ import java.util.List; */ public interface DefinedService extends IService { - List selectList(DefinedReq definedReq); -// public Object definedBuild(String code, int limit); } diff --git a/cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java b/cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java index c3b5347..b7d0e13 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java +++ b/cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.market.domian.Defined; +import com.muyu.market.domian.config.PageParam; import com.muyu.market.domian.req.DefinedReq; import com.muyu.master.mapper.DefinedMapper; @@ -34,25 +35,5 @@ public class DefinedServiceImpl private DefinedService definedService; - @Override - public List selectList(DefinedReq definedReq) { - /**模糊查询 名称**/ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.like( - StringUtils.isNotEmpty(definedReq.getDefinedName()), - Defined::getDefinedName,definedReq.getDefinedName() - ); - - /**模糊查询 有效期**/ - queryWrapper.like( - StringUtils.isNotEmpty(String.valueOf(definedReq.getDefinedDateValidity())), - Defined::getDefinedDateValidity, - definedReq.getDefinedDateValidity() - ); - - List list = this.list(queryWrapper); - - return null; - } } From 8b5d3cb5ea6e2c9bebca02bb47fd495780061ed2 Mon Sep 17 00:00:00 2001 From: 86173 <3139166962@qq.com> Date: Fri, 23 Aug 2024 10:03:39 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=A0=E9=99=A4c00db4a90e9d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/muyu/master/controller/DefinedController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java b/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java index dc8c3f7..57d997e 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java +++ b/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java @@ -46,6 +46,8 @@ public class DefinedController { @Autowired private DefinedService definedService; + + /** * 接口列表 */ From a1044924b5cb85ef8fbe76e563dd34ed9c0c579b Mon Sep 17 00:00:00 2001 From: 86173 <3139166962@qq.com> Date: Fri, 23 Aug 2024 10:19:05 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/master/controller/DefinedController.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java b/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java index 0c4c060..81e8cff 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java +++ b/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java @@ -70,15 +70,7 @@ public class DefinedController { ); PageParampageDTO=definedService.page(page,queryWrapper); - List list = pageDTO.getRecords(); - - list.stream() - .map(Defined::getDefinedId) - .collect(Collectors.toList()); - - return Result.success( - pageDTO - ); + return Result.success(pageDTO); } From faccb76a7539ff94365b275f09c8e5aeacce9d89 Mon Sep 17 00:00:00 2001 From: 86173 <3139166962@qq.com> Date: Fri, 23 Aug 2024 10:25:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../master/controller/DefinedController.java | 7 ++--- .../muyu/master/service/DefinedService.java | 3 -- .../service/impl/DefinedServiceImpl.java | 28 ++----------------- 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java b/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java index 81e8cff..0432a51 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java +++ b/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java @@ -3,7 +3,7 @@ package com.muyu.master.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.dtflys.forest.springboot.annotation.ForestScannerRegister; import com.muyu.common.core.domain.Result; -import com.muyu.common.security.annotation.RequiresPermissions; + import com.muyu.market.domian.Defined; import com.muyu.market.domian.config.PageParam; import com.muyu.market.domian.req.DefinedReq; @@ -17,9 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.List; -import java.util.stream.Collectors; - /** * @Author：ChenYan * @Project：2112-cloud-market @@ -65,7 +62,7 @@ public class DefinedController { /**模糊查询 有效期**/ queryWrapper.like( StringUtils.isNotEmpty(String.valueOf(definedReq.getDefinedDateValidity())), - Defined::getDefinedDateValidity, + Defined::getDefinedDataValidity, definedReq.getDefinedDateValidity() ); diff --git a/cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java b/cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java index 7e090d5..4c0544d 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java +++ b/cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java @@ -2,9 +2,7 @@ package com.muyu.master.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.market.domian.Defined; -import com.muyu.market.domian.req.DefinedReq; -import java.util.List; /** * @Author：ChenYan @@ -16,7 +14,6 @@ import java.util.List; */ public interface DefinedService extends IService { - List selectList(DefinedReq definedReq); } diff --git a/cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java b/cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java index 73ca808..b83b806 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java +++ b/cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java @@ -1,18 +1,17 @@ package com.muyu.master.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.market.domian.Defined; -import com.muyu.market.domian.req.DefinedReq; + import com.muyu.master.mapper.DefinedMapper; import com.muyu.master.service.DefinedService; -import io.micrometer.common.util.StringUtils; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; /** * @Author：ChenYan @@ -32,25 +31,4 @@ public class DefinedServiceImpl - @Override - public List selectList(DefinedReq definedReq) { - - /**模糊查询 名称**/ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.like( - StringUtils.isNotEmpty(definedReq.getDefinedName()), - Defined::getDefinedName,definedReq.getDefinedName() - ); - - /**模糊查询 有效期**/ - queryWrapper.like( - StringUtils.isNotEmpty(String.valueOf(definedReq.getDefinedDateValidity())), - Defined::getDefinedDataValidity, - definedReq.getDefinedDateValidity() - ); - - List list = this.list(queryWrapper); - - return list; - } } From 5f438eb78cd178811f814a6582404872bb7b7eef Mon Sep 17 00:00:00 2001 From: 86173 <3139166962@qq.com> Date: Fri, 23 Aug 2024 10:41:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/master/controller/DefinedController.java | 4 ++-- .../com/muyu/master/controller/LogsController.java | 14 +++++++++++--- .../java/com/muyu/master/service/LogsService.java | 1 - .../muyu/master/service/impl/LogsServiceImpl.java | 11 ----------- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java b/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java index 0432a51..09b81d9 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java +++ b/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java @@ -45,10 +45,10 @@ public class DefinedController { /** - * 接口列表 + * 接口列表 分页 */ @RequestMapping(path = "/list",method = RequestMethod.POST) - @Operation(summary = "查询",description = "根据接口的名称、编码，是否开启等可以进行筛选") + @Operation(summary = "查询",description = "根据接口的名称 有效期 等可以进行筛选") public Result> selectList(PageParam page, @Validated @RequestBody DefinedReq definedReq) { diff --git a/cloud-market-server/src/main/java/com/muyu/master/controller/LogsController.java b/cloud-market-server/src/main/java/com/muyu/master/controller/LogsController.java index 8934c2e..aecac59 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/controller/LogsController.java +++ b/cloud-market-server/src/main/java/com/muyu/master/controller/LogsController.java @@ -1,8 +1,12 @@ package com.muyu.master.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.common.core.domain.Result; +import com.muyu.market.domian.Defined; import com.muyu.market.domian.Logs; +import com.muyu.market.domian.config.PageParam; import com.muyu.master.service.LogsService; +import io.micrometer.common.util.StringUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.log4j.Log4j2; @@ -26,9 +30,13 @@ public class LogsController { */ @Operation(summary = "查询日志列表",description = "查询用户操作日志列表") @GetMapping("/list") - public Result> show(){ - List list=service.showList(); - return Result.success(list); + public Result> show(PageParampage,String getLogsId){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(getLogsId)){ + queryWrapper.select(Logs::getLogsId);//根据用户id查询 + } + PageParam pageDTO=service.page(page,queryWrapper); + return Result.success(pageDTO); } /** diff --git a/cloud-market-server/src/main/java/com/muyu/master/service/LogsService.java b/cloud-market-server/src/main/java/com/muyu/master/service/LogsService.java index 26e34c9..15bc2d6 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/service/LogsService.java +++ b/cloud-market-server/src/main/java/com/muyu/master/service/LogsService.java @@ -8,6 +8,5 @@ import java.util.List; public interface LogsService extends IService { - List showList(); } diff --git a/cloud-market-server/src/main/java/com/muyu/master/service/impl/LogsServiceImpl.java b/cloud-market-server/src/main/java/com/muyu/master/service/impl/LogsServiceImpl.java index 39929f1..9b1147e 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/service/impl/LogsServiceImpl.java +++ b/cloud-market-server/src/main/java/com/muyu/master/service/impl/LogsServiceImpl.java @@ -19,16 +19,5 @@ public class LogsServiceImpl @Autowired private LogsMapper mapper; - @Override - public List showList() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.select(Logs::getLogsId);//根据用户id查询 - List list = this.list(); - - list.stream().map(Logs::getLogsId).collect(Collectors.toSet()); - return this.list(queryWrapper) - .stream() - .toList(); - } }