From 35b68d05c92ae1eab2e409529a070a217ba492ae Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 25 四月 2022 09:53:23 +0800
Subject: [PATCH] fix 客户列表bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
index c861d80..b483757 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
@@ -1,9 +1,7 @@
package com.sandu.ximon.admin.service;
import com.sandu.common.execption.BusinessException;
-import com.sandu.common.log.Log;
import com.sandu.ximon.admin.config.VnnoxConstant;
-import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.admin.utils.request.VnnoxScreenStatusType;
@@ -186,14 +184,38 @@
return map;
}
+// //閲嶅惎
+// public VnnoxResult reboot(List<LedPlayerEntity> playerList) {
+// return vnnoxAPIUtil.reboot(
+// playerList.stream().map(
+// item -> item.getPlayerId()
+// ).collect(Collectors.toList())
+// );
+// }
+
//閲嶅惎
- public VnnoxResult reboot(List<LedPlayerEntity> playerList) {
- return vnnoxAPIUtil.reboot(
- playerList.stream().map(
- item -> item.getPlayerId()
- ).collect(Collectors.toList())
- );
+ public VnnoxResult reboot(List<String> playerList) {
+ return vnnoxAPIUtil.reboot(playerList);
}
+
+ /**
+ * 鍚屾鎾斁
+ * @param
+ * @return
+ */
+ public VnnoxResult syncPlay(List<String> playerList,Integer option) {
+ return vnnoxAPIUtil.syncPlay(playerList,option);
+ }
+
+ /**
+ * 瀵规椂
+ * @param
+ * @return
+ */
+ public VnnoxResult ntpSync(List<String> playerList,boolean enable) {
+ return vnnoxAPIUtil.ntpSync(playerList,enable);
+ }
+
public boolean updateDataName(Long id, String name) {
LedPlayerEntity byId = ledPlayerEntityService.getById(id);
@@ -208,39 +230,40 @@
/**
* 鑾峰彇缂撳瓨鏁版嵁
+ *
* @param list
* @return
*/
public List<LedPlayerEntity> setCacheInfo(List<LedPlayerEntity> list) {
- for(LedPlayerEntity playerEntity: list) {
+ for (LedPlayerEntity playerEntity : list) {
String playerId = playerEntity.getPlayerId();
LedPlayerInfoEntity cache = new LedPlayerInfoEntity();
// 璁剧疆灞忓箷鐘舵��
String result = redisUtils.get(VnnoxConstant.REDIS_SCREEN_STATUS + playerId);
Integer screenStatus = 1;
- if(null != result) {
+ if (null != result) {
screenStatus = Integer.parseInt(result);
}
cache.setScreenStatus(screenStatus);
// 璁剧疆灞忓箷闊抽噺
result = redisUtils.get(VnnoxConstant.REDIS_VOL + playerId);
Integer vol = 0;
- if(null != result) {
+ if (null != result) {
vol = Integer.parseInt(result);
}
cache.setVol(vol);
// 璁剧疆灞忓箷浜害
result = redisUtils.get(VnnoxConstant.REDIS_BRIGHTNESS + playerId);
Integer brightness = 0;
- if(null != result) {
+ if (null != result) {
brightness = Integer.parseInt(result);
}
cache.setBrightness(brightness);
// 璁剧疆缂╃暐鍥捐闂矾寰�
result = redisUtils.get(VnnoxConstant.REDIS_SCREEN_SHOT + playerId);
- System.out.println(playerId+"鐨勮矾寰勭粨鏋�:-----------------------------"+result);
- if(null != result) {
+ System.out.println(playerId + "鐨勮矾寰勭粨鏋�:-----------------------------" + result);
+ if (null != result) {
playerEntity.setScreenShotUrl(result);
} else {
playerEntity.setScreenShotUrl("");
@@ -250,6 +273,4 @@
}
return list;
}
-
-
}
--
Gitblit v1.9.3