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