From 7e2175df8ed913a858296d4fde0d268879a91daf Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 11:09:37 +0800
Subject: [PATCH] 首页
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
index d966d0f..c650ff6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -87,7 +87,10 @@
* @return 杩斿洖缁勫悎鏁版嵁dto
*/
public List<LightBo> listLight(int pageNo, int pageSize, String keyword) {
- Long clientId = SecurityUtils.getClientId();
+ Long clientId=null;
+ if(SecurityUtils.getClientId()!=null){
+ clientId = SecurityUtils.getClientId();
+ }
PageHelper.startPage(pageNo, pageSize);
@@ -119,6 +122,22 @@
}
return listLight;
+ }
+
+ /**
+ * 鑾峰彇鍗曚釜璺伅淇℃伅
+ * @param deviceCode 璁惧鐮�
+ * @return
+ */
+ public Light getLight(String deviceCode) {
+ Light one = getOne(Wrappers.<Light>lambdaQuery().eq(Light::getDeviceCode, deviceCode));
+ Object o = redisService.get(LightKey.REPORT_MAC.key(deviceCode));
+ if (o != null) {
+ one.setOnlineStatus(1);
+ }else {
+ one.setOnlineStatus(0);
+ }
+ return one;
}
public boolean addRemark(LightRemarkParam param) {
@@ -175,4 +194,37 @@
return resultList;
}
+
+ /**
+ * 鍗曠伅鑺傝兘鐜�
+ */
+ public List<Map<String, Object>> controlEnergySaving() {
+
+ List<LightBo> listLight = baseMapper.listLight(SecurityUtils.getUserId(), null);
+
+
+ return null;
+ }
+
+ /**
+ * 鐢ㄦ埛鎷ユ湁鐨勮矾鐏�
+ */
+ public List<Light> listLight() {
+ List<LightBo> listLight = baseMapper.listLight(SecurityUtils.getUserId(), null);
+ if (CollectionUtil.isEmpty(listLight)) {
+ throw new BusinessException("娌℃湁璺伅鏁版嵁");
+ }
+ List<String> deviceCodeList = listLight.stream().map(LightBo::getDeviceCode).collect(Collectors.toList());
+ List<LightReportData> reportDataList = lightReportDataService.list(Wrappers.<LightReportData>lambdaQuery().in(LightReportData::getDeviceCode, deviceCodeList));
+ if (CollectionUtil.isEmpty(reportDataList)) {
+ throw new BusinessException("娌℃湁璺伅鏁版嵁");
+ }
+ List<Light> lightList = new ArrayList<>();
+ for (String deviceCode : deviceCodeList) {
+ Light light = getLight(deviceCode);
+ lightList.add(light);
+ }
+ return lightList;
+ }
+
}
--
Gitblit v1.9.3