From 6124565fc7edeb1ff49aebd87711c176a6f2f38e Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 31 十二月 2021 16:48:37 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 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 29df733..ca0fca9 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,18 +1,18 @@
package com.sandu.ximon.admin.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.sandu.common.domain.ResponseVO;
-import com.sandu.common.security.annotation.AnonymousAccess;
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.service.LEDProgramService;
+import com.sandu.ximon.dao.domain.LEDProgram;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
- * led鑺傜洰
+ * LED鑺傜洰澶勭悊
*/
@RestController
@AllArgsConstructor
@@ -20,26 +20,51 @@
public class LEDProgramController {
private final LEDProgramService ledProgramService;
- @GetMapping("/add")
- public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramParam ledProgramParam) {
+ @PostMapping("/add")
+ public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramParam ledProgramParam) {
return ResponseUtil.success(ledProgramService.addProgram(ledProgramParam));
}
- @GetMapping("/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));
}
- @GetMapping("/delete/{id}")
- public ResponseVO<Object> deleteLEDProgram(@PathVariable Long id) {
- return ResponseUtil.success(ledProgramService.deleteProgram(id));
+ @PostMapping("/delete/{pid}")
+ public ResponseVO<Object> deleteLEDProgram(@PathVariable Long pid) {
+ return ResponseUtil.success(ledProgramService.deleteProgram(pid));
}
-
- @PostMapping("/list")
+ @GetMapping("/list")
public ResponseVO<Object> listProgram() {
- return ResponseUtil.success(ledProgramService.list());
+ //LambdaQueryWrapper<LEDProgram> wrapper = ledProgramService.listProgram();
+ return ResponseUtil.success(ledProgramService.list(ledProgramService.listProgram()));
+
+ }
+
+ /**
+ * 妯＄硦鏌ヨ
+ *
+ * @return
+ */
+ @GetMapping("/listLike")
+ public ResponseVO<Object> listLikeProgram(@RequestBody ReceiveParam receiveParam) {
+ LambdaQueryWrapper<LEDProgram> wrapper = ledProgramService.listProgram();
+ if (receiveParam.getKind() != null || receiveParam.getName() != null) {
+
+ wrapper.like(LEDProgram::getName, receiveParam.getName())
+ .or(
+ ledProgramLambdaQueryWrapper -> {
+ ledProgramLambdaQueryWrapper.like(LEDProgram::getKind, receiveParam.getKind());
+ }
+ );
+
+ }
+
+ // List<LEDProgram> list = ledProgramService.list(wrapper);
+ return ResponseUtil.success(ledProgramService.list(wrapper));
+
}
}
--
Gitblit v1.9.3