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 | 33 +++++++++++++++++++++++++++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 11 +++++++++++
ximon-admin/src/main/resources/application-test.yml | 2 +-
3 files changed, 45 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 49f4dac..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
@@ -194,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;
+ }
+
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index accf530..ea064f6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -775,4 +775,15 @@
}
return one;
}
+
+// /**
+// * 鐢ㄦ埛鎬诲崟鐏妭鑳界巼
+// */
+// public Double getPoleEnergy() {
+// Double energy = 0.0;
+//
+//
+// return energy;
+// }
+
}
\ No newline at end of file
diff --git a/ximon-admin/src/main/resources/application-test.yml b/ximon-admin/src/main/resources/application-test.yml
index 8310ac0..025730f 100644
--- a/ximon-admin/src/main/resources/application-test.yml
+++ b/ximon-admin/src/main/resources/application-test.yml
@@ -37,7 +37,7 @@
enable: true
listenter:
- isOpen: true
+ isOpen: false
minio:
--
Gitblit v1.9.3