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/XiXunController.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 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 31da7b0..8bb5178 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
@@ -12,6 +12,7 @@
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.entity.ProgramPro;
import com.sandu.ximon.admin.param.LEDScheduleParam_xixun;
+import com.sandu.ximon.admin.param.SetBrightnessParam;
import com.sandu.ximon.admin.param.SetScreenOpenParam;
import com.sandu.ximon.admin.param.SetVolumeParam;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -23,7 +24,6 @@
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
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.*;
@@ -63,7 +63,7 @@
*/
@PostMapping("/updateProgram")
// @RequiresPermissions("pole:polexixunplayer:update")
- public ResponseVO<Object> update(@RequestBody ProgramPro programPro) {
+ public ResponseVO<Object> update(@RequestBody ProgramPro programPro) {
PoleXixunPlayerEntity byId = xiXunPlayerService.getById(programPro.getProgramId());
if (byId == null) {
throw new BusinessException("鏈�夋嫨LED灞�");
@@ -144,8 +144,8 @@
* @param lightemitIds
* @return
*/
- @GetMapping("/pushToXixun/{pid}")
- public ResponseVO<Object> getByPid(@PathVariable Long pid, @RequestBody List<Long> lightemitIds) {
+ @PostMapping("/pushToXixun/{pid}")
+ public ResponseVO<Object> pushByPid(@PathVariable Long pid, @RequestBody List<Long> lightemitIds) {
xiXunPlayerService.videoXixunPlayer(pid, lightemitIds);
return ResponseUtil.success("鎺ㄩ�佹垚鍔�");
}
@@ -280,6 +280,17 @@
// return ResponseUtil.success(poleLightemitService.list(wrapper));
}
+ /**
+ *
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/getbycode")
+ public ResponseVO<Object> getLedByLightControlCode(String lightemitControlCode) {
+ return ResponseUtil.success(poleLightemitService.getLedByLightControlCode(lightemitControlCode));
+ }
+
/*
璁剧疆灞忓箷寮�鍏�
*/
@@ -350,8 +361,31 @@
/*
- 璁剧疆闊抽噺
+ 璁剧疆浜害
*/
+ @PostMapping("/setBrightness")
+ public ResponseVO<Object> setBrightness(@RequestBody SetBrightnessParam setBrightnessParam) {
+
+ if (setBrightnessParam == null || setBrightnessParam.getIds() == null || setBrightnessParam.getBrightness() > 255) {
+ throw new BusinessException("鍙傛暟閿欒涓虹┖鎴栦寒搴︿笉鑳借秴杩�255");
+ }
+
+ Collection poleLightemitControllers = poleLightemitService.listByIds(Arrays.asList(setBrightnessParam.getIds()));
+ if (!poleLightemitControllers.isEmpty()) {
+ Iterator iterator = poleLightemitControllers.iterator();
+ while (iterator.hasNext()) {
+ PoleLightemitEntity poleLightemitEntity = (PoleLightemitEntity) iterator.next();
+ poleLightemitService.setBrightness(poleLightemitEntity.getLightemitControlCode(), setBrightnessParam.getBrightness());
+ }
+ return ResponseUtil.success("璁剧疆浜害鎴愬姛");
+ } else {
+ throw new BusinessException("鏈�夋嫨LED灞�");
+ }
+ }
+
+ /*
+ 璁剧疆闊抽噺
+ */
@PostMapping("/setVolume")
public ResponseVO<Object> setVolume(@RequestBody SetVolumeParam setVolumeEntity) {
@@ -414,4 +448,6 @@
}
+
+
}
--
Gitblit v1.9.3