From d9a9d8a2dad1d1e57b184bf8f972a03d654d883a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 22 七月 2022 15:07:01 +0800
Subject: [PATCH] 优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 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 c798cd6..cc85b97 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
@@ -8,6 +8,7 @@
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.RedisUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
@@ -223,9 +224,11 @@
if (byId == null) {
throw new BusinessException("鏈壘鍒拌璁惧");
}
- boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getSn(), PoleBindingEnums.VONNOX);
- if (!belong) {
- throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+ if (SecurityUtils.getClientId() != null) {
+ boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getSn(), PoleBindingEnums.VONNOX);
+ if (!belong) {
+ throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+ }
}
LedPlayerEntity led = new LedPlayerEntity();
led.setId(id);
@@ -234,8 +237,8 @@
* 璇虹摝璁惧缂栬緫 鏃ュ織璁板綍寮�濮�
*/
List<String> listCode = new ArrayList<>(1);
- listCode.add(led.getSn());
- String content = "{ 璁惧id:" + led.getId() + "璁惧code锛�" + led.getSn() + "璇虹摝playId:" + led.getPlayerId() + "璇虹摝璁惧鍘熷悕:" + byId.getName() + "璇虹摝璁惧鏇存敼鍚庣殑鍚嶇О:" + led.getName() + "}";
+ listCode.add(byId.getSn());
+ String content = "{ 璁惧id:" + led.getId() + "璁惧code锛�" + byId.getSn() + "璇虹摝playId:" + led.getPlayerId() + "璇虹摝璁惧鍘熷悕:" + byId.getName() + "璇虹摝璁惧鏇存敼鍚庣殑鍚嶇О:" + led.getName() + "}";
StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝璁惧缂栬緫", content);
/**
@@ -278,7 +281,6 @@
// 璁剧疆缂╃暐鍥捐闂矾寰�
result = redisUtils.get(VnnoxConstant.REDIS_SCREEN_SHOT + playerId);
- System.out.println(playerId + "鐨勮矾寰勭粨鏋�:-----------------------------" + result);
if (null != result) {
playerEntity.setScreenShotUrl(result);
} else {
@@ -304,8 +306,6 @@
list.add(playerPage);
playerProgram.setPages(list);
playerProgram.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
-
-
/**
* 璇虹摝鎺ㄩ�佸ぇ姘旀暟鎹� 鏃ュ織璁板綍寮�濮�
//// */
@@ -322,15 +322,8 @@
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("鐜鐩戞祴锛�");
list.add("娓╁害锛�" + poleSensorEntity.getTemperature() + "掳");
list.add("婀垮害锛�" + poleSensorEntity.getHumidity() + "%");
list.add("pm25锛�" + poleSensorEntity.getPm25() + "渭g/m鲁");
--
Gitblit v1.9.3