From a146097a15d719c60af3cdeb4de1f21aa7b5ca8d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:47:53 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/StrategyUtil.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/StrategyUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/StrategyUtil.java
index 4ebf980..e935937 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/StrategyUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/StrategyUtil.java
@@ -67,8 +67,13 @@
}
accountingStrategyDetails = accountingStrategyDetails.stream().sorted(Comparator.comparing(TAccountingStrategyDetail::getStartTime)).collect(Collectors.toList());
for (TAccountingStrategyDetail accountingStrategyDetail : accountingStrategyDetails) {
- if(DateUtils.string2LocalTime(accountingStrategyDetail.getStartTime()).isBefore(time)
- && DateUtils.string2LocalTime(accountingStrategyDetail.getEndTime()).isAfter(time)){
+ String startTime = accountingStrategyDetail.getStartTime();
+ String endTime = accountingStrategyDetail.getEndTime();
+ if("00:00".equals(endTime)){
+ endTime = "23:59";
+ }
+ if(DateUtils.string2LocalTime(startTime + ":00").isBefore(time)
+ && DateUtils.string2LocalTime(endTime + ":00").isAfter(time)){
switch (i){
case 1:
acquisitionBillingModeReply.setTime1(accountingStrategyDetail.getType().equals(1)?0
--
Gitblit v1.7.1