From fb842a99734726e628bd0981ccdf80a253534eaa Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 17 五月 2022 17:06:07 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java | 92 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 84 insertions(+), 8 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 b483757..0901db2 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,9 +1,16 @@
package com.sandu.ximon.admin.service;
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.utils.RedisUtils;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
+import com.sandu.ximon.admin.utils.VnnoxProgramAPIUtil;
import com.sandu.ximon.admin.utils.request.VnnoxScreenStatusType;
import com.sandu.ximon.admin.utils.response.VnnoxPlayerListResponse;
import com.sandu.ximon.admin.utils.response.VnnoxPlayerResponse;
@@ -11,15 +18,13 @@
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.domain.LedPlayerInfoEntity;
import com.sandu.ximon.dao.domain.LedV2RegisterResultEntity;
+import com.sandu.ximon.dao.enums.PoleBindingEnums;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.net.URISyntaxException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -37,6 +42,8 @@
private RedisUtils redisUtils;
// @Autowired
private LedPlayerEntityService ledPlayerEntityService;
+ // @Autowired
+ private VnnoxProgramAPIUtil vnnoxProgramAPIUtil;
/**
* 璁惧鏍￠獙娉ㄥ唽
@@ -200,20 +207,22 @@
/**
* 鍚屾鎾斁
+ *
* @param
* @return
*/
- public VnnoxResult syncPlay(List<String> playerList,Integer option) {
- return vnnoxAPIUtil.syncPlay(playerList,option);
+ public VnnoxResult syncPlay(List<String> playerList, Integer option) {
+ return vnnoxAPIUtil.syncPlay(playerList, option);
}
/**
* 瀵规椂
+ *
* @param
* @return
*/
- public VnnoxResult ntpSync(List<String> playerList,boolean enable) {
- return vnnoxAPIUtil.ntpSync(playerList,enable);
+ public VnnoxResult ntpSync(List<String> playerList, boolean enable) {
+ return vnnoxAPIUtil.ntpSync(playerList, enable);
}
@@ -221,6 +230,10 @@
LedPlayerEntity byId = ledPlayerEntityService.getById(id);
if (byId == null) {
throw new BusinessException("鏈壘鍒拌璁惧");
+ }
+ boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getSn(), PoleBindingEnums.VONNOX);
+ if (!belong) {
+ throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
}
LedPlayerEntity led = new LedPlayerEntity();
led.setId(id);
@@ -273,4 +286,67 @@
}
return list;
}
+
+
+ public VnnoxResult publishWaterData(String playerId, A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage poleSensorEntity) {
+ List<String> playerIds = new ArrayList<>();
+ playerIds.add(playerId);
+ AirDataProgram playerProgram = new AirDataProgram();
+ 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();
+ }
+
+
+ private List<PlayerWidget> generateWaterAndSensorWidget(A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage poleSensorEntity) {
+ List widgetList = new ArrayList<>();
+ List<String> list = new ArrayList<>();
+// if (Objects.nonNull(waterDataEntity)) {
+// list.add("姘磋川鐜鐩戞祴瀹炴椂鏁版嵁锛�");
+// list.add("ph锛�"+waterDataEntity.getPh());
+// list.add("婧惰В姘э細"+waterDataEntity.getDoData() + "(mg/L)");
+// list.add("鐢靛鐜囷細"+waterDataEntity.getEc() + "(10^(-6)S)");
+// list.add("娴婂害锛�"+waterDataEntity.getNtu() + "NTU");
+// }
+ if (Objects.nonNull(poleSensorEntity)) {
+// list.add("鐜鐩戞祴锛�");
+ list.add("娓╁害锛�" + poleSensorEntity.getTemperature() + "掳");
+ list.add("婀垮害锛�" + poleSensorEntity.getHumidity() + "%");
+ list.add("pm25锛�" + poleSensorEntity.getPm25() + "渭g/m鲁");
+ list.add("pm10锛�" + poleSensorEntity.getPm10() + "渭g/m鲁");
+ list.add("鐢查啗锛�" + poleSensorEntity.getEch2o() + "渭g/m鲁");
+ list.add("CO2锛�" + poleSensorEntity.getCo2() + "ppm");
+ }
+
+ widgetList.add(new PlayerWidget().generateScrollUpTextWidget(
+ "weather",
+ 1,
+ 100000L,
+ list,
+ "#FFFFFF",
+ 15,
+ new PlayerLayout("0%", "5%", "100%", "100%")
+ ));
+
+ return widgetList;
+ }
+
}
--
Gitblit v1.9.3