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 | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 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 c14faeb..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,26 +1,20 @@
package com.sandu.ximon.admin.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
-import com.sandu.common.security.annotation.AnonymousAccess;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.param.GroupParam;
import com.sandu.ximon.admin.param.LEDProgramParam;
-import com.sandu.ximon.admin.param.LampPostParam;
import com.sandu.ximon.admin.param.ReceiveParam;
-import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.LEDProgramService;
import com.sandu.ximon.dao.domain.LEDProgram;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.List;
-
/**
- * led鑺傜洰
+ * LED鑺傜洰澶勭悊
*/
@RestController
@AllArgsConstructor
@@ -30,26 +24,34 @@
@PostMapping("/add")
public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramParam ledProgramParam) {
- // public ResponseVO<Object> addLEDProgram(@RequestParam(name = "name") @Validated String name,@RequestParam(name = "kind") @Validated Integer kind,@RequestParam(name = "programBase64") @Validated String programBase64) {
return ResponseUtil.success(ledProgramService.addProgram(ledProgramParam));
- //return ResponseUtil.success(ledProgramService.addProgram(name,kind,programBase64));
}
- @PostMapping("/update")
- public ResponseVO<Object> updateLEDProgram(@RequestBody @Validated LEDProgramParam ledProgramParam) {
- return ResponseUtil.success(ledProgramService.updateProgram(ledProgramParam));
+ @PostMapping("/update/{pid}")
+ public ResponseVO<Object> updateLEDProgram(@PathVariable Long pid, @RequestBody @Validated LEDProgramParam ledProgramParam) {
+ return ResponseUtil.success(ledProgramService.updateProgram(pid,ledProgramParam));
}
- @PostMapping("/delete/{id}")
- public ResponseVO<Object> deleteLEDProgram(@PathVariable Long id) {
- return ResponseUtil.success(ledProgramService.deleteProgram(id));
+ @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));
}
@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));
}
@@ -72,7 +74,7 @@
}
- // List<LEDProgram> list = ledProgramService.list(wrapper);
+ // List<LEDProgram> list = ledProgramService.list(wrapper);
return ResponseUtil.success(ledProgramService.list(wrapper));
}
--
Gitblit v1.9.3