From d65594e37be2179b60cdc1730819ff156b39639c Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 13 四月 2022 18:16:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 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 7fc29c9..6f3c548 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,12 +1,25 @@
package com.sandu.ximon.admin.controller;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+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.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.PlayPlanParam;
+import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.PlayPlanNvService;
+import com.sandu.ximon.dao.domain.Client;
+import com.sandu.ximon.dao.domain.PlayPlanNv;
+import com.sandu.ximon.dao.enums.AdministratorEnums;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
/**
* @Author liuhaonan
@@ -24,18 +37,43 @@
return ResponseUtil.success(playPlanNvService.addPlan(param));
}
- @PostMapping("/update")
- public ResponseVO<Object> updateLEDPlan(@RequestBody @Validated Long planId, PlayPlanParam 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("/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<>();//
+ if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
+ wrapper = Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getUserId, SecurityUtils.getUserId());
+ }
+ wrapper = Wrappers.lambdaQuery(PlayPlanNv.class);
+ if (StrUtil.isNotBlank(keyword)) {
+ wrapper.like(PlayPlanNv::getName, keyword);
+ }
+ List<PlayPlanNv> list = playPlanNvService.list(wrapper);
+ //PlayPlanParam param=new PlayPlanParam();
+ list.forEach(plan -> {
+ plan.setPlan(JSON.parseObject(plan.getSchedule(), Map.class));
+ });
+ return ResponseUtil.successPage(list);
+ }
+
}
--
Gitblit v1.9.3