From a0981091ec9a4b8391013612e698fb72e0223460 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 24 八月 2024 15:47:24 +0800
Subject: [PATCH] 计费修改
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 4cfee0d..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
@@ -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