From da6ea6d775461e6d56eb50cbdd79e6ba3b8f41e4 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 01 三月 2022 14:22:30 +0800
Subject: [PATCH] 灯杆绑定设备，解绑设备
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
index 9900034..f95571e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.controller;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
@@ -15,6 +16,8 @@
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* @Author liuhaonan
@@ -32,21 +35,26 @@
return ResponseUtil.success(playPlanNvService.addPlan(param));
}
+ @GetMapping("/getByPlanId/{planId}")
+ public ResponseVO<Object> getPlan(@PathVariable Long planId) {
+ return ResponseUtil.success(playPlanNvService.getByPlanId(planId));
+ }
+
@PostMapping("/update/{planId}")
public ResponseVO<Object> updateLEDPlan(@PathVariable Long planId,@RequestBody @Validated PlayPlanParam param) {
return ResponseUtil.success(playPlanNvService.updatePlan(planId, param));
}
- @PostMapping("/delete/{plianId}")
- public ResponseVO<Object> deleteLEDPlan(@PathVariable Long plianId) {
- return ResponseUtil.success(playPlanNvService.deletePlan(plianId));
+ @PostMapping("/delete")
+ public ResponseVO<Object> deleteLEDPlan(@RequestBody List<Long> plianIds) {
+ return ResponseUtil.success(playPlanNvService.deletePlan(plianIds));
}
- @PostMapping("/push/{plianId}")
- public ResponseVO<Object> pushToLed(@PathVariable Long plianId) {
- return ResponseUtil.success(playPlanNvService.pushToLed(plianId));
+ @PostMapping(value ="/push/{plianId}",produces = "application/json;charset=UTF-8")
+ public ResponseVO<Object> pushToLed(@PathVariable Long plianId,@RequestBody List<String> playerIds) {
+ return ResponseUtil.success(playPlanNvService.pushToLed(plianId,playerIds));
}
- @GetMapping("/listPaln")
+ @GetMapping("/listPlan")
public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
LambdaQueryWrapper<PlayPlanNv> wrapper = new LambdaQueryWrapper<>();//
@@ -54,7 +62,7 @@
wrapper= Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getUserId,SecurityUtils.getUserId());
}
wrapper=Wrappers.lambdaQuery(PlayPlanNv.class);
- if(null!=keyword){
+ if(StrUtil.isNotBlank(keyword)){
wrapper.like(PlayPlanNv::getName,keyword);
}
return ResponseUtil.successPage(playPlanNvService.list(wrapper));
--
Gitblit v1.9.3