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 | 190 ++++++++++++++++++++++++++++++++++------------
1 files changed, 139 insertions(+), 51 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 209edf0..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
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.collection.CollectionUtil;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.config.VnnoxConstant;
@@ -9,15 +10,13 @@
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;
import com.sandu.ximon.admin.utils.response.VnnoxResult;
import com.sandu.ximon.admin.vo.NovaPushResultVO;
+import com.sandu.ximon.admin.vo.NovaScreenShorUrlVO;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.domain.LedPlayerInfoEntity;
import com.sandu.ximon.dao.domain.LedV2RegisterResultEntity;
@@ -27,6 +26,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.net.URISyntaxException;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -110,7 +110,10 @@
*/
public Map<String, Object> screenStatusChange(List<LedPlayerEntity> playerList, Integer screenStatus) {
playerList.forEach(item -> {
- if (item.getPlayerId().isEmpty() || item.getPlayerName().isEmpty() || item.getPlayerName() == null || item.getPlayerId() == null) {
+ if (item.getName() == null || item.getPlayerId() == null) {
+ throw new BusinessException("playerId鎴杙layerName涓虹┖");
+ }
+ if (item.getPlayerId().isEmpty() || item.getName().isEmpty()) {
throw new BusinessException("playerId鎴杙layerName涓虹┖");
}
});
@@ -135,12 +138,12 @@
playerList.forEach(n -> {
if (finalSuccess.contains(n.getPlayerId())) {
NovaPushResultVO vo = new NovaPushResultVO();
- vo.setName(n.getPlayerName());
+ vo.setName(n.getName());
vo.setPlayerId(n.getPlayerId());
successList.add(vo);
} else if (finalFail.contains(n.getPlayerId())) {
NovaPushResultVO vo = new NovaPushResultVO();
- vo.setName(n.getPlayerName());
+ vo.setName(n.getName());
vo.setPlayerId(n.getPlayerId());
faileList.add(vo);
}
@@ -158,7 +161,10 @@
public Map<String, Object> volChange(List<LedPlayerEntity> playerList, Integer vol) {
playerList.forEach(item -> {
- if (item.getPlayerId().isEmpty() || item.getPlayerName().isEmpty() || item.getPlayerName() == null || item.getPlayerId() == null) {
+ if (item.getName() == null || item.getPlayerId() == null) {
+ throw new BusinessException("playerId鎴杙layerName涓虹┖");
+ }
+ if (item.getPlayerId().isEmpty() || item.getName().isEmpty()) {
throw new BusinessException("playerId鎴杙layerName涓虹┖");
}
});
@@ -178,12 +184,12 @@
playerList.forEach(n -> {
if (finalSuccess.contains(n.getPlayerId())) {
NovaPushResultVO vo = new NovaPushResultVO();
- vo.setName(n.getPlayerName());
+ vo.setName(n.getName());
vo.setPlayerId(n.getPlayerId());
successList.add(vo);
} else if (finalFail.contains(n.getPlayerId())) {
NovaPushResultVO vo = new NovaPushResultVO();
- vo.setName(n.getPlayerName());
+ vo.setName(n.getName());
vo.setPlayerId(n.getPlayerId());
faileList.add(vo);
}
@@ -196,7 +202,10 @@
public Map<String, Object> brightnessChange(List<LedPlayerEntity> playerList, Integer brightness) {
playerList.forEach(item -> {
- if (item.getPlayerId().isEmpty() || item.getPlayerName().isEmpty() || item.getPlayerName() == null || item.getPlayerId() == null) {
+ if (item.getName() == null || item.getPlayerId() == null) {
+ throw new BusinessException("playerId鎴杙layerName涓虹┖");
+ }
+ if (item.getPlayerId().isEmpty() || item.getName().isEmpty()) {
throw new BusinessException("playerId鎴杙layerName涓虹┖");
}
});
@@ -216,12 +225,12 @@
playerList.forEach(n -> {
if (finalSuccess.contains(n.getPlayerId())) {
NovaPushResultVO vo = new NovaPushResultVO();
- vo.setName(n.getPlayerName());
+ vo.setName(n.getName());
vo.setPlayerId(n.getPlayerId());
successList.add(vo);
} else if (finalFail.contains(n.getPlayerId())) {
NovaPushResultVO vo = new NovaPushResultVO();
- vo.setName(n.getPlayerName());
+ vo.setName(n.getName());
vo.setPlayerId(n.getPlayerId());
faileList.add(vo);
}
@@ -275,6 +284,61 @@
return map;
}
+
+ // 鎵归噺鎴睆
+ public List<NovaScreenShorUrlVO> getScreenShotUrl(List<NovaPushResultVO> playerIds) {
+ List<NovaScreenShorUrlVO> screenShorUrlList = new ArrayList<>();
+
+ //浠巔layerIds涓幏鍙杙layerId
+ List<String> AllplayerIdsList = playerIds.stream().map(item -> item.getPlayerId()).collect(Collectors.toList());
+ List<List<String>> split = CollectionUtil.split(AllplayerIdsList, 100);
+ for (List<String> playerIdsList : split) {
+ VnnoxResult vnnoxResult = vnnoxAPIUtil.screenShot(playerIdsList);
+ LocalDateTime now = LocalDateTime.now();
+ NovaScreenShorUrlVO screenShorUrlVO;
+ for (String successStrId : vnnoxResult.getSuccess()) {
+ screenShorUrlVO = new NovaScreenShorUrlVO();
+ String url = null;
+ int num = 0;
+ while (num < 3) {
+ url = redisUtils.get(VnnoxConstant.REDIS_SCREEN_SHOT + successStrId);
+ if (url != null) {
+ break;
+ } else {
+ num++;
+ }
+ }
+ screenShorUrlVO.setShortUrl(url);
+ screenShorUrlVO.setPlayerId(successStrId);
+ screenShorUrlVO.setTime(now);
+ for (NovaPushResultVO bean : playerIds) {
+ if (bean.getPlayerId().equals(successStrId)) {
+ screenShorUrlVO.setName(bean.getName());
+ break;
+ }
+ }
+ screenShorUrlList.add(screenShorUrlVO);
+ }
+ for (String failStrId : vnnoxResult.getFail()) {
+ screenShorUrlVO = new NovaScreenShorUrlVO();
+
+ String url = null;
+ screenShorUrlVO.setShortUrl(url);
+ screenShorUrlVO.setPlayerId(failStrId);
+ screenShorUrlVO.setTime(now);
+ for (NovaPushResultVO bean : playerIds) {
+ if (bean.getPlayerId().equals(failStrId)) {
+ screenShorUrlVO.setName(bean.getName());
+ break;
+ }
+ }
+ screenShorUrlList.add(screenShorUrlVO);
+ }
+ }
+ return screenShorUrlList;
+ }
+
+
// //閲嶅惎
// public VnnoxResult reboot(List<LedPlayerEntity> playerList) {
// return vnnoxAPIUtil.reboot(
@@ -288,7 +352,10 @@
public Map<String, Object> reboot(List<NovaPushResultVO> nova) {
List<String> playerIds = new ArrayList<>();
nova.forEach(item -> {
- if (item.getPlayerId().isEmpty() || item.getName().isEmpty() || item.getName() == null || item.getPlayerId() == null) {
+ if (item.getName() == null || item.getPlayerId() == null) {
+ throw new BusinessException("playerId鎴杙layerName涓虹┖");
+ }
+ if (item.getPlayerId().isEmpty() || item.getName().isEmpty()) {
throw new BusinessException("playerId鎴杙layerName涓虹┖");
}
playerIds.add(item.getPlayerId());
@@ -327,7 +394,10 @@
public Map<String, Object> syncPlay(List<NovaPushResultVO> nova, Integer option) {
List<String> playerIds = new ArrayList<>();
nova.forEach(item -> {
- if (item.getPlayerId().isEmpty() || item.getName().isEmpty() || item.getName() == null || item.getPlayerId() == null) {
+ if (item.getName() == null || item.getPlayerId() == null) {
+ throw new BusinessException("playerId鎴杙layerName涓虹┖");
+ }
+ if (item.getPlayerId().isEmpty() || item.getName().isEmpty()) {
throw new BusinessException("playerId鎴杙layerName涓虹┖");
}
playerIds.add(item.getPlayerId());
@@ -364,7 +434,10 @@
public Map<String, Object> ntpSync(List<NovaPushResultVO> nova, boolean enable) {
List<String> playerIds = new ArrayList<>();
nova.forEach(item -> {
- if (item.getPlayerId().isEmpty() || item.getName().isEmpty() || item.getName() == null || item.getPlayerId() == null) {
+ if (item.getName() == null || item.getPlayerId() == null) {
+ throw new BusinessException("playerId鎴杙layerName涓虹┖");
+ }
+ if (item.getPlayerId().isEmpty() || item.getName().isEmpty()) {
throw new BusinessException("playerId鎴杙layerName涓虹┖");
}
playerIds.add(item.getPlayerId());
@@ -427,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;
}
@@ -494,7 +570,7 @@
private List<PlayerWidget> generateWaterAndSensorWidget(A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage poleSensorEntity) {
- //TODO
+
List widgetList = new ArrayList<>();
List<String> list = new ArrayList<>();
if (Objects.nonNull(poleSensorEntity)) {
@@ -512,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