From 6fdb42abb942d258448e009bede60b2d341f5fa4 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 04 一月 2022 16:24:59 +0800
Subject: [PATCH] 功能完善

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
index ca0fca9..eba60c3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
@@ -1,7 +1,9 @@
 package com.sandu.ximon.admin.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageHelper;
 import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.LEDProgramParam;
 import com.sandu.ximon.admin.param.ReceiveParam;
@@ -37,9 +39,13 @@
 
 
     @GetMapping("/list")
-    public ResponseVO<Object> listProgram() {
-        //LambdaQueryWrapper<LEDProgram> wrapper = ledProgramService.listProgram();
-        return ResponseUtil.success(ledProgramService.list(ledProgramService.listProgram()));
+    public ResponseVO<Object> listProgram(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+        LambdaQueryWrapper<LEDProgram> wrapper = ledProgramService.listProgram();
+        if(null!=keyword){
+            wrapper.like(LEDProgram::getName,keyword);
+        }
+        return ResponseUtil.successPage(ledProgramService.list(wrapper));
 
     }
 

--
Gitblit v1.9.3