From a8a707e602d644f3207b077d55bfad1a7c3642b7 Mon Sep 17 00:00:00 2001
From: LHN <31457034@qq.com>
Date: 星期三, 19 十月 2022 17:47:48 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
index 49847da..41398fd 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -163,7 +163,7 @@
if (!permissionConfig.check(MenuEnum.XIXUN_PROGRAM_PLAYING.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.success(xiXunPlayerService.getByPid(lightemitId));
+ return ResponseUtil.success(poleLightemitService.getProgram(lightemitId));
}
@@ -457,8 +457,23 @@
if (!permissionConfig.check(MenuEnum.XIXUN_PLAN_PUSH_SCHEDULE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- scheduleService.ledschedulepush(id, lightemitIds);
- return ResponseUtil.success("璁剧疆鎴愬姛");
+ return ResponseUtil.success(scheduleService.ledschedulepush(id, lightemitIds));
+ }
+
+ /**
+ * 娓呯┖瀹氭椂
+ *
+ * @param
+ * @param lightemitIds
+ * @return
+ */
+ @PostMapping("/deletePushSchedule")
+ public ResponseVO<Object> deletePushSchedule( @RequestBody Long[] lightemitIds) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_PLAN_PUSH_SCHEDULE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+
+ return ResponseUtil.success(scheduleService.deleteSchedulePush( lightemitIds));
}
/**
@@ -488,15 +503,15 @@
/**
* 鍏抽棴澶╂皵鎺ㄩ��
*/
- @GetMapping("/closeWeatherPush/{id}")
- public ResponseVO<Object> closeWeatherPush(@PathVariable Long id) {
+ @GetMapping("/closeWeatherPush/{poleId}")
+ public ResponseVO<Object> closeWeatherPush(@PathVariable Long poleId) {
if (!permissionConfig.check(MenuEnum.XIXUN_CLOSE_AIR.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- if (id == null) {
- throw new BusinessException("鏈�夋嫨LED灞�");
+ if (poleId == null) {
+ throw new BusinessException("鐏潌id涓嶈兘涓虹┖!");
}
- SpringContextHolder.getBean(PoleService.class).closeXiXunAirPush(id);
+ SpringContextHolder.getBean(PoleService.class).closeXiXunAirPush(poleId);
return ResponseUtil.success("鍏抽棴鎴愬姛");
}
--
Gitblit v1.9.3