From b34d941094d11e21e21a2ceead8a9fdeee640e2d Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 27 五月 2022 11:20:55 +0800
Subject: [PATCH] 列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java | 61 ++++++++++++++++++------------
1 files changed, 36 insertions(+), 25 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 21791b3..b0c7ce0 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,6 +1,7 @@
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;
@@ -8,6 +9,7 @@
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;
@@ -17,6 +19,7 @@
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;
@@ -34,13 +37,13 @@
@AllArgsConstructor
public class VnnoxService {
- // @Autowired
+
private VnnoxAPIUtil vnnoxAPIUtil;
- // @Autowired
+
private RedisUtils redisUtils;
- // @Autowired
+
private LedPlayerEntityService ledPlayerEntityService;
- // @Autowired
+
private VnnoxProgramAPIUtil vnnoxProgramAPIUtil;
/**
@@ -111,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);
@@ -123,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);
@@ -135,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);
@@ -229,9 +223,24 @@
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);
}
@@ -296,6 +305,16 @@
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();
}
@@ -320,15 +339,7 @@
list.add("CO2锛�" + poleSensorEntity.getCo2() + "ppm");
}
- widgetList.add(new PlayerWidget().generateScrollUpTextWidget(
- "water",
- 1,
- 100000L,
- list,
- "#FFFFFF",
- 15,
- new PlayerLayout("0%", "5%", "100%", "100%")
- ));
+ widgetList.add(new PlayerWidget().generateScrollUpTextWidget("weather", 1, 100000L, list, "#FFFFFF", 15, new PlayerLayout("0%", "5%", "100%", "100%")));
return widgetList;
}
--
Gitblit v1.9.3