From aeed1704275463b4ee6d64691b5ee96686e34a42 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Fri, 26 Jan 2024 13:12:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=B3=E5=8C=97=E8=B6=85=E9=AB=98=E5=8E=8B?=
 =?UTF-8?q?=E7=AE=97=E6=B3=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prepare/executor/MeasurementExecutor.java | 24 ++++++++++--
 .../mysql/Impl/line/LimitRateServiceImpl.java | 37 ++++++++++++++++---
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java
index 0e01e8fdb..fb82e1565 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java
@@ -346,20 +346,36 @@ public class MeasurementExecutor extends BaseExecutor {
         CalculatedParam calculatedParam = bindCmp.getRequestData();
         if (Objects.equals(tag,"limitRate1")){
             log.info(LocalDateTime.now()+"r_stat_limit_rate_d 1开始执行=======》");
-            //执行0点-6点
+            //执行0点-3点
             limitRateService.limitRate(bindCmp.getRequestData(),1);
         } else if (Objects.equals(tag,"limitRate2")) {
             log.info(LocalDateTime.now()+"r_stat_limit_rate_d 2开始执行=======》");
-            //执行6点-12点
+            //执行3点-6点
             limitRateService.limitRate(bindCmp.getRequestData(),2);
         } else if (Objects.equals(tag,"limitRate3")) {
             log.info(LocalDateTime.now()+"r_stat_limit_rate_d 3开始执行=======》");
-            //执行12点-18点
+            //执行6点-9点
             limitRateService.limitRate(bindCmp.getRequestData(),3);
         } else if (Objects.equals(tag,"limitRate4")) {
             log.info(LocalDateTime.now()+"r_stat_limit_rate_d 4开始执行=======》");
-            //执行18点-24点
+            //执行9点-12点
             limitRateService.limitRate(bindCmp.getRequestData(),4);
+        } else if (Objects.equals(tag,"limitRate5")) {
+            log.info(LocalDateTime.now()+"r_stat_limit_rate_d 5开始执行=======》");
+            //执行12点-15点
+            limitRateService.limitRate(bindCmp.getRequestData(),5);
+        } else if (Objects.equals(tag,"limitRate6")) {
+            log.info(LocalDateTime.now()+"r_stat_limit_rate_d 6开始执行=======》");
+            //执行15点-18点
+            limitRateService.limitRate(bindCmp.getRequestData(),6);
+        } else if (Objects.equals(tag,"limitRate7")) {
+            log.info(LocalDateTime.now()+"r_stat_limit_rate_d 7开始执行=======》");
+            //执行18点-21点
+            limitRateService.limitRate(bindCmp.getRequestData(),7);
+        } else if (Objects.equals(tag,"limitRate8")) {
+            log.info(LocalDateTime.now()+"r_stat_limit_rate_d 8开始执行=======》");
+            //执行21点-24点
+            limitRateService.limitRate(bindCmp.getRequestData(),8);
         }
     }
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java
index adbae2196..6f39cd700 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java
@@ -157,24 +157,51 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
                 if (type){
                     time = basisTime + " 00:00:00";
                 } else {
-                    time = basisTime + " 05:59:59";
+                    time = basisTime + " 02:59:59";
                 }
                 break;
             case 2:
                 if (type){
-                    time = basisTime + " 06:00:00";
+                    time = basisTime + " 03:00:00";
                 } else {
-                    time = basisTime + " 11:59:59";
+                    time = basisTime + " 05:59:59";
                 }
             case 3:
                 if (type){
-                    time = basisTime + " 12:00:00";
+                    time = basisTime + " 06:00:00";
                 } else {
-                    time = basisTime + " 17:59:59";
+                    time = basisTime + " 08:59:59";
                 }
             case 4:
+                if (type){
+                    time = basisTime + " 09:00:00";
+                } else {
+                    time = basisTime + " 11:59:59";
+                }
+                break;
+            case 5:
+                if (type){
+                    time = basisTime + " 12:00:00";
+                } else {
+                    time = basisTime + " 14:59:59";
+                }
+            case 6:
+                if (type){
+                    time = basisTime + " 15:00:00";
+                } else {
+                    time = basisTime + " 17:59:59";
+                }
+                break;
+            case 7:
                 if (type){
                     time = basisTime + " 18:00:00";
+                } else {
+                    time = basisTime + " 20:59:59";
+                }
+                break;
+            case 8:
+                if (type){
+                    time = basisTime + " 21:00:00";
                 } else {
                     time = basisTime + " 23:59:59";
                 }