From d019a929fc220ac5395d409f6c2ab4fab7653658 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 24 十一月 2022 10:53:55 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedService.java | 94 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 78 insertions(+), 16 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..f0ce6f0 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
@@ -11,6 +11,7 @@
import com.sandu.ximon.admin.newnova.conf.ProgramPathConfig;
import com.sandu.ximon.admin.newnova.param.NewNovaLedParam;
import com.sandu.ximon.admin.newnova.param.ProgramPrarm;
+import com.sandu.ximon.admin.newnova.program.LEDInfoParam;
import com.sandu.ximon.admin.newnova.program.NewNovaProgramService;
import com.sandu.ximon.admin.newnova.utils.NovaAPIUtil;
import com.sandu.ximon.admin.newnova.vo.ProWHVO;
@@ -128,18 +129,12 @@
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
List<NewNovaLed> newNovaListBos = baseMapper.listLed(keyword, groupId, SecurityUtils.getClientId());
//鑾峰彇鍦ㄧ嚎鐘舵��
- instanceUtil.getOnlineStatus(newNovaListBos, onlineStatus);
- //鑾峰彇灞忓箷寮�鍏�
- instanceUtil.getScreenPowerState(newNovaListBos);
- //鑾峰彇闊抽噺
- instanceUtil.getVolumeState(newNovaListBos);
- //鑾峰彇浜害
- instanceUtil.getScreenBrightness(newNovaListBos);
- //鑾峰彇鍚屾鐘舵��
- instanceUtil.getSync(newNovaListBos);
+ List<NewNovaLed> onLine = instanceUtil.getOnlineStatus(newNovaListBos, onlineStatus);
+ //鑾峰彇鍒嗚鲸鐜�
+ instanceUtil.getDisplayInfoAsync(onLine);
- updateBatchById(newNovaListBos);
- return newNovaListBos;
+ updateBatchById(onLine);
+ return onLine;
}
public NewNovaLed getInfo(Long ledId) {
@@ -169,6 +164,13 @@
instanceUtil.getSync(list);
//鑾峰彇璇︽儏
instanceUtil.getInfo(byId);
+ //鑾峰彇鍒嗚鲸鐜�
+ instanceUtil.getDisplayInfoAsync(list);
+ //鑾峰彇鏃跺尯
+ instanceUtil.getTimezone(list);
+ //鑾峰彇瑙嗛婧�
+ instanceUtil.getVideoInfoAsync(list);
+
return list.get(0);
}
@@ -205,7 +207,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 +218,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 +251,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 +354,7 @@
" \"Helvetica\"\n" +
" ],\n" +
" \"isUnderline\": false,\n" +
- " \"size\": "+fontSize+",\n" +
+ " \"size\": " + fontSize + ",\n" +
" \"style\": \"NORMAL\"\n" +
" },\n" +
" \"letterSpacing\": 0,\n" +
@@ -377,4 +379,64 @@
}
+ /**
+ * 鑾峰彇鐘舵�佷俊鎭�
+ *
+ * @param param
+ * @return
+ */
+ public Object infoList(LEDInfoParam param) {
+
+ NovaAPIUtil instanceUtil = NovaAPIUtil.getInstanceUtil();
+
+ List<NewNovaLed> newNovaLeds = listByIds(param.getLedIds());
+ param.setLedList(newNovaLeds);
+
+ switch (param.getType()) {
+ case "all":
+ //鑾峰彇灞忓箷寮�鍏�
+ instanceUtil.getScreenPowerState(param.getLedList());
+ //鑾峰彇闊抽噺
+ instanceUtil.getVolumeState(param.getLedList());
+ //鑾峰彇浜害
+ instanceUtil.getScreenBrightness(param.getLedList());
+ //鑾峰彇鍚屾鐘舵��
+ instanceUtil.getSync(param.getLedList());
+ //鑾峰彇鍒嗚鲸鐜�
+ instanceUtil.getDisplayInfoAsync(param.getLedList());
+ //鑾峰彇鏃跺尯
+ instanceUtil.getTimezone(param.getLedList());
+ //鑾峰彇瑙嗛婧�
+ instanceUtil.getVideoInfoAsync(param.getLedList());
+ break;
+ case "volumeValue":
+ //鑾峰彇闊抽噺
+ instanceUtil.getVolumeState(param.getLedList());
+ break;
+ case "brightnessValue":
+ //鑾峰彇浜害
+ instanceUtil.getScreenBrightness(param.getLedList());
+ break;
+ case "videoSourceValue":
+ //鑾峰彇瑙嗛婧�
+ instanceUtil.getVideoInfoAsync(param.getLedList());
+ break;
+ case "timeValue":
+ //鑾峰彇鏃跺尯
+ instanceUtil.getTimezone(param.getLedList());
+ break;
+ case "screenPowerStatus":
+ //鑾峰彇灞忓箷寮�鍏�
+ instanceUtil.getScreenPowerState(param.getLedList());
+ break;
+ case "syncPlayStatus":
+ //鑾峰彇鍚屾鐘舵��
+ instanceUtil.getSync(param.getLedList());
+ break;
+ default:
+ }
+
+
+ return param.getLedList();
+ }
}
--
Gitblit v1.9.3