From aee78de39e2d957a0c4a91f75ab9f77b03e46af3 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 13 四月 2022 14:35:17 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java | 18 +++++++++++++++---
1 files changed, 15 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..1b94ea3 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;
@@ -30,6 +32,12 @@
return ResponseUtil.success(ledProgramService.updateProgram(pid,ledProgramParam));
}
+ @GetMapping("/getbypid/{pid}")
+ public ResponseVO<Object> getByPid(@PathVariable Long pid) {
+ return ResponseUtil.success(ledProgramService.getByPid(pid));
+ }
+
+
@PostMapping("/delete/{pid}")
public ResponseVO<Object> deleteLEDProgram(@PathVariable Long pid) {
return ResponseUtil.success(ledProgramService.deleteProgram(pid));
@@ -37,9 +45,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