From b5064f3acfc94b13dd6a7d4021552c079cf065e2 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 17 十二月 2021 11:51:49 +0800
Subject: [PATCH] 细节调整
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 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..954c05b 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,15 +1,23 @@
package com.sandu.ximon.admin.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.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鑺傜洰
@@ -20,26 +28,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) {
+ @PostMapping("/update")
+ public ResponseVO<Object> updateLEDProgram(@RequestBody @Validated LEDProgramParam ledProgramParam) {
return ResponseUtil.success(ledProgramService.updateProgram(ledProgramParam));
}
- @GetMapping("/delete/{id}")
+ @PostMapping("/delete/{id}")
public ResponseVO<Object> deleteLEDProgram(@PathVariable Long id) {
return ResponseUtil.success(ledProgramService.deleteProgram(id));
}
-
- @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