From af4cd17b9851e940dd1dc8a43b3b21fbdd452f76 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 23 九月 2022 17:09:54 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java | 190 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 155 insertions(+), 35 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 937d537..36b829e 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
@@ -4,10 +4,6 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.config.VnnoxConstant;
-import com.sandu.ximon.admin.dto.nova.AirDataProgram;
-import com.sandu.ximon.admin.dto.nova.PlayerLayout;
-import com.sandu.ximon.admin.dto.nova.PlayerPage;
-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.*;
@@ -15,8 +11,11 @@
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.utils.response.VnnoxResultResponse;
+import com.sandu.ximon.admin.vo.NovaAStateInfoVO;
import com.sandu.ximon.admin.vo.NovaPushResultVO;
import com.sandu.ximon.admin.vo.NovaScreenShorUrlVO;
+import com.sandu.ximon.admin.vo.NovaWeatherVO;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.domain.LedPlayerInfoEntity;
import com.sandu.ximon.dao.domain.LedV2RegisterResultEntity;
@@ -47,6 +46,7 @@
private LedPlayerEntityService ledPlayerEntityService;
private VnnoxProgramAPIUtil vnnoxProgramAPIUtil;
+ private CountDownLatchUtil countDownLatchUtil;
/**
* 璁惧鏍￠獙娉ㄥ唽
@@ -154,7 +154,7 @@
// 鏍规嵁灞忓箷鐘舵�佽皟鏁碦EDIS鏍囪瘑浣�
for (String playerId : vnnoxResult.getSuccess()) {
- redisUtils.set(VnnoxConstant.REDIS_SCREEN_STATUS + playerId, screenStatus, VnnoxConstant.REDIS_MAX_SAVE_TIME);
+ redisUtils.set(VnnoxConstant.REDIS_SCREEN_STATUS + playerId, screenStatus);
}
return result;
}
@@ -171,7 +171,7 @@
VnnoxResult vnnoxResult = vnnoxAPIUtil.volChange(playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()), vol);
// 鏍规嵁闊抽噺璋冩暣REDIS鏍囪瘑浣�
for (String playerId : vnnoxResult.getSuccess()) {
- redisUtils.set(VnnoxConstant.REDIS_VOL + playerId, vol, VnnoxConstant.REDIS_MAX_SAVE_TIME);
+ redisUtils.set(VnnoxConstant.REDIS_VOL + playerId, vol, VnnoxConstant.STATUS_TIME);
}
List<String> success = vnnoxResult.getSuccess();
List<String> fail = vnnoxResult.getFail();
@@ -212,7 +212,7 @@
VnnoxResult vnnoxResult = vnnoxAPIUtil.brightnessChange(playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()), brightness);
// 鏍规嵁浜害璋冩暣REDIS鏍囪瘑浣�
for (String playerId : vnnoxResult.getSuccess()) {
- redisUtils.set(VnnoxConstant.REDIS_BRIGHTNESS + playerId, brightness, VnnoxConstant.REDIS_MAX_SAVE_TIME);
+ redisUtils.set(VnnoxConstant.REDIS_BRIGHTNESS + playerId, brightness, VnnoxConstant.STATUS_TIME);
}
List<String> success = vnnoxResult.getSuccess();
List<String> fail = vnnoxResult.getFail();
@@ -286,7 +286,7 @@
// 鎵归噺鎴睆
- public List<NovaScreenShorUrlVO> getScreenShotUrl(List<NovaPushResultVO> playerIds) {
+ public List<NovaScreenShorUrlVO> getScreenShotUrl(List<NovaPushResultVO> playerIds) throws InterruptedException {
List<NovaScreenShorUrlVO> screenShorUrlList = new ArrayList<>();
//浠巔layerIds涓幏鍙杙layerId
@@ -306,6 +306,7 @@
break;
} else {
num++;
+ Thread.sleep(500);
}
}
screenShorUrlVO.setShortUrl(url);
@@ -497,10 +498,25 @@
/**
* 鑾峰彇缂撳瓨鏁版嵁
*
- * @param list
+ * @param
* @return
*/
public List<LedPlayerEntity> setCacheInfo(List<LedPlayerEntity> ledList) {
+ 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) {
+ temp.add(item.getPlayerId());
+ }
+ }
+ if (temp.size() > 0) {
+ List<List<String>> split = CollectionUtil.split(temp, 100);
+ for (List<String> playIds : split) {
+ System.out.println(playIds.size());
+ vnnoxAPIUtil.asyncStatus(playIds);
+ }
+ }
+
List<List<LedPlayerEntity>> split = CollectionUtil.split(ledList, 100);
for (List<LedPlayerEntity> list : split) {
for (LedPlayerEntity playerEntity : list) {
@@ -517,14 +533,15 @@
result = redisUtils.get(VnnoxConstant.REDIS_VOL + playerId);
Integer vol = 0;
if (null != result) {
- vol = Integer.parseInt(result);
+ vol = Float.valueOf(result).intValue();
+
}
cache.setVol(vol);
// 璁剧疆灞忓箷浜害
result = redisUtils.get(VnnoxConstant.REDIS_BRIGHTNESS + playerId);
Integer brightness = 0;
if (null != result) {
- brightness = Integer.parseInt(result);
+ brightness = Float.valueOf(result).intValue();
}
cache.setBrightness(brightness);
@@ -543,35 +560,27 @@
}
- public VnnoxResult publishWaterData(String playerId, A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage poleSensorEntity) {
+ public VnnoxResult WaterData(String playerId, Long duration, A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage poleSensorEntity) {
List<String> playerIds = new ArrayList<>();
playerIds.add(playerId);
- AirDataProgram playerProgram = new AirDataProgram();
+ NovaWeatherVO playerProgram = new NovaWeatherVO();
playerProgram.setPlayerIds(playerIds);
- PlayerPage playerPage = new PlayerPage();
- playerPage.setName("AirData page");
- List<PlayerWidget> widgetList = generateWaterAndSensorWidget(poleSensorEntity);
- playerPage.setWidgets(widgetList);
- List<PlayerPage> list = new ArrayList<>();
- list.add(playerPage);
- playerProgram.setPages(list);
- playerProgram.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
- /**
- * 璇虹摝鎺ㄩ�佸ぇ姘旀暟鎹� 鏃ュ織璁板綍寮�濮�
- //// */
-// String content = "{璇虹摝playerId锛�" + playerId + ",鑺傜洰鍐呭锛�" + JSON.toJSONString(playerProgram) + " }";
-// StoreOperationRecordsUtils.storeOperationData(null, null, "澶ф皵鏁版嵁鎺ㄩ�佸埌璇虹摝", content);
- /**
- * 璇虹摝鎺ㄩ�佸ぇ姘旀暟鎹� 鏃ュ織璁板綍缁撴潫
- */
- return vnnoxProgramAPIUtil.normalProgram(playerProgram).getData();
+ NovaWeatherVO.AttributeDTO attributeDTO = new NovaWeatherVO.AttributeDTO();
+ attributeDTO.setDuration(duration);
+ playerProgram.setAttribute(attributeDTO);
+ List<NovaWeatherVO.PageDTO.WidgetsDTO> widgets = setWeather(duration, poleSensorEntity);
+ NovaWeatherVO.PageDTO page = new NovaWeatherVO.PageDTO();
+ page.setWidgets(widgets);
+ playerProgram.setPage(page);
+
+ return vnnoxProgramAPIUtil.emergencyProgram(playerProgram).getData();
}
- private List<PlayerWidget> generateWaterAndSensorWidget(A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage poleSensorEntity) {
+ private List<NovaWeatherVO.PageDTO.WidgetsDTO> setWeather(Long duration, A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage poleSensorEntity) {
- List widgetList = new ArrayList<>();
+ List<NovaWeatherVO.PageDTO.WidgetsDTO> widgets = new ArrayList<>();
List<String> list = new ArrayList<>();
if (Objects.nonNull(poleSensorEntity)) {
list.add("鐜鐩戞祴锛�");
@@ -581,11 +590,47 @@
list.add("pm10锛�" + poleSensorEntity.getPm10() + "渭g/m鲁");
list.add("鐢查啗锛�" + poleSensorEntity.getEch2o() + "渭g/m鲁");
list.add("CO2锛�" + poleSensorEntity.getCo2() + "ppm");
+ } else {
+ list.add("澶ф皵璁惧涓嶅湪绾�");
+ list.add("鐩墠鏄浐瀹氭暟鎹細");
+ list.add("鐜鐩戞祴锛�");
+ list.add("娓╁害锛� 40掳");
+ list.add("婀垮害锛� 60%");
+ list.add("pm25锛�0.58 渭g/m鲁");
+ list.add("pm10锛�0.58 渭g/m鲁");
+ list.add("鐢查啗锛�99.9 渭g/m鲁");
+ list.add("CO2锛�200 ppm");
}
- widgetList.add(new PlayerWidget().generateScrollUpTextWidget("weather", 1, 100000L, list, "#FFFFFF", 15, new PlayerLayout("0%", "5%", "100%", "100%")));
- return widgetList;
+ List<NovaWeatherVO.PageDTO.WidgetsDTO.LinesDTO> lines = new ArrayList<>();
+
+ list.forEach(txt -> {
+ List<NovaWeatherVO.PageDTO.WidgetsDTO.LinesDTO.TextAttributesDTO> textAttributes = new ArrayList<>();
+
+ NovaWeatherVO.PageDTO.WidgetsDTO.LinesDTO linesDTO = new NovaWeatherVO.PageDTO.WidgetsDTO.LinesDTO();
+ NovaWeatherVO.PageDTO.WidgetsDTO.LinesDTO.TextAttributesDTO textAttributesDTO = new NovaWeatherVO.PageDTO.WidgetsDTO.LinesDTO.TextAttributesDTO();
+ textAttributesDTO.setContent(txt);
+ textAttributes.add(textAttributesDTO);
+ System.out.println(txt + "鏂囨湰鍐呭");
+ linesDTO.setTextAttributes(textAttributes);
+ lines.add(linesDTO);
+ });
+
+ NovaWeatherVO.PageDTO.WidgetsDTO widgetsDTO = new NovaWeatherVO.PageDTO.WidgetsDTO();
+ NovaWeatherVO.PageDTO.WidgetsDTO.ScrollAttributeDTO scrollAttribute = new NovaWeatherVO.PageDTO.WidgetsDTO.ScrollAttributeDTO();
+
+ NovaWeatherVO.PageDTO.WidgetsDTO.LayoutDTO layout = new NovaWeatherVO.PageDTO.WidgetsDTO.LayoutDTO();
+
+ widgetsDTO.setScrollAttribute(scrollAttribute);
+ widgetsDTO.setLayout(layout);
+ widgetsDTO.setLines(lines);
+
+ widgetsDTO.setDuration(duration);
+ widgets.add(widgetsDTO);
+ System.out.println(lines + "鎾斁鍐呭");
+
+ return widgets;
}
@@ -593,11 +638,86 @@
* 鏇存柊璇虹摝灞忓箷鍒嗚鲸鐜�
*/
public void saveInfo() {
- List<LedPlayerEntity> list = vnnoxAPIUtil.saveCurrentInfo(ledPlayerEntityService.list());
+ List<LedPlayerEntity> all = ledPlayerEntityService.list();
+ List<List<LedPlayerEntity>> split = CollectionUtil.split(all, 100);
+ List<LedPlayerEntity> list = new ArrayList<>();
+ for (List<LedPlayerEntity> ledList : split) {
+ list.addAll(vnnoxAPIUtil.saveCurrentInfo(ledList));
+ }
boolean b = SpringContextHolder.getBean(LedPlayerEntityService.class).updateBatchById(list);
if (b) {
LogUtils.error("鏇存柊璇虹摝灞忓箷鍒嗚鲸鐜囨垚鍔�");
}
}
+
+ public void asyncStatus(List<String> playerIds) {
+ VnnoxResultResponse vnnoxResultResponse = vnnoxAPIUtil.asyncStatus(playerIds);
+ }
+
+ /**
+ * 鑾峰彇璇虹摝灞忓箷淇℃伅
+ *
+ * @param stateValue
+ * @param playIdList
+ * @return
+ */
+ public List<NovaAStateInfoVO> getInfo(String stateValue, List<String> playIdList) {
+ List<NovaAStateInfoVO> list = new ArrayList<>();
+ NovaAStateInfoVO novaAStateInfoVO;
+ for (String playId : playIdList) {
+ String volumeValue = RedisUtils.getBean().get(VnnoxConstant.REDIS_VOL + playId);
+ String brightnessValue = RedisUtils.getBean().get(VnnoxConstant.REDIS_BRIGHTNESS + playId);
+ String videoSourceValue = RedisUtils.getBean().get(VnnoxConstant.VIDEO_SOURCE_VALUE + playId);
+ String timezoneValue = RedisUtils.getBean().get(VnnoxConstant.TIME_VALUE_TIMEZONE + playId);
+ String timeValue = RedisUtils.getBean().get(VnnoxConstant.TIME_VALUE_TIME + playId);
+ String screenPowerStatus = RedisUtils.getBean().get(VnnoxConstant.REDIS_SCREEN_STATUS + playId);
+ String syncPlayStatus = RedisUtils.getBean().get(VnnoxConstant.SYNC_PLAY_STATUS + playId);
+ novaAStateInfoVO = new NovaAStateInfoVO();
+ novaAStateInfoVO.setPlayerId(playId);
+ switch (stateValue) {
+ case "all":
+ novaAStateInfoVO.setVolumeValue(volumeValue);
+ novaAStateInfoVO.setBrightnessValue(brightnessValue);
+ novaAStateInfoVO.setVideoSourceValue(videoSourceValue);
+ novaAStateInfoVO.setTimezoneValue(timezoneValue);
+ novaAStateInfoVO.setTimeValue(timeValue);
+ novaAStateInfoVO.setScreenPowerStatus(screenPowerStatus);
+ novaAStateInfoVO.setSyncPlayStatus(syncPlayStatus);
+ break;
+ case "volumeValue":
+ novaAStateInfoVO.setVolumeValue(volumeValue);
+ break;
+ case "brightnessValue":
+ novaAStateInfoVO.setBrightnessValue(brightnessValue);
+ break;
+ case "videoSourceValue":
+ novaAStateInfoVO.setVideoSourceValue(videoSourceValue);
+ break;
+ case "timeValue":
+ novaAStateInfoVO.setTimezoneValue(timezoneValue);
+ novaAStateInfoVO.setTimeValue(timeValue);
+ break;
+ case "screenPowerStatus":
+ novaAStateInfoVO.setScreenPowerStatus(screenPowerStatus);
+ break;
+ case "syncPlayStatus":
+ novaAStateInfoVO.setSyncPlayStatus(syncPlayStatus);
+ break;
+ default:
+ }
+ list.add(novaAStateInfoVO);
+ }
+ return list;
+ }
+
+ public void getAsyncStatus(List<String> playerIdList, String stateValue) {
+ List<List<String>> split = CollectionUtil.split(playerIdList, 100);
+ split.forEach(
+ playerIds -> {
+ vnnoxAPIUtil.getAsyncStatus(playerIdList, stateValue);
+ }
+ );
+
+ }
}
--
Gitblit v1.9.3