From 60fc84976142a9019effbbb79c4d43bc4a4a3b36 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 15 九月 2022 18:26:56 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java | 79 +++++++++++++++++++++++++++------------
1 files changed, 55 insertions(+), 24 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 9c399f8..c845b76 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
@@ -18,6 +18,7 @@
import com.sandu.ximon.admin.utils.response.VnnoxResultResponse;
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;
@@ -173,7 +174,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.STATUS_TIME);
+ redisUtils.set(VnnoxConstant.REDIS_VOL + playerId, vol, VnnoxConstant.STATUS_TIME);
}
List<String> success = vnnoxResult.getSuccess();
List<String> fail = vnnoxResult.getFail();
@@ -563,35 +564,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("鐜鐩戞祴锛�");
@@ -601,11 +594,49 @@
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;
}
--
Gitblit v1.9.3