From 19d542ddaa4a2d5a737912505e3195948ffa9ebe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 04 八月 2022 10:48:34 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 18877c6..63fe79f 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
@@ -73,7 +73,7 @@
Boolean hasKey = redisService.hasKey(LightKey.REPORT_MAC.key(deviceName));
if (!hasKey) {
int count = count(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, deviceName));
- log.info("redis鏌ヤ笉鍒拌矾鐏暟鎹畕}={}", count, deviceName);
+ log.info("redis鏌ヤ笉鍒拌矾鐏暟鎹� 鏁伴噺:{}={}", count, deviceName);
// 褰撳墠璺伅琛ㄦ病鏈夊綍鍏ヨ澶囧悧
if (count == 0) {
Light light = new Light();
@@ -81,15 +81,15 @@
light.setLightPercent(heartBeatDataPackage.getLightPercent());
light.setLight2Percent(heartBeatDataPackage.getLight2Percent());
save(light);
+ log.info("鏂板璺伅");
}
redisService.set(LightKey.REPORT_MAC.key(deviceName), 1, LightKey.REPORT_MAC.expireSeconds());
- log.info("鏂板璺伅");
} else {
Light light = new Light();
light.setLightPercent(heartBeatDataPackage.getLightPercent());
light.setLight2Percent(heartBeatDataPackage.getLight2Percent());
- update(light, Wrappers.lambdaUpdate(Light.class).eq(Light::getDeviceCode, deviceName));
- log.info("鏇存柊璺伅浜害");
+ boolean update = update(light, Wrappers.lambdaUpdate(Light.class).eq(Light::getDeviceCode, deviceName));
+ log.info("鏇存柊璺伅浜害 {}", update);
}
}
@@ -992,6 +992,21 @@
}
/**
+ * 鐢ㄦ埛鎷ユ湁鐨勮矾鐏�(鐢ㄤ簬棣栭〉鏁版嵁缁熻)
+ *
+ * @return
+ */
+ public List<LightBo> listLightOnHome() {
+ List<LightBo> listLight;
+ if (SecurityUtils.getClientId() != null) {
+ listLight = baseMapper.listLight(SecurityUtils.getUserId(), null);
+ } else {
+ listLight = baseMapper.listLight(null, null);
+ }
+ return listLight;
+ }
+
+ /**
* 鑾峰彇鐢ㄦ埛鎵�鏈夌殑璁惧鐮�
*/
public CommonPage<String> listDeviceCode(int pageNo, int pageSize, String keyword, String deviceCode) {
--
Gitblit v1.9.3