From 31fbd083f0f1783bf8be77c59fb5e6898058d363 Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Fri, 12 Aug 2022 17:30:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E8=B4=B9=E7=8E=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E5=8D=8A=E4=B8=AA=E5=B0=8F=E6=97=B6=E6=97=B6?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../XhpcChargingStationServiceImpl.java       | 44 +++++++++++++++++--
 .../XhpcTimingChargingModelServiceImpl.java   | 16 ++++++-
 2 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java
index 49e783c7..e86e57c5 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java
@@ -535,11 +535,23 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc
 
             String str = startTime.split(":")[0];
             int st= Integer.valueOf(str);
+            String str1 = startTime.split(":")[1];
+            if("30".equals(str1)){
+                st=st*2+1;
+            }else{
+                st=st*2;
+            }
             String endT = endTime.split(":")[0];
             int end= Integer.valueOf(endT);
-
-            for (int l = st*2; l <end*2 ; l++) {
+            String endT1 = endTime.split(":")[1];
+            if("30".equals(endT1)){
+                end=end*2+1;
+            }else{
+                end=end*2;
+            }
+            for (int l = st; l <end ; l++) {
                 tfPricesSeq[l]=rateValues;
+                //System.out.println("=====tfPricesSeq["+l+"]=========="+rateValues+"===========");
             }
 
             if(list.size() == 1){
@@ -1169,11 +1181,24 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc
 
             String str = startTime.split(":")[0];
             int st= Integer.valueOf(str);
+            String str1 = startTime.split(":")[1];
+
+            if("30".equals(str1)){
+                st=st*2+1;
+            }else{
+                st=st*2;
+            }
             String endT = endTime.split(":")[0];
             int end= Integer.valueOf(endT);
-
-            for (int l = st*2; l <end*2 ; l++) {
+            String endT1 = endTime.split(":")[1];
+            if("30".equals(endT1)){
+                end=end*2+1;
+            }else{
+                end=end*2;
+            }
+            for (int l = st; l <end ; l++) {
                 tfPricesSeq[l]=rateValues;
+                //System.out.println("=====tfPricesSeq["+l+"]=========="+rateValues+"===========");
             }
 
             if(list.size() == 1){
@@ -1518,4 +1543,15 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc
     }
 
 
+    public static void main(String[] args) {
+        String st="14:30:00";
+        String end="15:30:00";
+
+        long sttime = DateUtil.parse(st, "HH:mm:ss").getTime();
+        long endtime = DateUtil.parse(end, "HH:mm:ss").getTime();
+
+        System.out.println((endtime-sttime)/1800000);
+
+    }
+
 }
diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTimingChargingModelServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTimingChargingModelServiceImpl.java
index 5645ad2b..df9eb53a 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTimingChargingModelServiceImpl.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTimingChargingModelServiceImpl.java
@@ -242,10 +242,24 @@ public class XhpcTimingChargingModelServiceImpl extends BaseService implements I
             Long defaultPeriodIdMap = map.get(rateValues);
             String str = startTime.split(":")[0];
             int st= Integer.valueOf(str);
+            String str1 = startTime.split(":")[1];
+
+            if("30".equals(str1)){
+                st=st*2+1;
+            }else{
+                st=st*2;
+            }
             String endT = endTime.split(":")[0];
             int end= Integer.valueOf(endT);
-            for (int l = st*2; l <end*2 ; l++) {
+            String endT1 = endTime.split(":")[1];
+            if("30".equals(endT1)){
+                end=end*2+1;
+            }else{
+                end=end*2;
+            }
+            for (int l = st; l <end ; l++) {
                 tfPricesSeq[l]=rateValues;
+                //System.out.println("=====tfPricesSeq["+l+"]=========="+rateValues+"===========");
             }
             if(list.size() == 1){
                 if(!"00:00:00".equals(xhpcRateTimeDto.getStartTime())){