From 58a72f5b844bc77490431fc66bad0be45ce90bd2 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 09 五月 2022 09:56:44 +0800
Subject: [PATCH] Changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 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 414ab56..2b72e00 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
@@ -7,6 +7,7 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.entity.ProgramPro;
@@ -237,6 +238,7 @@
璁剧疆灞忓箷寮�鍏�
*/
+ @AnonymousAccess
@PostMapping("/setScreenOpen")
public ResponseVO<Object> setScreenOpen(@RequestBody SetScreenOpenParam setScreenOpenEntity) {
if (setScreenOpenEntity.getIds() == null || setScreenOpenEntity.getIds().length == 0 || setScreenOpenEntity.getBool() == null) {
@@ -299,6 +301,18 @@
} else {
throw new BusinessException("鏈�夋嫨LED灞�");
}
+ }
+
+
+ /**
+ * 娴嬭瘯
+ * @param
+ * @return
+ */
+ @AnonymousAccess
+ @PostMapping("/test/{str}")
+ public ResponseVO<Object> setBrightness(@PathVariable String str) {
+ return ResponseUtil.success(lightemitUtils.getIsScreenOpen(str));
}
@@ -394,17 +408,18 @@
/**
* 鑾峰彇鎵ц涓殑瀹氭椂
+ *
* @param
* @return
*/
- @GetMapping("/getPushSchedule")
+ @PostMapping("/getPushSchedule")
public ResponseVO<Object> getPushSchedule(@RequestBody List<Long> ids) {
- if(ids.isEmpty()){
+ if (ids.isEmpty()) {
throw new BusinessException("鏈�夋嫨LED灞�");
}
List<LedScheduleVO> list = new ArrayList<>();
- for(Long id : ids) {
+ for (Long id : ids) {
LedScheduleVO ledScheduleVO = scheduleService.getledschedules(id);
list.add(ledScheduleVO);
}
@@ -417,7 +432,7 @@
*/
@GetMapping("/closeWeatherPush/{id}")
public ResponseVO<Object> closeWeatherPush(@PathVariable Long id) {
- if(id==null){
+ if (id == null) {
throw new BusinessException("鏈�夋嫨LED灞�");
}
SpringContextHolder.getBean(PoleService.class).closeXiXunAirPush(id);
@@ -428,13 +443,13 @@
* 娓呭睆鎿嶄綔
*/
@GetMapping("/clearScreen")
- public ResponseVO<Object> clearScreen(@RequestBody List<String> codes) {
-
- if(codes.isEmpty()){
+ public ResponseVO<Object> clearScreen(@RequestBody List<Long> ids) {
+ List<PoleLightemitEntity> list = poleLightemitService.listByIds(ids);
+ if (ids.isEmpty() && list.isEmpty()) {
throw new BusinessException("鏈�夋嫨LED灞�");
}
- for(String playerId : codes) {
- lightemitUtils.clear(playerId);
+ for (PoleLightemitEntity playerId : list) {
+ lightemitUtils.clear(playerId.getLightemitControlCode());
}
return ResponseUtil.success("娓呭睆鎴愬姛");
}
--
Gitblit v1.9.3