From a435bc86b7a2e069900c708c9ed1ea70716870e0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 24 八月 2024 15:50:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java
index 979620c..bd99111 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java
@@ -93,7 +93,7 @@
list.add(accountingStrategyDetailNext);
return list;
}
- return new ArrayList<>();
+ return list;
}
@Override
@@ -127,19 +127,16 @@
@Override
public Boolean isStrategy24Hour(List<TAccountingStrategyDetail> accountingStrategyDetails) {
- String START_OF_DAY = "00:00:00";
- String END_OF_DAY = "24:00:00";
List<TAccountingStrategyDetail> sortedDetails = accountingStrategyDetails.stream()
.sorted(Comparator.comparing(TAccountingStrategyDetail::getStartTime))
.collect(Collectors.toList());
- boolean isFirstElementValid = sortedDetails.isEmpty() || !START_OF_DAY.equals(sortedDetails.get(0).getStartTime());
- boolean isLastElementValid = sortedDetails.isEmpty() || !END_OF_DAY.equals(sortedDetails.get(sortedDetails.size() - 1).getEndTime());
+ boolean isFirstElementValid = sortedDetails.isEmpty() || !sortedDetails.get(0).getStartTime().equals(sortedDetails.get(sortedDetails.size() - 1).getEndTime());
boolean isTimeContinuous = sortedDetails.stream()
.skip(1)
.allMatch(detail -> detail.getStartTime().equals(sortedDetails.get(sortedDetails.indexOf(detail) - 1).getEndTime()));
- return isFirstElementValid || isLastElementValid || !isTimeContinuous;
+ return isFirstElementValid || !isTimeContinuous;
}
}
--
Gitblit v1.7.1