From 100c3084c55a89806825d33d8ff99de5b838f4a1 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 06 一月 2022 16:32:48 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java | 67 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 22 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 de51a84..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,17 +1,20 @@
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.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.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
@@ -19,35 +22,55 @@
public class LEDProgramController {
private final LEDProgramService ledProgramService;
- @GetMapping("/add")
- public ResponseVO<Object> addLEDProgram(@RequestBody 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 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/{pid}")
+ public ResponseVO<Object> deleteLEDProgram(@PathVariable Long pid) {
+ return ResponseUtil.success(ledProgramService.deleteProgram(pid));
}
-/* @PostMapping("/setGroup")
- public ResponseVO<Object> setGroup(@RequestBody GroupParam groupParam){
- lampPostService.setGroup(groupParam.getGroup(), groupParam.getId());
- return ResponseUtil.success("鍒嗙粍璁剧疆鎴愬姛");
- }*/
+ @GetMapping("/list")
+ 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));
- @GetMapping("/delete/{id}")
- public ResponseVO<Object> deleteLEDProgram(@PathVariable Long id) {
- return ResponseUtil.success(ledProgramService.deleteProgram(id));
}
+ /**
+ * 妯＄硦鏌ヨ
+ *
+ * @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());
+ }
+ );
- @PostMapping("/list")
- public ResponseVO<Object> listProgram() {
- //List<LampPost> list = lampPostService.list();
- return ResponseUtil.success(ledProgramService.list());
- //return ResponseUtil.success(lampPostService.listLamp());
+ }
+
+ // List<LEDProgram> list = ledProgramService.list(wrapper);
+ return ResponseUtil.success(ledProgramService.list(wrapper));
+
}
}
--
Gitblit v1.9.3