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] =?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<PageParam<Defined>> selectList(PageParam<Defined> 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<List<Logs>> show(){
-        List<Logs> list=service.showList();
-        return Result.success(list);
+    public Result<PageParam<Logs>> show(PageParam<Logs>page,String getLogsId){
+        LambdaQueryWrapper<Logs> queryWrapper = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotEmpty(getLogsId)){
+            queryWrapper.select(Logs::getLogsId);//根据用户id查询
+        }
+        PageParam<Logs> 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<Logs> {
 
-    List<Logs> 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<Logs> showList() {
 
-        LambdaQueryWrapper<Logs> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select(Logs::getLogsId);//根据用户id查询
-        List<Logs> list = this.list();
-
-        list.stream().map(Logs::getLogsId).collect(Collectors.toSet());
-        return this.list(queryWrapper)
-                .stream()
-                .toList();
-    }
 }