From cbffadc9c547b1fd45e0dcb22a9ec81d5813bc21 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 21 十一月 2022 16:11:12 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedService.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedService.java
index 71e0d50..415787c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedService.java
@@ -128,18 +128,24 @@
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
List<NewNovaLed> newNovaListBos = baseMapper.listLed(keyword, groupId, SecurityUtils.getClientId());
//鑾峰彇鍦ㄧ嚎鐘舵��
- instanceUtil.getOnlineStatus(newNovaListBos, onlineStatus);
+ List<NewNovaLed> onLine = instanceUtil.getOnlineStatus(newNovaListBos, onlineStatus);
//鑾峰彇灞忓箷寮�鍏�
- instanceUtil.getScreenPowerState(newNovaListBos);
+ instanceUtil.getScreenPowerState(onLine);
//鑾峰彇闊抽噺
- instanceUtil.getVolumeState(newNovaListBos);
+ instanceUtil.getVolumeState(onLine);
//鑾峰彇浜害
- instanceUtil.getScreenBrightness(newNovaListBos);
+ instanceUtil.getScreenBrightness(onLine);
//鑾峰彇鍚屾鐘舵��
- instanceUtil.getSync(newNovaListBos);
+ instanceUtil.getSync(onLine);
+ //鑾峰彇鍒嗚鲸鐜�
+ instanceUtil.getDisplayInfoAsync(onLine);
+ //鑾峰彇鏃跺尯
+ instanceUtil.getTimezone(onLine);
+ //鑾峰彇瑙嗛婧�
+ instanceUtil.getVideoInfoAsync(onLine);
- updateBatchById(newNovaListBos);
- return newNovaListBos;
+ updateBatchById(onLine);
+ return onLine;
}
public NewNovaLed getInfo(Long ledId) {
@@ -169,6 +175,13 @@
instanceUtil.getSync(list);
//鑾峰彇璇︽儏
instanceUtil.getInfo(byId);
+ //鑾峰彇鍒嗚鲸鐜�
+ instanceUtil.getDisplayInfoAsync(list);
+ //鑾峰彇鏃跺尯
+ instanceUtil.getTimezone(list);
+ //鑾峰彇瑙嗛婧�
+ instanceUtil.getVideoInfoAsync(list);
+
return list.get(0);
}
@@ -205,7 +218,7 @@
A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage data = SpringContextHolder.getBean(AirDataService.class).getDataByPoleid(nova.getPoleId());
//瑙ｆ瀽澶ф皵鏁版嵁
- Map pageInfo = parseData(data, duration,fontSize);
+ Map pageInfo = parseData(data, duration, fontSize);
ProgramPrarm page = new ProgramPrarm();
page.setPageInfo(pageInfo);
page.setInsertPlay(true);
@@ -216,11 +229,11 @@
page.setProgramID(pid);
StatusVO editPro = apiUtil.editProgram(pid, pageInfo);
- if(editPro.getStatusCode()!=0){
+ if (editPro.getStatusCode() != 0) {
throw new BusinessException(editPro.getStatusData());
}
StatusVO genVO = apiUtil.genrateProgram(pid);
- if(genVO.getStatusCode()!=0){
+ if (genVO.getStatusCode() != 0) {
throw new BusinessException(genVO.getStatusData());
}
page.setProgramID(Integer.valueOf(createPro.getStatusData()));
@@ -249,7 +262,7 @@
private Map parseData(A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage data, Long duration, Long fontSize) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z+8:00'");
Date end = new Date();
- end.setTime(end.getTime()+duration);
+ end.setTime(end.getTime() + duration);
String str = "{\n" +
" \"name\": \"澶ф皵鐩戞祴\",\n" +
" \"widgetContainers\": [\n" +
@@ -352,7 +365,7 @@
" \"Helvetica\"\n" +
" ],\n" +
" \"isUnderline\": false,\n" +
- " \"size\": "+fontSize+",\n" +
+ " \"size\": " + fontSize + ",\n" +
" \"style\": \"NORMAL\"\n" +
" },\n" +
" \"letterSpacing\": 0,\n" +
--
Gitblit v1.9.3