From 4e91adbb41c89688fe5b0ef03807cfe748a7d59d Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 26 五月 2022 17:17:02 +0800
Subject: [PATCH] 角色
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 d4e9300..57d3220 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
@@ -610,7 +610,6 @@
/**
* 鑺傝兘鐜囪绠楀紑濮�
*/
- //TODO
//鑾峰彇鏄ㄥぉ鐨勬槦鏈熸暟
LocalDateTime now = LocalDateTime.now();
LocalDateTime yesterday = now.minusDays(1);
@@ -619,10 +618,10 @@
//鍒ゆ柇Task.getWeekList()鏄惁鍖呭惈鏄ㄥぉ鐨勬槦鏈熸暟 涓嶅寘鍚洿鎺ヨ繑鍥�0 涓嶈繘琛岃绠�
if (Task.getWeekList() != null && !Task.getWeekList().isEmpty()) {
if (!Task.getWeekList().contains(week)) {
- return BigDecimal.ZERO;
+ return new BigDecimal(1);
}
} else {
- return BigDecimal.ZERO;
+ return new BigDecimal(1);
}
@@ -727,7 +726,7 @@
/**
* 涓�澶╃殑鑳借��
*
- * @param list
+ * @param
* @return
*/
public BigDecimal jisuanEnergy(LightTaskDto Task) {
@@ -870,7 +869,7 @@
// BigDecimal hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
// BigDecimal hour;
if (v1.getBrightness() == 0) {
- return BigDecimal.ZERO;
+ return new BigDecimal(1);
}
double hour;
double min;
--
Gitblit v1.9.3