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 | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 2385665..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,16 +127,16 @@
@Override
public Boolean isStrategy24Hour(List<TAccountingStrategyDetail> accountingStrategyDetails) {
- List<TAccountingStrategyDetail> accountingStrategyDetailList = accountingStrategyDetails.stream()
- .sorted(Comparator.comparing(TAccountingStrategyDetail::getStartTime)).collect(Collectors.toList());
- boolean flag = false;
- for (int i = 0; i < accountingStrategyDetailList.size(); i++) {
- if(i != 0){
- if(!accountingStrategyDetailList.get(i).getStartTime().equals(accountingStrategyDetailList.get(i-1).getEndTime())) {
- flag = true;
- }
- }
- }
- return flag;
+ List<TAccountingStrategyDetail> sortedDetails = accountingStrategyDetails.stream()
+ .sorted(Comparator.comparing(TAccountingStrategyDetail::getStartTime))
+ .collect(Collectors.toList());
+
+ 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 || !isTimeContinuous;
}
}
--
Gitblit v1.7.1