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 e37bced42..00a04c78b 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
@@ -10,7 +10,6 @@ import com.njcn.prepare.harmonic.service.mysql.line.RMpEventDetailDService;
 import com.njcn.prepare.harmonic.service.mysql.line.RMpEventDetailService;
 import com.njcn.prepare.harmonic.service.mysql.line.RMpMonitorEvaluateDService;
 import com.njcn.prepare.harmonic.service.mysql.line.*;
-import com.njcn.prepare.harmonic.service.mysql.newalgorithm.RStatSubstationService;
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.annotation.LiteflowMethod;
 import com.yomahub.liteflow.core.NodeComponent;
@@ -54,8 +53,6 @@ public class MeasurementExecutor extends BaseExecutor {
     private final PollutionService pollutionService;
     private final RStatDevSignalDPOService rStatDevSignalDPOService;
     private final RMpDevEvaluateDetailPOService rMpDevEvaluateDetailPOService;
-    private final RStatSubstationService rStatSubstationService;
-
 
     /**
      * 算法名: 3.3.1.1-----监测点评价
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpDevEvaluateDetailPOServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpDevEvaluateDetailPOServiceImpl.java
index cf52e011a..f178c7d77 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpDevEvaluateDetailPOServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpDevEvaluateDetailPOServiceImpl.java
@@ -107,8 +107,6 @@ public class RMpDevEvaluateDetailPOServiceImpl extends MppServiceImpl<RMpDevEval
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    @Async("asyncExecutor")
-    @SneakyThrows
     public void devEvaluateDetail(CalculatedParam calculatedParam) {
         log.info(LocalDateTime.now()+"===>终端评价详情-日统计算法开始");
         List<RMpDevEvaluateDetailPO> rMpDevEvaluateDetailPOList = new ArrayList<>();
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpMonitorAlarmCountMServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpMonitorAlarmCountMServiceImpl.java
index 2dd489c53..6670a6bdf 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpMonitorAlarmCountMServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpMonitorAlarmCountMServiceImpl.java
@@ -103,7 +103,6 @@ public class RMpMonitorAlarmCountMServiceImpl extends MppServiceImpl<RMpMonitorA
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    @Async("asyncExecutor")
     public void alarmMonth(CalculatedParam calculatedParam) {
         log.info(LocalDateTime.now()+"===>监测点指标告警月统计算法开始");
         List<String> lineIds = calculatedParam.getIdList();
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java
index d29cdf167..dd4a41c6d 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java
@@ -79,7 +79,6 @@ public class RMpTargetWarnDServiceImpl extends MppServiceImpl<RMpTargetWarnDMapp
     /*******************************************新算法***********************************************************************/
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    @Async("asyncExecutor")
     public void alarmDay(CalculatedParam calculatedParam) {
         log.info(LocalDateTime.now()+"===>监测点指标告警日统计算法开始");
         List<String> lineIds = calculatedParam.getIdList();
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/RStatDevSignalDPOServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/RStatDevSignalDPOServiceImpl.java
index 87816c08c..49517d8f9 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/RStatDevSignalDPOServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/RStatDevSignalDPOServiceImpl.java
@@ -51,8 +51,6 @@ public class RStatDevSignalDPOServiceImpl extends MppServiceImpl<RStatDevSignalD
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    @Async("asyncExecutor")
-    @SneakyThrows
     public void devSignalD(CalculatedParam calculatedParam) {
         log.info(LocalDateTime.now()+"===>终端通信管理日统计算法开始");
         List<LineDevGetDTO> lineDevGetList = new ArrayList<>();
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/AlarmDetailServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/AlarmDetailServiceImpl.java
index 5fa6ecd4f..ee8b5ff83 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/AlarmDetailServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/AlarmDetailServiceImpl.java
@@ -84,7 +84,6 @@ public class AlarmDetailServiceImpl extends MppServiceImpl<AlarmMapper, RMpTarge
     /*******************************************新算法***********************************************************************/
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    @Async("asyncExecutor")
     public void targetDiff(CalculatedParam calculatedParam) {
         log.info(LocalDateTime.now()+"===>监测点稳态指标差值日表开始执行");
         List<String> lineIds = calculatedParam.getIdList();
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java
index 1ee39f669..e97dc2687 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java
@@ -93,7 +93,6 @@ public class DayDataServiceImpl implements DayDataService {
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    @Async("asyncExecutor")
     public void dataToDayHandler(CalculatedParam calculatedParam) {
         log.info(LocalDateTime.now() + "data表转day开始=====》");
         //influxdb实体
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java
index 609cff549..81dbb86e5 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java
@@ -88,7 +88,6 @@ public class IntegrityServiceImpl extends MppServiceImpl<RStatIntegrityDMapper,
 
     /********************************新算法************************************************/
     @Override
-    @Async("asyncExecutor")
     public void dataIntegrity(CalculatedParam calculatedParam) {
         List<RStatIntegrityD> list = new ArrayList<>();
         List<String> lineIds = calculatedParam.getIdList();
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 ae72eaf6c..587987b1a 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
@@ -55,7 +55,6 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
     /*********************************************新算法***********************************************************/
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    @Async("asyncExecutor")
     public void limitRate(CalculatedParam calculatedParam) {
         log.info(LocalDateTime.now()+"r_stat_limit_rate_d开始执行=======》");
         List<RStatLimitRateDPO> list = new ArrayList<>();
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java
index 11d4904a2..f933860b9 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java
@@ -96,7 +96,6 @@ public class LimitTargetServiceImpl extends MppServiceImpl<RStatLimitTargetDMapp
 
     /***********************************************新算法*******************************************************************/
     @Override
-    @Async("asyncExecutor")
     public void limitTargetData(CalculatedParam calculatedParam) {
         log.info(LocalDateTime.now()+"r_stat_limit_target_d开始执行=======》");
         List<RStatLimitTargetDPO> list = new ArrayList<>();
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java
index bb3ca06c5..c0784bfef 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java
@@ -128,7 +128,7 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
                     rMpMonitorEvaluateDPO = calculateRMpMonitorEvaluateDPO(rMpMonitorEvaluateDPO, fiveItems, pmsAbnormalRules, voltage, lineDTO);
                     Date date = DateUtil.parse(beginDay);
                     DataFlicker twoFlickerData = dataIntegrityRateInfluxService.getTwoFlickerData(lineDTO.getLineId(), date, 5);
-                    LocalDate localDate = LocalDateTimeUtil.parseDate(beginDay, DatePattern.NORM_DATE_PATTERN);
+                    LocalDate localDate = LocalDateTimeUtil.parseDate(beginDay, DatePattern.NORM_DATETIME_PATTERN);
 
                     if (Objects.isNull(twoFlickerData)) {
                         rMpMonitorEvaluateDPO.setPltCount(0);
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailDServiceImpl.java
index 220035a86..3ea6618b0 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailDServiceImpl.java
@@ -30,7 +30,6 @@ public class RMpPartHarmonicDetailDServiceImpl extends MppServiceImpl<RMpPartHar
     /***********************************************新算法********************************************************************/
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    @Async("asyncExecutor")
     public void insertHarmonicDetailDayOne(CalculatedParam calculatedParam) {
         log.info(LocalDateTime.now()+"===>监测点稳态指标超标明细日表1开始执行");
         List<String> lineIds = calculatedParam.getIdList();
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailMServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailMServiceImpl.java
index 7e6a72fe5..13533592d 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailMServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailMServiceImpl.java
@@ -31,7 +31,6 @@ public class RMpPartHarmonicDetailMServiceImpl extends MppServiceImpl<RMpPartHar
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    @Async("asyncExecutor")
     public void insertHarmonicDetailMonthOne(CalculatedParam calculatedParam) {
         log.info(LocalDateTime.now()+"===>监测点稳态指标超标明细月表1开始执行");
         DateTime beginMonth = DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailDServiceImpl.java
index b9b35719b..36c17acbd 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailDServiceImpl.java
@@ -28,7 +28,6 @@ public class RMpSurplusHarmonicDetailDServiceImpl extends MppServiceImpl<RMpSurp
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    @Async("asyncExecutor")
     public void insertHarmonicDetailDayTwo(CalculatedParam calculatedParam) {
         log.info(LocalDateTime.now()+"===>监测点稳态指标超标明细日表2开始执行");
         List<String> lineIds = calculatedParam.getIdList();
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailMServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailMServiceImpl.java
index db468129a..d83d908a2 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailMServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailMServiceImpl.java
@@ -31,7 +31,6 @@ public class RMpSurplusHarmonicDetailMServiceImpl extends MppServiceImpl<RMpSurp
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    @Async("asyncExecutor")
     public void insertHarmonicDetailMonthTwo(CalculatedParam calculatedParam) {
         log.info(LocalDateTime.now()+"===>监测点稳态指标超标明细月表2开始执行");
         DateTime beginMonth = DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpVThdServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpVThdServiceImpl.java
index c07710935..5187bb94c 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpVThdServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpVThdServiceImpl.java
@@ -29,7 +29,6 @@ public class RMpVThdServiceImpl extends MppServiceImpl<RMpVThdMapper, RMpVThd> i
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    @Async("asyncExecutor")
     public void insertHarmonicVThdDay(CalculatedParam calculatedParam) {
         log.info(LocalDateTime.now()+"===>监测点谐波畸变率开始执行");
         List<String> lineIds = calculatedParam.getIdList();