From 8a74d51dafd928a038dfeae9872b513ce8f62ad6 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 27 五月 2022 13:36:59 +0800
Subject: [PATCH] 排序
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 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..bf92fec 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
@@ -488,9 +488,6 @@
public BigDecimal getlistEnergy(Integer week) {
- Long clientId = SecurityUtils.getClientId();
-// List<LightBo> listLight = baseMapper.listLight(clientId, null);
-// List<String> deviceCodeList = listLight.stream().map(LightBo::getDeviceCode).collect(Collectors.toList());
//鑾峰彇鍒版鍦ㄦ墽琛岀殑浠诲姟鍒楄〃
List<LightTaskDto> lightTaskDtos = SpringContextHolder.getBean(LightTaskService.class).listTask();
@@ -610,7 +607,6 @@
/**
* 鑺傝兘鐜囪绠楀紑濮�
*/
- //TODO
//鑾峰彇鏄ㄥぉ鐨勬槦鏈熸暟
LocalDateTime now = LocalDateTime.now();
LocalDateTime yesterday = now.minusDays(1);
@@ -619,10 +615,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 +723,7 @@
/**
* 涓�澶╃殑鑳借��
*
- * @param list
+ * @param
* @return
*/
public BigDecimal jisuanEnergy(LightTaskDto Task) {
@@ -870,7 +866,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