From 5e94332935da62448c17f89a807acf46a5ae3e75 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期四, 15 十二月 2022 10:08:22 +0800
Subject: [PATCH] 本地诺瓦调整
---
ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedService.java | 116 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 89 insertions(+), 27 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..7bdfb6c 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
@@ -7,23 +7,24 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
-import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
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;
import com.sandu.ximon.admin.newnova.vo.StatusVO;
import com.sandu.ximon.admin.newnova.vo.TrasfromStatusVO;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.admin.service.AirDataService;
import com.sandu.ximon.admin.service.PoleBindingService;
import com.sandu.ximon.admin.service.PoleService;
+import com.sandu.ximon.dao.bo.AirDataNongGengBo;
import com.sandu.ximon.dao.bo.NewNovaGroupListBo;
import com.sandu.ximon.dao.domain.NewNovaLed;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleBinding;
+import com.sandu.ximon.dao.mapper.AirDataNongGengMapper;
import com.sandu.ximon.dao.mapper.NewNovaLedMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -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);
}
@@ -196,16 +198,16 @@
if (nova == null) {
throw new BusinessException("鏈粦瀹氳鐡﹁澶�");
}
- PoleBinding air = poleBindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, nova.getPoleId()).eq(PoleBinding::getDeviceType, 3));
+ PoleBinding air = poleBindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, nova.getPoleId()).eq(PoleBinding::getDeviceType, 11));
if (air == null) {
throw new BusinessException("鏈粦瀹氬ぇ姘旇澶�");
}
//鑾峰彇澶ф皵鐩戞祴鏁版嵁
- A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage data = SpringContextHolder.getBean(AirDataService.class).getDataByPoleid(nova.getPoleId());
+ AirDataNongGengBo data = SpringContextHolder.getBean(AirDataNongGengMapper.class).historyData(air.getDeviceCode()).get(0);
//瑙ｆ瀽澶ф皵鏁版嵁
- 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()));
@@ -246,10 +248,10 @@
* @return
*/
- private Map parseData(A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage data, Long duration, Long fontSize) {
+ private Map parseData(AirDataNongGengBo 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" +
@@ -300,42 +302,42 @@
" {\n" +
" \"segs\": [\n" +
" {\n" +
- " \"content\": \"娓╁害锛�" + (data == null || data.getTemperature() == null ? " - " : data.getTemperature()) + "掳\"" + "\n" +
+ " \"content\": \"娓╁害锛�" + (data == null || data.getAirTemperature() == null ? " - " : data.getAirTemperature()) + "\"" + "\n" +
" }\n" +
" ]\n" +
" },\n" +
" {\n" +
" \"segs\": [\n" +
" {\n" +
- " \"content\": \"婀垮害锛�" + (data == null || data.getHumidity() == null ? " - " : data.getHumidity()) + "%\"" + "\n" +
+ " \"content\": \"婀垮害锛�" + (data == null || data.getAirHumidity() == null ? " - " : data.getAirHumidity()) + "\"" + "\n" +
" }\n" +
" ]\n" +
" },\n" +
" {\n" +
" \"segs\": [\n" +
" {\n" +
- " \"content\": \"pm25锛�" + (data == null || data.getPm25() == null ? " - " : data.getPm25()) + "渭g/m鲁\"" + "\n" +
+ " \"content\": \"pm25锛�" + (data == null || data.getPm2point5() == null ? " - " : data.getPm2point5()) + "\"" + "\n" +
" }\n" +
" ]\n" +
" },\n" +
" {\n" +
" \"segs\": [\n" +
" {\n" +
- " \"content\": \"pm10锛�" + (data == null || data.getPm10() == null ? " - " : data.getPm10()) + "渭g/m鲁\"" + "\n" +
+ " \"content\": \"pm10锛�" + (data == null || data.getPm10() == null ? " - " : data.getPm10()) + "\"" + "\n" +
" }\n" +
" ]\n" +
" },\n" +
" {\n" +
" \"segs\": [\n" +
" {\n" +
- " \"content\": \"鐢查啗锛�" + (data == null || data.getEch2o() == null ? " - " : data.getEch2o()) + "渭g/m鲁\"" + "\n" +
+ " \"content\": \"鍏夌収锛�" + (data == null || data.getIllumination() == null ? " - " : data.getIllumination()) + "\"" + "\n" +
" }\n" +
" ]\n" +
" },\n" +
" {\n" +
" \"segs\": [\n" +
" {\n" +
- " \"content\": \"CO2锛�" + (data == null || data.getCo2() == null ? " - " : data.getCo2()) + "ppm\"" + "\n" +
+ " \"content\": \"鍣煶锛�" + (data == null || data.getNoise() == null ? " - " : data.getNoise()) + "\"" + "\n" +
" }\n" +
" ]\n" +
" }\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