From 09afe52c3ef2a09055fb621b25aa5416394a5382 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 14 十月 2022 16:59:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 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 d866093..16a2b10 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
@@ -65,12 +65,19 @@
return ResponseUtil.success(playPlanNvService.deletePlan(plianIds));
}
- @PostMapping(value = "/push/{plianId}", produces = "application/json;charset=UTF-8")
- public ResponseVO<Object> pushToLed(@PathVariable Long plianId, @RequestBody List<NovaPushResultVO> playerIds) {
+ /**
+ * 瀹氭椂鑺傜洰
+ *
+ * @param planId
+ * @param playerIds
+ * @return
+ */
+ @PostMapping(value = "/push/{planId}", produces = "application/json;charset=UTF-8")
+ public ResponseVO<Object> pushToLed(@PathVariable Long planId, @RequestBody List<NovaPushResultVO> playerIds) {
if (!permissionConfig.check(MenuEnum.LED_N_PLAY_PLAN_PUSH.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.success(playPlanNvService.pushToLed(plianId, playerIds));
+ return ResponseUtil.success(playPlanNvService.pushToLed(planId, playerIds));
}
@@ -83,6 +90,13 @@
}
+ /**
+ * 瀹炴椂鑺傜洰
+ *
+ * @param pid
+ * @param playerIds
+ * @return
+ */
@PostMapping(value = "/pushProgram/{pid}", produces = "application/json;charset=UTF-8")
public ResponseVO<Object> pushProgram(@PathVariable Long pid, @RequestBody List<NovaPushResultVO> playerIds) {
if (!permissionConfig.check(MenuEnum.LED_N_PLAY_PLAN_PUSH.getCode())) {
@@ -91,21 +105,6 @@
return ResponseUtil.success(playPlanNvService.pushProgram(pid, playerIds));
}
- @PostMapping(value = "/pushWeather/{pid}", produces = "application/json;charset=UTF-8")
- public ResponseVO<Object> pushWeather(@PathVariable Long pid, @RequestBody List<NovaPushResultVO> playerIds) {
- if (!permissionConfig.check(MenuEnum.LED_N_PLAY_PLAN_PUSH.getCode())) {
- return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
- }
- return ResponseUtil.success(playPlanNvService.pushProgram(pid, playerIds));
- }
-
- @PostMapping(value = "/pushWeatherPlan/{id}", produces = "application/json;charset=UTF-8")
- public ResponseVO<Object> pushWeatherPlan(@PathVariable Long id, @RequestBody List<NovaPushResultVO> playerIds) {
- if (!permissionConfig.check(MenuEnum.LED_N_PLAY_PLAN_PUSH.getCode())) {
- return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
- }
- return ResponseUtil.success(playPlanNvService.pushWeatherToLed(id, playerIds));
- }
@GetMapping("/listPlan")
public ResponseVO<Object> list(BaseConditionVO baseConditionVO,
--
Gitblit v1.9.3