From e947320e6604a12f5fd6e323b0a885b9a77c1e95 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 29 八月 2022 18:09:24 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java | 88 +++++++++++++++++++++++++-------------------
1 files changed, 50 insertions(+), 38 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 fb4025e..937d537 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
@@ -10,10 +10,7 @@
import com.sandu.ximon.admin.dto.nova.PlayerWidget;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.admin.utils.RedisUtils;
-import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
-import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
-import com.sandu.ximon.admin.utils.VnnoxProgramAPIUtil;
+import com.sandu.ximon.admin.utils.*;
import com.sandu.ximon.admin.utils.request.VnnoxScreenStatusType;
import com.sandu.ximon.admin.utils.response.VnnoxPlayerListResponse;
import com.sandu.ximon.admin.utils.response.VnnoxPlayerResponse;
@@ -503,43 +500,46 @@
* @param list
* @return
*/
- public List<LedPlayerEntity> setCacheInfo(List<LedPlayerEntity> 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) {
- screenStatus = Integer.parseInt(result);
- }
- cache.setScreenStatus(screenStatus);
- // 璁剧疆灞忓箷闊抽噺
- result = redisUtils.get(VnnoxConstant.REDIS_VOL + playerId);
- Integer vol = 0;
- if (null != result) {
- vol = Integer.parseInt(result);
- }
- cache.setVol(vol);
- // 璁剧疆灞忓箷浜害
- result = redisUtils.get(VnnoxConstant.REDIS_BRIGHTNESS + playerId);
- Integer brightness = 0;
- if (null != result) {
- brightness = Integer.parseInt(result);
- }
- cache.setBrightness(brightness);
+ public List<LedPlayerEntity> setCacheInfo(List<LedPlayerEntity> ledList) {
+ List<List<LedPlayerEntity>> split = CollectionUtil.split(ledList, 100);
+ for (List<LedPlayerEntity> list : split) {
+ 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) {
+ screenStatus = Integer.parseInt(result);
+ }
+ cache.setScreenStatus(screenStatus);
+ // 璁剧疆灞忓箷闊抽噺
+ result = redisUtils.get(VnnoxConstant.REDIS_VOL + playerId);
+ Integer vol = 0;
+ if (null != result) {
+ vol = Integer.parseInt(result);
+ }
+ cache.setVol(vol);
+ // 璁剧疆灞忓箷浜害
+ result = redisUtils.get(VnnoxConstant.REDIS_BRIGHTNESS + playerId);
+ Integer brightness = 0;
+ if (null != result) {
+ brightness = Integer.parseInt(result);
+ }
+ cache.setBrightness(brightness);
- // 璁剧疆缂╃暐鍥捐闂矾寰�
- result = redisUtils.get(VnnoxConstant.REDIS_SCREEN_SHOT + playerId);
- if (null != result) {
- playerEntity.setScreenShotUrl(result);
- } else {
- playerEntity.setScreenShotUrl("");
- }
+ // 璁剧疆缂╃暐鍥捐闂矾寰�
+ result = redisUtils.get(VnnoxConstant.REDIS_SCREEN_SHOT + playerId);
+ if (null != result) {
+ playerEntity.setScreenShotUrl(result);
+ } else {
+ playerEntity.setScreenShotUrl("");
+ }
- playerEntity.setPlayerInfo(cache);
+ playerEntity.setPlayerInfo(cache);
+ }
}
- return list;
+ return ledList;
}
@@ -588,4 +588,16 @@
return widgetList;
}
+
+ /**
+ * 鏇存柊璇虹摝灞忓箷鍒嗚鲸鐜�
+ */
+ public void saveInfo() {
+ List<LedPlayerEntity> list = vnnoxAPIUtil.saveCurrentInfo(ledPlayerEntityService.list());
+ boolean b = SpringContextHolder.getBean(LedPlayerEntityService.class).updateBatchById(list);
+ if (b) {
+ LogUtils.error("鏇存柊璇虹摝灞忓箷鍒嗚鲸鐜囨垚鍔�");
+ }
+ }
+
}
--
Gitblit v1.9.3