From 15fe445c820f28139e4e7e1a4cb286ad6ae37e6e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 06 六月 2022 11:05:17 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java | 157 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 124 insertions(+), 33 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 c861d80..5e97ecb 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,11 +1,17 @@
package com.sandu.ximon.admin.service;
import com.sandu.common.execption.BusinessException;
-import com.sandu.common.log.Log;
+import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.config.VnnoxConstant;
-import com.sandu.ximon.admin.utils.LogUtils;
+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.StoreOperationRecordsUtils;
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;
@@ -13,15 +19,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;
/**
@@ -33,12 +37,14 @@
@AllArgsConstructor
public class VnnoxService {
- // @Autowired
+
private VnnoxAPIUtil vnnoxAPIUtil;
- // @Autowired
+
private RedisUtils redisUtils;
- // @Autowired
+
private LedPlayerEntityService ledPlayerEntityService;
+
+ private VnnoxProgramAPIUtil vnnoxProgramAPIUtil;
/**
* 璁惧鏍￠獙娉ㄥ唽
@@ -108,10 +114,7 @@
type = VnnoxScreenStatusType.OPEN;
}
- VnnoxResult vnnoxResult = vnnoxAPIUtil.screenStatus(
- playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()),
- type
- );
+ VnnoxResult vnnoxResult = vnnoxAPIUtil.screenStatus(playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()), type);
// 鏍规嵁灞忓箷鐘舵�佽皟鏁碦EDIS鏍囪瘑浣�
for (String playerId : vnnoxResult.getSuccess()) {
redisUtils.set(VnnoxConstant.REDIS_SCREEN_STATUS + playerId, screenStatus, VnnoxConstant.REDIS_MAX_SAVE_TIME);
@@ -120,10 +123,7 @@
}
public VnnoxResult volChange(List<LedPlayerEntity> playerList, Integer vol) {
- VnnoxResult vnnoxResult = vnnoxAPIUtil.volChange(
- playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()),
- vol
- );
+ 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);
@@ -132,10 +132,7 @@
}
public VnnoxResult brightnessChange(List<LedPlayerEntity> playerList, Integer brightness) {
- VnnoxResult vnnoxResult = vnnoxAPIUtil.brightnessChange(
- playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()),
- brightness
- );
+ 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);
@@ -186,61 +183,102 @@
return map;
}
+// //閲嶅惎
+// public VnnoxResult reboot(List<LedPlayerEntity> playerList) {
+// return vnnoxAPIUtil.reboot(
+// playerList.stream().map(
+// item -> item.getPlayerId()
+// ).collect(Collectors.toList())
+// );
+// }
+
//閲嶅惎
- public VnnoxResult reboot(List<LedPlayerEntity> playerList) {
- return vnnoxAPIUtil.reboot(
- playerList.stream().map(
- item -> item.getPlayerId()
- ).collect(Collectors.toList())
- );
+ public VnnoxResult reboot(List<String> playerList) {
+ return vnnoxAPIUtil.reboot(playerList);
}
+
+ /**
+ * 鍚屾鎾斁
+ *
+ * @param
+ * @return
+ */
+ 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 boolean updateDataName(Long id, String name) {
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);
led.setName(name);
+ /**
+ * 璇虹摝璁惧缂栬緫 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(byId.getSn());
+ String content = "{ 璁惧id:" + led.getId() + "璁惧code锛�" + byId.getSn() + "璇虹摝playId:" + led.getPlayerId() + "璇虹摝璁惧鍘熷悕:" + byId.getName() + "璇虹摝璁惧鏇存敼鍚庣殑鍚嶇О:" + led.getName() + "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝璁惧缂栬緫", content);
+ /**
+ * 璇虹摝璁惧缂栬緫 鏃ュ織璁板綍缁撴潫
+ */
return ledPlayerEntityService.updateById(led);
}
/**
* 鑾峰彇缂撳瓨鏁版嵁
+ *
* @param list
* @return
*/
public List<LedPlayerEntity> setCacheInfo(List<LedPlayerEntity> list) {
- for(LedPlayerEntity playerEntity: 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) {
+ if (null != result) {
screenStatus = Integer.parseInt(result);
}
cache.setScreenStatus(screenStatus);
// 璁剧疆灞忓箷闊抽噺
result = redisUtils.get(VnnoxConstant.REDIS_VOL + playerId);
Integer vol = 0;
- if(null != result) {
+ if (null != result) {
vol = Integer.parseInt(result);
}
cache.setVol(vol);
// 璁剧疆灞忓箷浜害
result = redisUtils.get(VnnoxConstant.REDIS_BRIGHTNESS + playerId);
Integer brightness = 0;
- if(null != result) {
+ if (null != result) {
brightness = Integer.parseInt(result);
}
cache.setBrightness(brightness);
// 璁剧疆缂╃暐鍥捐闂矾寰�
result = redisUtils.get(VnnoxConstant.REDIS_SCREEN_SHOT + playerId);
- System.out.println(playerId+"鐨勮矾寰勭粨鏋�:-----------------------------"+result);
- if(null != result) {
+ if (null != result) {
playerEntity.setScreenShotUrl(result);
} else {
playerEntity.setScreenShotUrl("");
@@ -252,4 +290,57 @@
}
+ 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