From 2e9a6554d676f5c696590b39258bd2644a8f2dc6 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期日, 09 十月 2022 10:05:27 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java | 1 +
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 11 +++++++----
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java | 8 +++++---
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index fd3dbab..f8e1e3a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -369,9 +369,9 @@
BaseConditionVO baseConditionVO = new BaseConditionVO();
baseConditionVO.setPageNo(1);
baseConditionVO.setPageSize(999);
- System.out.println("鍗曠伅鏁呴殰缁熻鏃堕棿: "+ LocalDateTime.now());
+ System.out.println("鍗曠伅鏁呴殰缁熻鏃堕棿: " + LocalDateTime.now());
CommonPage commonPage = SpringContextHolder.getBean(LightReportErrorService.class).queryErrorCode(baseConditionVO);
- System.out.println("鍗曠伅鏁呴殰缁熻鏃堕棿: "+ LocalDateTime.now());
+ System.out.println("鍗曠伅鏁呴殰缁熻鏃堕棿: " + LocalDateTime.now());
new Thread(new Runnable() {
@Override
public void run() {
@@ -379,7 +379,6 @@
AtomicInteger onLine = new AtomicInteger(0);
AtomicInteger offLine = new AtomicInteger(0);
AtomicInteger error = new AtomicInteger(commonPage.getList().size());
-
DeviceOnLineCountVO light = new DeviceOnLineCountVO();
@@ -1111,7 +1110,11 @@
if (pole == null) {
throw new BusinessException("鐏潌涓嶅瓨鍦�");
}
+
+ //涓�绾у鎴� -1 userId
+ //浜岀骇瀹㈡埛 涓婄骇瀹㈡埛id userId
pole.setClientId(-1L);
+ pole.setUserId(-1L);
r = updateById(pole);
if (!r) {
@@ -1339,7 +1342,7 @@
}
//璁剧疆瑙﹀彂鏉′欢 瀛樺叆Redis 15鍒嗛挓瓒呮椂 15鍒嗛挓鍐呭啀娆¤皟鐢ㄧ洿鎺ヨ繑鍥�
- redisUtils.set("redisStatusKeyTimeout", System.currentTimeMillis(), 60*15);
+ redisUtils.set("redisStatusKeyTimeout", System.currentTimeMillis(), 60 * 15);
CountDownLatch countDownLatch = new CountDownLatch(7);//todo
//鑾峰彇涓�涓�7浣嶉殢鏈烘暟
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 b4d7107..efeefdf 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
@@ -504,7 +504,9 @@
List<String> temp = new ArrayList<>();
for (LedPlayerEntity item : ledList) {
String playerId = item.getPlayerId();
- if (redisUtils.get(VnnoxConstant.REDIS_VOL + playerId) == null || redisUtils.get(VnnoxConstant.REDIS_BRIGHTNESS + playerId) == null) {
+ if (redisUtils.get(VnnoxConstant.REDIS_VOL + playerId) == null
+ || redisUtils.get(VnnoxConstant.REDIS_BRIGHTNESS + playerId) == null
+ || redisUtils.get(VnnoxConstant.REDIS_SCREEN_STATUS + playerId) == null) {
temp.add(item.getPlayerId());
}
}
@@ -521,9 +523,9 @@
for (LedPlayerEntity playerEntity : list) {
String playerId = playerEntity.getPlayerId();
LedPlayerInfoEntity cache = new LedPlayerInfoEntity();
- // 璁剧疆灞忓箷鐘舵��
+ // 璁剧疆灞忓箷鐘舵�� 鏇存柊鐘舵�佷箣鍚庤繕鎷夸笉鍒版暟鎹鏄庤澶囨湁闂鎴栦笉鍦ㄧ嚎 璁剧疆榛樿涓洪粦灞�
String result = redisUtils.get(VnnoxConstant.REDIS_SCREEN_STATUS + playerId);
- Integer screenStatus = 1;
+ Integer screenStatus = 0;
if (null != result) {
screenStatus = Integer.parseInt(result);
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
index e86cc21..d966cd4 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
@@ -304,6 +304,7 @@
List<String> commands = new ArrayList<>();
commands.add("volumeValue");
commands.add("brightnessValue");
+ commands.add("screenPowerStatus");
VnnoxBaseRequest request = new VnnoxBaseRequest();
request.setPlayerIds(playerId);
request.setCommands(commands);
--
Gitblit v1.9.3