From f37d9ab49c0e3488a05a97d369e19e027d9fd37c Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 24 十一月 2022 10:28:09 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/program/LEDInfoParam.java | 20 ++++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedService.java | 73 ++++++++++++++++++++++++++++++------
ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedController.java | 13 ++++++
dao/src/main/java/com/sandu/ximon/dao/domain/NewNovaLed.java | 2
4 files changed, 95 insertions(+), 13 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/NewNovaLed.java b/dao/src/main/java/com/sandu/ximon/dao/domain/NewNovaLed.java
index 94d2821..6d4b0f2 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/NewNovaLed.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/NewNovaLed.java
@@ -102,7 +102,7 @@
* 鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� -1 鍚屾澶辫触
*/
@TableField(exist = false)
- private Integer sync = 0;
+ private Integer sync = -1;
/**
* 灞忓箷瀹�
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedController.java
index fb5de04..95f9113 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedController.java
@@ -7,6 +7,7 @@
import com.sandu.ximon.admin.newnova.grouping.NewNovaGroupService;
import com.sandu.ximon.admin.newnova.param.NewNovaLedParam;
import com.sandu.ximon.admin.newnova.param.NewNovaStatusParam;
+import com.sandu.ximon.admin.newnova.program.LEDInfoParam;
import com.sandu.ximon.admin.newnova.utils.NovaAPIUtil;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -83,6 +84,18 @@
return ResponseUtil.success(newNovaLedService.listLed(baseConditionVO, keyword, groupId, onlineStatus));
}
+
+ /**
+ * 鐘舵�佸垪琛�
+ */
+ @PostMapping("/ledInfo")
+ public ResponseVO ledInfo(@RequestBody LEDInfoParam param) {
+ if (!permissionConfig.check(MenuEnum.LED_NEW_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(newNovaLedService.infoList(param));
+ }
+
/**
* 璇︾粏淇℃伅
*
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedService.java
index 415787c..f0ce6f0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedService.java
@@ -11,6 +11,7 @@
import com.sandu.ximon.admin.newnova.conf.ProgramPathConfig;
import com.sandu.ximon.admin.newnova.param.NewNovaLedParam;
import com.sandu.ximon.admin.newnova.param.ProgramPrarm;
+import com.sandu.ximon.admin.newnova.program.LEDInfoParam;
import com.sandu.ximon.admin.newnova.program.NewNovaProgramService;
import com.sandu.ximon.admin.newnova.utils.NovaAPIUtil;
import com.sandu.ximon.admin.newnova.vo.ProWHVO;
@@ -129,20 +130,8 @@
List<NewNovaLed> newNovaListBos = baseMapper.listLed(keyword, groupId, SecurityUtils.getClientId());
//鑾峰彇鍦ㄧ嚎鐘舵��
List<NewNovaLed> onLine = instanceUtil.getOnlineStatus(newNovaListBos, onlineStatus);
- //鑾峰彇灞忓箷寮�鍏�
- instanceUtil.getScreenPowerState(onLine);
- //鑾峰彇闊抽噺
- instanceUtil.getVolumeState(onLine);
- //鑾峰彇浜害
- instanceUtil.getScreenBrightness(onLine);
- //鑾峰彇鍚屾鐘舵��
- instanceUtil.getSync(onLine);
//鑾峰彇鍒嗚鲸鐜�
instanceUtil.getDisplayInfoAsync(onLine);
- //鑾峰彇鏃跺尯
- instanceUtil.getTimezone(onLine);
- //鑾峰彇瑙嗛婧�
- instanceUtil.getVideoInfoAsync(onLine);
updateBatchById(onLine);
return onLine;
@@ -390,4 +379,64 @@
}
+ /**
+ * 鑾峰彇鐘舵�佷俊鎭�
+ *
+ * @param param
+ * @return
+ */
+ public Object infoList(LEDInfoParam param) {
+
+ NovaAPIUtil instanceUtil = NovaAPIUtil.getInstanceUtil();
+
+ List<NewNovaLed> newNovaLeds = listByIds(param.getLedIds());
+ param.setLedList(newNovaLeds);
+
+ switch (param.getType()) {
+ case "all":
+ //鑾峰彇灞忓箷寮�鍏�
+ instanceUtil.getScreenPowerState(param.getLedList());
+ //鑾峰彇闊抽噺
+ instanceUtil.getVolumeState(param.getLedList());
+ //鑾峰彇浜害
+ instanceUtil.getScreenBrightness(param.getLedList());
+ //鑾峰彇鍚屾鐘舵��
+ instanceUtil.getSync(param.getLedList());
+ //鑾峰彇鍒嗚鲸鐜�
+ instanceUtil.getDisplayInfoAsync(param.getLedList());
+ //鑾峰彇鏃跺尯
+ instanceUtil.getTimezone(param.getLedList());
+ //鑾峰彇瑙嗛婧�
+ instanceUtil.getVideoInfoAsync(param.getLedList());
+ break;
+ case "volumeValue":
+ //鑾峰彇闊抽噺
+ instanceUtil.getVolumeState(param.getLedList());
+ break;
+ case "brightnessValue":
+ //鑾峰彇浜害
+ instanceUtil.getScreenBrightness(param.getLedList());
+ break;
+ case "videoSourceValue":
+ //鑾峰彇瑙嗛婧�
+ instanceUtil.getVideoInfoAsync(param.getLedList());
+ break;
+ case "timeValue":
+ //鑾峰彇鏃跺尯
+ instanceUtil.getTimezone(param.getLedList());
+ break;
+ case "screenPowerStatus":
+ //鑾峰彇灞忓箷寮�鍏�
+ instanceUtil.getScreenPowerState(param.getLedList());
+ break;
+ case "syncPlayStatus":
+ //鑾峰彇鍚屾鐘舵��
+ instanceUtil.getSync(param.getLedList());
+ break;
+ default:
+ }
+
+
+ return param.getLedList();
+ }
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/program/LEDInfoParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/program/LEDInfoParam.java
new file mode 100644
index 0000000..54b758f
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/program/LEDInfoParam.java
@@ -0,0 +1,20 @@
+package com.sandu.ximon.admin.newnova.program;
+
+import com.sandu.ximon.dao.domain.NewNovaLed;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author LiuHaoNan
+ * @date 2022/11/23
+ */
+@Data
+public class LEDInfoParam {
+
+ private List<NewNovaLed> ledList;
+
+ private List<Long> ledIds;
+
+ private String type;
+}
--
Gitblit v1.9.3