diff --git a/pqs-system/system-boot/pom.xml b/pqs-system/system-boot/pom.xml
index 34fc2af72..baf9f6faf 100644
--- a/pqs-system/system-boot/pom.xml
+++ b/pqs-system/system-boot/pom.xml
@@ -80,11 +80,11 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
+     <!--   <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>energy-api</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>com.njcn</groupId>
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/DeviceTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/DeviceTaskRunner.java
index 2eeaacd11..30c30f05e 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/DeviceTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/DeviceTaskRunner.java
@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.njcn.algorithm.pojo.bo.BaseParam;
 import com.njcn.algorithm.pojo.liteflow.LiteFlowAlgorithmFeignClient;
-import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
 import com.njcn.system.timer.TimerTaskRunner;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/GeneraTrixTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/GeneraTrixTaskRunner.java
index 57dc2bdbb..f96d04cbd 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/GeneraTrixTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/GeneraTrixTaskRunner.java
@@ -1,39 +1,39 @@
-package com.njcn.system.timer.tasks;
-
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
-import com.njcn.prepare.harmonic.pojo.bo.BaseParam;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-/**
- * 类的介绍：母线算法执行链定时任务
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/12/6 9:35
- */
-@Component
-@RequiredArgsConstructor
-public class GeneraTrixTaskRunner implements TimerTaskRunner {
-
-    private final LiteFlowFeignClient liteFlowFeignClient;
-
-    @Override
-    public void action(String date) {
-        BaseParam baseParam = new BaseParam();
-        baseParam.setFullChain(true);
-        baseParam.setRepair(false);
-        if(StrUtil.isBlank(date)){
-            baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
-        }else {
-            baseParam.setDataDate(date);
-        }
-        liteFlowFeignClient.generaTrixExecutor(baseParam);
-    }
-
-
-}
+//package com.njcn.system.timer.tasks;
+//
+//import cn.hutool.core.date.DatePattern;
+//import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.util.StrUtil;
+//import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
+//import com.njcn.prepare.harmonic.pojo.bo.BaseParam;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * 类的介绍：母线算法执行链定时任务
+// *
+// * @author xuyang
+// * @version 1.0.0
+// * @createTime 2023/12/6 9:35
+// */
+//@Component
+//@RequiredArgsConstructor
+//public class GeneraTrixTaskRunner implements TimerTaskRunner {
+//
+//    private final LiteFlowFeignClient liteFlowFeignClient;
+//
+//    @Override
+//    public void action(String date) {
+//        BaseParam baseParam = new BaseParam();
+//        baseParam.setFullChain(true);
+//        baseParam.setRepair(false);
+//        if(StrUtil.isBlank(date)){
+//            baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
+//        }else {
+//            baseParam.setDataDate(date);
+//        }
+//        liteFlowFeignClient.generaTrixExecutor(baseParam);
+//    }
+//
+//
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementHourTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementHourTaskRunner.java
index 32a684baf..8b4f920e6 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementHourTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementHourTaskRunner.java
@@ -1,42 +1,42 @@
-package com.njcn.system.timer.tasks;
-
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
-import com.njcn.prepare.harmonic.pojo.bo.BaseParam;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-/**
- * 类的介绍：监测点算法执行链定时任务
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/12/6 9:35
- */
-@Component
-@RequiredArgsConstructor
-public class MeasurementHourTaskRunner implements TimerTaskRunner {
-
-    private final LiteFlowFeignClient liteFlowFeignClient;
-
-    @Override
-    public void action(String date) {
-        BaseParam baseParam = new BaseParam();
-        baseParam.setFullChain(true);
-        //由于是按小时跑的，前端其他算法都是按天跑的，因此修改参数
-        if(StrUtil.isBlank(date)){
-            baseParam.setRepair(false);
-            baseParam.setDataDate(DateUtil.now());
-        }else {
-            baseParam.setRepair(true);
-            baseParam.setBeginTime(date+ " 00:00:00");
-            baseParam.setEndTime(date+ " 24:00:00");
-        }
-        liteFlowFeignClient.measurementPointExecutorByHour(baseParam);
-    }
-
-
-}
+//package com.njcn.system.timer.tasks;
+//
+//import cn.hutool.core.date.DatePattern;
+//import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.util.StrUtil;
+//import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
+//import com.njcn.prepare.harmonic.pojo.bo.BaseParam;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * 类的介绍：监测点算法执行链定时任务
+// *
+// * @author xuyang
+// * @version 1.0.0
+// * @createTime 2023/12/6 9:35
+// */
+//@Component
+//@RequiredArgsConstructor
+//public class MeasurementHourTaskRunner implements TimerTaskRunner {
+//
+//    private final LiteFlowFeignClient liteFlowFeignClient;
+//
+//    @Override
+//    public void action(String date) {
+//        BaseParam baseParam = new BaseParam();
+//        baseParam.setFullChain(true);
+//        //由于是按小时跑的，前端其他算法都是按天跑的，因此修改参数
+//        if(StrUtil.isBlank(date)){
+//            baseParam.setRepair(false);
+//            baseParam.setDataDate(DateUtil.now());
+//        }else {
+//            baseParam.setRepair(true);
+//            baseParam.setBeginTime(date+ " 00:00:00");
+//            baseParam.setEndTime(date+ " 24:00:00");
+//        }
+//        liteFlowFeignClient.measurementPointExecutorByHour(baseParam);
+//    }
+//
+//
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementTaskRunner.java
index 7512e1616..b6b5e3acb 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementTaskRunner.java
@@ -1,42 +1,42 @@
-package com.njcn.system.timer.tasks;
-
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.njcn.algorithm.pojo.bo.BaseParam;
-import com.njcn.algorithm.pojo.liteflow.LiteFlowAlgorithmFeignClient;
-import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-/**
- * 类的介绍：监测点算法执行链定时任务
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/12/6 9:35
- */
-@Component
-@RequiredArgsConstructor
-public class MeasurementTaskRunner implements TimerTaskRunner {
-
-    private final LiteFlowFeignClient liteFlowFeignClient;
-
-    private final LiteFlowAlgorithmFeignClient liteFlowAlgorithmFeignClient;
-
-    @Override
-    public void action(String date) {
-        BaseParam baseParam = new BaseParam();
-        baseParam.setFullChain(true);
-        baseParam.setRepair(false);
-        if(StrUtil.isBlank(date)){
-            baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
-        }else {
-            baseParam.setDataDate(date);
-        }
-        liteFlowAlgorithmFeignClient.measurementPointExecutor(baseParam);
-    }
-
-
-}
+//package com.njcn.system.timer.tasks;
+//
+//import cn.hutool.core.date.DatePattern;
+//import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.util.StrUtil;
+//import com.njcn.algorithm.pojo.bo.BaseParam;
+//import com.njcn.algorithm.pojo.liteflow.LiteFlowAlgorithmFeignClient;
+//import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * 类的介绍：监测点算法执行链定时任务
+// *
+// * @author xuyang
+// * @version 1.0.0
+// * @createTime 2023/12/6 9:35
+// */
+//@Component
+//@RequiredArgsConstructor
+//public class MeasurementTaskRunner implements TimerTaskRunner {
+//
+//    private final LiteFlowFeignClient liteFlowFeignClient;
+//
+//    private final LiteFlowAlgorithmFeignClient liteFlowAlgorithmFeignClient;
+//
+//    @Override
+//    public void action(String date) {
+//        BaseParam baseParam = new BaseParam();
+//        baseParam.setFullChain(true);
+//        baseParam.setRepair(false);
+//        if(StrUtil.isBlank(date)){
+//            baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
+//        }else {
+//            baseParam.setDataDate(date);
+//        }
+//        liteFlowAlgorithmFeignClient.measurementPointExecutor(baseParam);
+//    }
+//
+//
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/OrgSubStationTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/OrgSubStationTaskRunner.java
index d691e4966..3ffb667fd 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/OrgSubStationTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/OrgSubStationTaskRunner.java
@@ -1,39 +1,39 @@
-package com.njcn.system.timer.tasks;
-
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
-import com.njcn.prepare.harmonic.pojo.bo.BaseParam;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-/**
- * 类的介绍：监测点算法执行链定时任务
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/12/6 9:35
- */
-@Component
-@RequiredArgsConstructor
-public class OrgSubStationTaskRunner implements TimerTaskRunner {
-
-    private final LiteFlowFeignClient liteFlowFeignClient;
-
-    @Override
-    public void action(String date) {
-        BaseParam baseParam = new BaseParam();
-        baseParam.setFullChain(true);
-        baseParam.setRepair(false);
-        if(StrUtil.isBlank(date)){
-            baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
-        }else {
-            baseParam.setDataDate(date);
-        }
-        liteFlowFeignClient.orgSubStationExecutor(baseParam);
-    }
-
-
-}
+//package com.njcn.system.timer.tasks;
+//
+//import cn.hutool.core.date.DatePattern;
+//import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.util.StrUtil;
+//import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
+//import com.njcn.prepare.harmonic.pojo.bo.BaseParam;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * 类的介绍：监测点算法执行链定时任务
+// *
+// * @author xuyang
+// * @version 1.0.0
+// * @createTime 2023/12/6 9:35
+// */
+//@Component
+//@RequiredArgsConstructor
+//public class OrgSubStationTaskRunner implements TimerTaskRunner {
+//
+//    private final LiteFlowFeignClient liteFlowFeignClient;
+//
+//    @Override
+//    public void action(String date) {
+//        BaseParam baseParam = new BaseParam();
+//        baseParam.setFullChain(true);
+//        baseParam.setRepair(false);
+//        if(StrUtil.isBlank(date)){
+//            baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
+//        }else {
+//            baseParam.setDataDate(date);
+//        }
+//        liteFlowFeignClient.orgSubStationExecutor(baseParam);
+//    }
+//
+//
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/OrgTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/OrgTaskRunner.java
index 80c2b0c4f..cc2e93957 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/OrgTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/OrgTaskRunner.java
@@ -1,38 +1,38 @@
-package com.njcn.system.timer.tasks;
-
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.njcn.algorithm.pojo.bo.BaseParam;
-import com.njcn.algorithm.pojo.liteflow.LiteFlowAlgorithmFeignClient;
-import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-/**
- * 类的介绍：单位监测点算法执行链定时任务
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/12/6 9:35
- */
-@Component
-@RequiredArgsConstructor
-public class OrgTaskRunner implements TimerTaskRunner {
-
-    private final LiteFlowAlgorithmFeignClient liteFlowFeignClient;
-
-    @Override
-    public void action(String date) {
-        BaseParam baseParam = new BaseParam();
-        baseParam.setFullChain(true);
-        baseParam.setRepair(false);
-        if(StrUtil.isBlank(date)){
-            baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
-        }else {
-            baseParam.setDataDate(date);
-        }
-        liteFlowFeignClient.orgPointExecutor(baseParam);
-    }
-}
+//package com.njcn.system.timer.tasks;
+//
+//import cn.hutool.core.date.DatePattern;
+//import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.util.StrUtil;
+//import com.njcn.algorithm.pojo.bo.BaseParam;
+//import com.njcn.algorithm.pojo.liteflow.LiteFlowAlgorithmFeignClient;
+//import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * 类的介绍：单位监测点算法执行链定时任务
+// *
+// * @author xuyang
+// * @version 1.0.0
+// * @createTime 2023/12/6 9:35
+// */
+//@Component
+//@RequiredArgsConstructor
+//public class OrgTaskRunner implements TimerTaskRunner {
+//
+//    private final LiteFlowAlgorithmFeignClient liteFlowFeignClient;
+//
+//    @Override
+//    public void action(String date) {
+//        BaseParam baseParam = new BaseParam();
+//        baseParam.setFullChain(true);
+//        baseParam.setRepair(false);
+//        if(StrUtil.isBlank(date)){
+//            baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
+//        }else {
+//            baseParam.setDataDate(date);
+//        }
+//        liteFlowFeignClient.orgPointExecutor(baseParam);
+//    }
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsDimTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsDimTaskRunner.java
index ef1914b92..e0af7d82c 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsDimTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsDimTaskRunner.java
@@ -1,37 +1,37 @@
-package com.njcn.system.timer.tasks;
-
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
-import com.njcn.prepare.harmonic.pojo.bo.BaseParam;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-/**
- * 类的介绍：变电站母线算法执行链定时任务
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/12/6 9:35
- */
-@Component
-@RequiredArgsConstructor
-public class PmsDimTaskRunner implements TimerTaskRunner {
-
-    private final LiteFlowFeignClient liteFlowFeignClient;
-
-    @Override
-    public void action(String date) {
-        BaseParam baseParam = new BaseParam();
-        baseParam.setFullChain(true);
-        baseParam.setRepair(false);
-        if(StrUtil.isBlank(date)){
-            baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
-        }else {
-            baseParam.setDataDate(date);
-        }
-        liteFlowFeignClient.pmsDimExecutor(baseParam);
-    }
-}
+//package com.njcn.system.timer.tasks;
+//
+//import cn.hutool.core.date.DatePattern;
+//import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.util.StrUtil;
+//import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
+//import com.njcn.prepare.harmonic.pojo.bo.BaseParam;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * 类的介绍：变电站母线算法执行链定时任务
+// *
+// * @author xuyang
+// * @version 1.0.0
+// * @createTime 2023/12/6 9:35
+// */
+//@Component
+//@RequiredArgsConstructor
+//public class PmsDimTaskRunner implements TimerTaskRunner {
+//
+//    private final LiteFlowFeignClient liteFlowFeignClient;
+//
+//    @Override
+//    public void action(String date) {
+//        BaseParam baseParam = new BaseParam();
+//        baseParam.setFullChain(true);
+//        baseParam.setRepair(false);
+//        if(StrUtil.isBlank(date)){
+//            baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
+//        }else {
+//            baseParam.setDataDate(date);
+//        }
+//        liteFlowFeignClient.pmsDimExecutor(baseParam);
+//    }
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsRunStatisticTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsRunStatisticTaskRunner.java
index 85bf5d49d..725eb393e 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsRunStatisticTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsRunStatisticTaskRunner.java
@@ -1,32 +1,32 @@
-package com.njcn.system.timer.tasks;
-
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
-import com.njcn.prepare.harmonic.api.upload.DimBusGlobalFeignClient;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2024/4/17
- */
-@Component
-@RequiredArgsConstructor
-public class PmsRunStatisticTaskRunner implements TimerTaskRunner {
-
-    private final DimBusGlobalFeignClient dimBusGlobalFeignClient;
-
-    @Override
-    public void action(String date) {
-        if(StrUtil.isBlank(date)){
-            date = DateUtil.format(DateUtil.yesterday(),DatePattern.NORM_DATE_PATTERN);
-        }
-        dimBusGlobalFeignClient.runLedgerStatistic(date);
-        dimBusGlobalFeignClient.dimBusUpEveryDay(date);
-    }
-}
+//package com.njcn.system.timer.tasks;
+//
+//import cn.hutool.core.date.DatePattern;
+//import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.util.StrUtil;
+//import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
+//import com.njcn.prepare.harmonic.api.upload.DimBusGlobalFeignClient;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * pqs
+// *
+// * @author cdf
+// * @date 2024/4/17
+// */
+//@Component
+//@RequiredArgsConstructor
+//public class PmsRunStatisticTaskRunner implements TimerTaskRunner {
+//
+//    private final DimBusGlobalFeignClient dimBusGlobalFeignClient;
+//
+//    @Override
+//    public void action(String date) {
+//        if(StrUtil.isBlank(date)){
+//            date = DateUtil.format(DateUtil.yesterday(),DatePattern.NORM_DATE_PATTERN);
+//        }
+//        dimBusGlobalFeignClient.runLedgerStatistic(date);
+//        dimBusGlobalFeignClient.dimBusUpEveryDay(date);
+//    }
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsStatisticsSpecialMonitorTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsStatisticsSpecialMonitorTaskRunner.java
index c4b096f01..9ed3dc80a 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsStatisticsSpecialMonitorTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsStatisticsSpecialMonitorTaskRunner.java
@@ -1,113 +1,113 @@
-package com.njcn.system.timer.tasks;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.njcn.common.pojo.constant.BizParamConstant;
-import com.njcn.prepare.harmonic.api.newalgorithm.PmsStatisticsSpecialMonitorFeignClient;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Objects;
-
-/**
- * 类的介绍：专项分析-台账统计定时任务
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/12/08 11:23
- */
-@Component
-@RequiredArgsConstructor
-@Slf4j
-public class PmsStatisticsSpecialMonitorTaskRunner implements TimerTaskRunner {
-
-    private final PmsStatisticsSpecialMonitorFeignClient pmsStatisticsSpecialMonitorFeignClient;
-
-    @Override
-    public void action(String date) {
-        log.info(LocalDateTime.now()+"专项分析-台账统计调度开始");
-        LineParam lineParam = new LineParam();
-        lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH));
-        lineParam.setDataDate(this.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH));
-        this.commDefineDate(BizParamConstant.STAT_BIZ_MONTH,lineParam);
-        pmsStatisticsSpecialMonitorFeignClient.pmsStatisticsSpecialMonitorHandler(lineParam);
-    }
-
-    public String prepareTimeDeal(String command) {
-        if (StrUtil.isBlank(command)) {
-            log.error(LocalDateTime.now() + "xxl调度任务参数未设置");
-            return null;
-        }
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Calendar calendar = Calendar.getInstance();
-        if (Objects.equals(BizParamConstant.STAT_BIZ_DAY, command)) {
-            calendar.add(Calendar.DAY_OF_MONTH, -1);
-        } else if (Objects.equals(BizParamConstant.STAT_BIZ_MONTH, command)) {
-            calendar.set(Calendar.DAY_OF_MONTH, 1);
-        } else if (Objects.equals(BizParamConstant.STAT_BIZ_QUARTER, command)) {
-            int nowMonth = calendar.get(Calendar.MONTH);
-            calendar.set(Calendar.MONTH, nowMonth - (nowMonth % 3));
-            calendar.set(Calendar.DAY_OF_MONTH, 1);
-            calendar.set(Calendar.HOUR_OF_DAY, 0);
-            calendar.set(Calendar.MINUTE, 0);
-            calendar.set(Calendar.SECOND, 0);
-            calendar.set(Calendar.MILLISECOND, 0);
-        } else if (Objects.equals(BizParamConstant.STAT_BIZ_YEAR, command)) {
-            calendar.set(Calendar.DAY_OF_YEAR, 1);
-        }
-        log.info("job调度时间:" + sdf.format(calendar.getTime()));
-        return sdf.format(calendar.getTime());
-    }
-
-    /**
-     * 根据xxl-job的参数，生成一个任务的起始时间和结束时间
-     *
-     * @author cdf
-     * @date 2023/9/20
-     */
-    public void commDefineDate(String command, LineParam lineParam) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String begin;
-        String end;
-        Calendar calendar = Calendar.getInstance();
-        calendar.add(Calendar.DAY_OF_MONTH, -1);
-        Date temDate = calendar.getTime();
-        switch (command) {
-            case BizParamConstant.STAT_BIZ_DAY:
-                begin = sdf.format(DateUtil.beginOfDay(temDate));
-                end = sdf.format(DateUtil.endOfDay(temDate));
-                break;
-            case BizParamConstant.STAT_BIZ_WEEK:
-                begin = sdf.format(DateUtil.beginOfWeek(temDate));
-                end = sdf.format(DateUtil.endOfWeek(temDate));
-                break;
-            case BizParamConstant.STAT_BIZ_MONTH:
-                begin = sdf.format(DateUtil.beginOfMonth(temDate));
-                end = sdf.format(DateUtil.endOfMonth(temDate));
-                break;
-            case BizParamConstant.STAT_BIZ_QUARTER:
-                begin = sdf.format(DateUtil.beginOfQuarter(temDate));
-                end = sdf.format(DateUtil.endOfQuarter(temDate));
-                break;
-            case BizParamConstant.STAT_BIZ_YEAR:
-                begin = sdf.format(DateUtil.beginOfYear(temDate));
-                end = sdf.format(DateUtil.endOfYear(temDate));
-                break;
-            default:
-                begin = sdf.format(DateUtil.beginOfDay(temDate));
-                end = sdf.format(DateUtil.endOfDay(temDate));
-                break;
-        }
-        lineParam.setBeginTime(begin);
-        lineParam.setEndTime(end);
-        lineParam.setDataDate(begin.substring(0, 10));
-    }
-
-}
+//package com.njcn.system.timer.tasks;
+//
+//import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.util.StrUtil;
+//import com.njcn.common.pojo.constant.BizParamConstant;
+//import com.njcn.prepare.harmonic.api.newalgorithm.PmsStatisticsSpecialMonitorFeignClient;
+//import com.njcn.prepare.harmonic.pojo.param.LineParam;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.stereotype.Component;
+//
+//import java.text.SimpleDateFormat;
+//import java.time.LocalDateTime;
+//import java.util.Calendar;
+//import java.util.Date;
+//import java.util.Objects;
+//
+///**
+// * 类的介绍：专项分析-台账统计定时任务
+// *
+// * @author xuyang
+// * @version 1.0.0
+// * @createTime 2023/12/08 11:23
+// */
+//@Component
+//@RequiredArgsConstructor
+//@Slf4j
+//public class PmsStatisticsSpecialMonitorTaskRunner implements TimerTaskRunner {
+//
+//    private final PmsStatisticsSpecialMonitorFeignClient pmsStatisticsSpecialMonitorFeignClient;
+//
+//    @Override
+//    public void action(String date) {
+//        log.info(LocalDateTime.now()+"专项分析-台账统计调度开始");
+//        LineParam lineParam = new LineParam();
+//        lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH));
+//        lineParam.setDataDate(this.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH));
+//        this.commDefineDate(BizParamConstant.STAT_BIZ_MONTH,lineParam);
+//        pmsStatisticsSpecialMonitorFeignClient.pmsStatisticsSpecialMonitorHandler(lineParam);
+//    }
+//
+//    public String prepareTimeDeal(String command) {
+//        if (StrUtil.isBlank(command)) {
+//            log.error(LocalDateTime.now() + "xxl调度任务参数未设置");
+//            return null;
+//        }
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+//        Calendar calendar = Calendar.getInstance();
+//        if (Objects.equals(BizParamConstant.STAT_BIZ_DAY, command)) {
+//            calendar.add(Calendar.DAY_OF_MONTH, -1);
+//        } else if (Objects.equals(BizParamConstant.STAT_BIZ_MONTH, command)) {
+//            calendar.set(Calendar.DAY_OF_MONTH, 1);
+//        } else if (Objects.equals(BizParamConstant.STAT_BIZ_QUARTER, command)) {
+//            int nowMonth = calendar.get(Calendar.MONTH);
+//            calendar.set(Calendar.MONTH, nowMonth - (nowMonth % 3));
+//            calendar.set(Calendar.DAY_OF_MONTH, 1);
+//            calendar.set(Calendar.HOUR_OF_DAY, 0);
+//            calendar.set(Calendar.MINUTE, 0);
+//            calendar.set(Calendar.SECOND, 0);
+//            calendar.set(Calendar.MILLISECOND, 0);
+//        } else if (Objects.equals(BizParamConstant.STAT_BIZ_YEAR, command)) {
+//            calendar.set(Calendar.DAY_OF_YEAR, 1);
+//        }
+//        log.info("job调度时间:" + sdf.format(calendar.getTime()));
+//        return sdf.format(calendar.getTime());
+//    }
+//
+//    /**
+//     * 根据xxl-job的参数，生成一个任务的起始时间和结束时间
+//     *
+//     * @author cdf
+//     * @date 2023/9/20
+//     */
+//    public void commDefineDate(String command, LineParam lineParam) {
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        String begin;
+//        String end;
+//        Calendar calendar = Calendar.getInstance();
+//        calendar.add(Calendar.DAY_OF_MONTH, -1);
+//        Date temDate = calendar.getTime();
+//        switch (command) {
+//            case BizParamConstant.STAT_BIZ_DAY:
+//                begin = sdf.format(DateUtil.beginOfDay(temDate));
+//                end = sdf.format(DateUtil.endOfDay(temDate));
+//                break;
+//            case BizParamConstant.STAT_BIZ_WEEK:
+//                begin = sdf.format(DateUtil.beginOfWeek(temDate));
+//                end = sdf.format(DateUtil.endOfWeek(temDate));
+//                break;
+//            case BizParamConstant.STAT_BIZ_MONTH:
+//                begin = sdf.format(DateUtil.beginOfMonth(temDate));
+//                end = sdf.format(DateUtil.endOfMonth(temDate));
+//                break;
+//            case BizParamConstant.STAT_BIZ_QUARTER:
+//                begin = sdf.format(DateUtil.beginOfQuarter(temDate));
+//                end = sdf.format(DateUtil.endOfQuarter(temDate));
+//                break;
+//            case BizParamConstant.STAT_BIZ_YEAR:
+//                begin = sdf.format(DateUtil.beginOfYear(temDate));
+//                end = sdf.format(DateUtil.endOfYear(temDate));
+//                break;
+//            default:
+//                begin = sdf.format(DateUtil.beginOfDay(temDate));
+//                end = sdf.format(DateUtil.endOfDay(temDate));
+//                break;
+//        }
+//        lineParam.setBeginTime(begin);
+//        lineParam.setEndTime(end);
+//        lineParam.setDataDate(begin.substring(0, 10));
+//    }
+//
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/RMpEmissionTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/RMpEmissionTaskRunner.java
index 1c240b382..c95b8ce96 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/RMpEmissionTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/RMpEmissionTaskRunner.java
@@ -1,113 +1,113 @@
-package com.njcn.system.timer.tasks;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.njcn.common.pojo.constant.BizParamConstant;
-import com.njcn.prepare.harmonic.api.newalgorithm.RMpEmissionFeignClient;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Objects;
-
-/**
- * 类的介绍：发射特性定时任务
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/12/20 13:55
- */
-@Component
-@RequiredArgsConstructor
-@Slf4j
-public class RMpEmissionTaskRunner implements TimerTaskRunner {
-
-    private final RMpEmissionFeignClient rMpEmissionFeignClient;
-
-    @Override
-    public void action(String date) {
-        log.info(LocalDateTime.now()+"发射特性调度开始");
-        LineParam lineParam = new LineParam();
-        lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH));
-        lineParam.setDataDate(this.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH));
-        this.commDefineDate(BizParamConstant.STAT_BIZ_MONTH,lineParam);
-        rMpEmissionFeignClient.rMpEmissionMHandler(lineParam);
-    }
-
-    public String prepareTimeDeal(String command) {
-        if (StrUtil.isBlank(command)) {
-            log.error(LocalDateTime.now() + "xxl调度任务参数未设置");
-            return null;
-        }
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Calendar calendar = Calendar.getInstance();
-        if (Objects.equals(BizParamConstant.STAT_BIZ_DAY, command)) {
-            calendar.add(Calendar.DAY_OF_MONTH, -1);
-        } else if (Objects.equals(BizParamConstant.STAT_BIZ_MONTH, command)) {
-            calendar.set(Calendar.DAY_OF_MONTH, 1);
-        } else if (Objects.equals(BizParamConstant.STAT_BIZ_QUARTER, command)) {
-            int nowMonth = calendar.get(Calendar.MONTH);
-            calendar.set(Calendar.MONTH, nowMonth - (nowMonth % 3));
-            calendar.set(Calendar.DAY_OF_MONTH, 1);
-            calendar.set(Calendar.HOUR_OF_DAY, 0);
-            calendar.set(Calendar.MINUTE, 0);
-            calendar.set(Calendar.SECOND, 0);
-            calendar.set(Calendar.MILLISECOND, 0);
-        } else if (Objects.equals(BizParamConstant.STAT_BIZ_YEAR, command)) {
-            calendar.set(Calendar.DAY_OF_YEAR, 1);
-        }
-        log.info("job调度时间:" + sdf.format(calendar.getTime()));
-        return sdf.format(calendar.getTime());
-    }
-
-    /**
-     * 根据xxl-job的参数，生成一个任务的起始时间和结束时间
-     *
-     * @author cdf
-     * @date 2023/9/20
-     */
-    public void commDefineDate(String command, LineParam lineParam) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String begin;
-        String end;
-        Calendar calendar = Calendar.getInstance();
-        calendar.add(Calendar.DAY_OF_MONTH, -1);
-        Date temDate = calendar.getTime();
-        switch (command) {
-            case BizParamConstant.STAT_BIZ_DAY:
-                begin = sdf.format(DateUtil.beginOfDay(temDate));
-                end = sdf.format(DateUtil.endOfDay(temDate));
-                break;
-            case BizParamConstant.STAT_BIZ_WEEK:
-                begin = sdf.format(DateUtil.beginOfWeek(temDate));
-                end = sdf.format(DateUtil.endOfWeek(temDate));
-                break;
-            case BizParamConstant.STAT_BIZ_MONTH:
-                begin = sdf.format(DateUtil.beginOfMonth(temDate));
-                end = sdf.format(DateUtil.endOfMonth(temDate));
-                break;
-            case BizParamConstant.STAT_BIZ_QUARTER:
-                begin = sdf.format(DateUtil.beginOfQuarter(temDate));
-                end = sdf.format(DateUtil.endOfQuarter(temDate));
-                break;
-            case BizParamConstant.STAT_BIZ_YEAR:
-                begin = sdf.format(DateUtil.beginOfYear(temDate));
-                end = sdf.format(DateUtil.endOfYear(temDate));
-                break;
-            default:
-                begin = sdf.format(DateUtil.beginOfDay(temDate));
-                end = sdf.format(DateUtil.endOfDay(temDate));
-                break;
-        }
-        lineParam.setBeginTime(begin);
-        lineParam.setEndTime(end);
-        lineParam.setDataDate(begin.substring(0, 10));
-    }
-
-}
+//package com.njcn.system.timer.tasks;
+//
+//import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.util.StrUtil;
+//import com.njcn.common.pojo.constant.BizParamConstant;
+//import com.njcn.prepare.harmonic.api.newalgorithm.RMpEmissionFeignClient;
+//import com.njcn.prepare.harmonic.pojo.param.LineParam;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.stereotype.Component;
+//
+//import java.text.SimpleDateFormat;
+//import java.time.LocalDateTime;
+//import java.util.Calendar;
+//import java.util.Date;
+//import java.util.Objects;
+//
+///**
+// * 类的介绍：发射特性定时任务
+// *
+// * @author xuyang
+// * @version 1.0.0
+// * @createTime 2023/12/20 13:55
+// */
+//@Component
+//@RequiredArgsConstructor
+//@Slf4j
+//public class RMpEmissionTaskRunner implements TimerTaskRunner {
+//
+//    private final RMpEmissionFeignClient rMpEmissionFeignClient;
+//
+//    @Override
+//    public void action(String date) {
+//        log.info(LocalDateTime.now()+"发射特性调度开始");
+//        LineParam lineParam = new LineParam();
+//        lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH));
+//        lineParam.setDataDate(this.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH));
+//        this.commDefineDate(BizParamConstant.STAT_BIZ_MONTH,lineParam);
+//        rMpEmissionFeignClient.rMpEmissionMHandler(lineParam);
+//    }
+//
+//    public String prepareTimeDeal(String command) {
+//        if (StrUtil.isBlank(command)) {
+//            log.error(LocalDateTime.now() + "xxl调度任务参数未设置");
+//            return null;
+//        }
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+//        Calendar calendar = Calendar.getInstance();
+//        if (Objects.equals(BizParamConstant.STAT_BIZ_DAY, command)) {
+//            calendar.add(Calendar.DAY_OF_MONTH, -1);
+//        } else if (Objects.equals(BizParamConstant.STAT_BIZ_MONTH, command)) {
+//            calendar.set(Calendar.DAY_OF_MONTH, 1);
+//        } else if (Objects.equals(BizParamConstant.STAT_BIZ_QUARTER, command)) {
+//            int nowMonth = calendar.get(Calendar.MONTH);
+//            calendar.set(Calendar.MONTH, nowMonth - (nowMonth % 3));
+//            calendar.set(Calendar.DAY_OF_MONTH, 1);
+//            calendar.set(Calendar.HOUR_OF_DAY, 0);
+//            calendar.set(Calendar.MINUTE, 0);
+//            calendar.set(Calendar.SECOND, 0);
+//            calendar.set(Calendar.MILLISECOND, 0);
+//        } else if (Objects.equals(BizParamConstant.STAT_BIZ_YEAR, command)) {
+//            calendar.set(Calendar.DAY_OF_YEAR, 1);
+//        }
+//        log.info("job调度时间:" + sdf.format(calendar.getTime()));
+//        return sdf.format(calendar.getTime());
+//    }
+//
+//    /**
+//     * 根据xxl-job的参数，生成一个任务的起始时间和结束时间
+//     *
+//     * @author cdf
+//     * @date 2023/9/20
+//     */
+//    public void commDefineDate(String command, LineParam lineParam) {
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        String begin;
+//        String end;
+//        Calendar calendar = Calendar.getInstance();
+//        calendar.add(Calendar.DAY_OF_MONTH, -1);
+//        Date temDate = calendar.getTime();
+//        switch (command) {
+//            case BizParamConstant.STAT_BIZ_DAY:
+//                begin = sdf.format(DateUtil.beginOfDay(temDate));
+//                end = sdf.format(DateUtil.endOfDay(temDate));
+//                break;
+//            case BizParamConstant.STAT_BIZ_WEEK:
+//                begin = sdf.format(DateUtil.beginOfWeek(temDate));
+//                end = sdf.format(DateUtil.endOfWeek(temDate));
+//                break;
+//            case BizParamConstant.STAT_BIZ_MONTH:
+//                begin = sdf.format(DateUtil.beginOfMonth(temDate));
+//                end = sdf.format(DateUtil.endOfMonth(temDate));
+//                break;
+//            case BizParamConstant.STAT_BIZ_QUARTER:
+//                begin = sdf.format(DateUtil.beginOfQuarter(temDate));
+//                end = sdf.format(DateUtil.endOfQuarter(temDate));
+//                break;
+//            case BizParamConstant.STAT_BIZ_YEAR:
+//                begin = sdf.format(DateUtil.beginOfYear(temDate));
+//                end = sdf.format(DateUtil.endOfYear(temDate));
+//                break;
+//            default:
+//                begin = sdf.format(DateUtil.beginOfDay(temDate));
+//                end = sdf.format(DateUtil.endOfDay(temDate));
+//                break;
+//        }
+//        lineParam.setBeginTime(begin);
+//        lineParam.setEndTime(end);
+//        lineParam.setDataDate(begin.substring(0, 10));
+//    }
+//
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/RMpInfluenceTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/RMpInfluenceTaskRunner.java
index 4a1fdb7e4..f4cf52503 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/RMpInfluenceTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/RMpInfluenceTaskRunner.java
@@ -1,113 +1,113 @@
-package com.njcn.system.timer.tasks;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.njcn.common.pojo.constant.BizParamConstant;
-import com.njcn.prepare.harmonic.api.newalgorithm.RMpInfluenceFeignClient;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Objects;
-
-/**
- * 类的介绍：
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/12/20 14:12
- */
-@Component
-@RequiredArgsConstructor
-@Slf4j
-public class RMpInfluenceTaskRunner implements TimerTaskRunner {
-
-    private final RMpInfluenceFeignClient rMpInfluenceFeignClient;
-
-    @Override
-    public void action(String date) {
-        log.info(LocalDateTime.now()+"影响特性调度开始");
-        LineParam lineParam = new LineParam();
-        lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH));
-        lineParam.setDataDate(this.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH));
-        this.commDefineDate(BizParamConstant.STAT_BIZ_MONTH,lineParam);
-        rMpInfluenceFeignClient.rMpInfluenceMHandler(lineParam);
-    }
-
-    public String prepareTimeDeal(String command) {
-        if (StrUtil.isBlank(command)) {
-            log.error(LocalDateTime.now() + "xxl调度任务参数未设置");
-            return null;
-        }
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Calendar calendar = Calendar.getInstance();
-        if (Objects.equals(BizParamConstant.STAT_BIZ_DAY, command)) {
-            calendar.add(Calendar.DAY_OF_MONTH, -1);
-        } else if (Objects.equals(BizParamConstant.STAT_BIZ_MONTH, command)) {
-            calendar.set(Calendar.DAY_OF_MONTH, 1);
-        } else if (Objects.equals(BizParamConstant.STAT_BIZ_QUARTER, command)) {
-            int nowMonth = calendar.get(Calendar.MONTH);
-            calendar.set(Calendar.MONTH, nowMonth - (nowMonth % 3));
-            calendar.set(Calendar.DAY_OF_MONTH, 1);
-            calendar.set(Calendar.HOUR_OF_DAY, 0);
-            calendar.set(Calendar.MINUTE, 0);
-            calendar.set(Calendar.SECOND, 0);
-            calendar.set(Calendar.MILLISECOND, 0);
-        } else if (Objects.equals(BizParamConstant.STAT_BIZ_YEAR, command)) {
-            calendar.set(Calendar.DAY_OF_YEAR, 1);
-        }
-        log.info("job调度时间:" + sdf.format(calendar.getTime()));
-        return sdf.format(calendar.getTime());
-    }
-
-    /**
-     * 根据xxl-job的参数，生成一个任务的起始时间和结束时间
-     *
-     * @author cdf
-     * @date 2023/9/20
-     */
-    public void commDefineDate(String command, LineParam lineParam) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String begin;
-        String end;
-        Calendar calendar = Calendar.getInstance();
-        calendar.add(Calendar.DAY_OF_MONTH, -1);
-        Date temDate = calendar.getTime();
-        switch (command) {
-            case BizParamConstant.STAT_BIZ_DAY:
-                begin = sdf.format(DateUtil.beginOfDay(temDate));
-                end = sdf.format(DateUtil.endOfDay(temDate));
-                break;
-            case BizParamConstant.STAT_BIZ_WEEK:
-                begin = sdf.format(DateUtil.beginOfWeek(temDate));
-                end = sdf.format(DateUtil.endOfWeek(temDate));
-                break;
-            case BizParamConstant.STAT_BIZ_MONTH:
-                begin = sdf.format(DateUtil.beginOfMonth(temDate));
-                end = sdf.format(DateUtil.endOfMonth(temDate));
-                break;
-            case BizParamConstant.STAT_BIZ_QUARTER:
-                begin = sdf.format(DateUtil.beginOfQuarter(temDate));
-                end = sdf.format(DateUtil.endOfQuarter(temDate));
-                break;
-            case BizParamConstant.STAT_BIZ_YEAR:
-                begin = sdf.format(DateUtil.beginOfYear(temDate));
-                end = sdf.format(DateUtil.endOfYear(temDate));
-                break;
-            default:
-                begin = sdf.format(DateUtil.beginOfDay(temDate));
-                end = sdf.format(DateUtil.endOfDay(temDate));
-                break;
-        }
-        lineParam.setBeginTime(begin);
-        lineParam.setEndTime(end);
-        lineParam.setDataDate(begin.substring(0, 10));
-    }
-
-}
+//package com.njcn.system.timer.tasks;
+//
+//import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.util.StrUtil;
+//import com.njcn.common.pojo.constant.BizParamConstant;
+//import com.njcn.prepare.harmonic.api.newalgorithm.RMpInfluenceFeignClient;
+//import com.njcn.prepare.harmonic.pojo.param.LineParam;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.stereotype.Component;
+//
+//import java.text.SimpleDateFormat;
+//import java.time.LocalDateTime;
+//import java.util.Calendar;
+//import java.util.Date;
+//import java.util.Objects;
+//
+///**
+// * 类的介绍：
+// *
+// * @author xuyang
+// * @version 1.0.0
+// * @createTime 2023/12/20 14:12
+// */
+//@Component
+//@RequiredArgsConstructor
+//@Slf4j
+//public class RMpInfluenceTaskRunner implements TimerTaskRunner {
+//
+//    private final RMpInfluenceFeignClient rMpInfluenceFeignClient;
+//
+//    @Override
+//    public void action(String date) {
+//        log.info(LocalDateTime.now()+"影响特性调度开始");
+//        LineParam lineParam = new LineParam();
+//        lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH));
+//        lineParam.setDataDate(this.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH));
+//        this.commDefineDate(BizParamConstant.STAT_BIZ_MONTH,lineParam);
+//        rMpInfluenceFeignClient.rMpInfluenceMHandler(lineParam);
+//    }
+//
+//    public String prepareTimeDeal(String command) {
+//        if (StrUtil.isBlank(command)) {
+//            log.error(LocalDateTime.now() + "xxl调度任务参数未设置");
+//            return null;
+//        }
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+//        Calendar calendar = Calendar.getInstance();
+//        if (Objects.equals(BizParamConstant.STAT_BIZ_DAY, command)) {
+//            calendar.add(Calendar.DAY_OF_MONTH, -1);
+//        } else if (Objects.equals(BizParamConstant.STAT_BIZ_MONTH, command)) {
+//            calendar.set(Calendar.DAY_OF_MONTH, 1);
+//        } else if (Objects.equals(BizParamConstant.STAT_BIZ_QUARTER, command)) {
+//            int nowMonth = calendar.get(Calendar.MONTH);
+//            calendar.set(Calendar.MONTH, nowMonth - (nowMonth % 3));
+//            calendar.set(Calendar.DAY_OF_MONTH, 1);
+//            calendar.set(Calendar.HOUR_OF_DAY, 0);
+//            calendar.set(Calendar.MINUTE, 0);
+//            calendar.set(Calendar.SECOND, 0);
+//            calendar.set(Calendar.MILLISECOND, 0);
+//        } else if (Objects.equals(BizParamConstant.STAT_BIZ_YEAR, command)) {
+//            calendar.set(Calendar.DAY_OF_YEAR, 1);
+//        }
+//        log.info("job调度时间:" + sdf.format(calendar.getTime()));
+//        return sdf.format(calendar.getTime());
+//    }
+//
+//    /**
+//     * 根据xxl-job的参数，生成一个任务的起始时间和结束时间
+//     *
+//     * @author cdf
+//     * @date 2023/9/20
+//     */
+//    public void commDefineDate(String command, LineParam lineParam) {
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        String begin;
+//        String end;
+//        Calendar calendar = Calendar.getInstance();
+//        calendar.add(Calendar.DAY_OF_MONTH, -1);
+//        Date temDate = calendar.getTime();
+//        switch (command) {
+//            case BizParamConstant.STAT_BIZ_DAY:
+//                begin = sdf.format(DateUtil.beginOfDay(temDate));
+//                end = sdf.format(DateUtil.endOfDay(temDate));
+//                break;
+//            case BizParamConstant.STAT_BIZ_WEEK:
+//                begin = sdf.format(DateUtil.beginOfWeek(temDate));
+//                end = sdf.format(DateUtil.endOfWeek(temDate));
+//                break;
+//            case BizParamConstant.STAT_BIZ_MONTH:
+//                begin = sdf.format(DateUtil.beginOfMonth(temDate));
+//                end = sdf.format(DateUtil.endOfMonth(temDate));
+//                break;
+//            case BizParamConstant.STAT_BIZ_QUARTER:
+//                begin = sdf.format(DateUtil.beginOfQuarter(temDate));
+//                end = sdf.format(DateUtil.endOfQuarter(temDate));
+//                break;
+//            case BizParamConstant.STAT_BIZ_YEAR:
+//                begin = sdf.format(DateUtil.beginOfYear(temDate));
+//                end = sdf.format(DateUtil.endOfYear(temDate));
+//                break;
+//            default:
+//                begin = sdf.format(DateUtil.beginOfDay(temDate));
+//                end = sdf.format(DateUtil.endOfDay(temDate));
+//                break;
+//        }
+//        lineParam.setBeginTime(begin);
+//        lineParam.setEndTime(end);
+//        lineParam.setDataDate(begin.substring(0, 10));
+//    }
+//
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/SubstationTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/SubstationTaskRunner.java
index b084fe2b3..fff92f070 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/SubstationTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/SubstationTaskRunner.java
@@ -1,38 +1,38 @@
-package com.njcn.system.timer.tasks;
-
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.njcn.algorithm.pojo.bo.BaseParam;
-import com.njcn.algorithm.pojo.liteflow.LiteFlowAlgorithmFeignClient;
-import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
-
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-/**
- * 类的介绍：变电站算法执行链定时任务
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/12/6 9:35
- */
-@Component
-@RequiredArgsConstructor
-public class SubstationTaskRunner implements TimerTaskRunner {
-
-    private final LiteFlowAlgorithmFeignClient liteFlowFeignClient;
-    @Override
-    public void action(String date) {
-        BaseParam baseParam = new BaseParam();
-        baseParam.setFullChain(true);
-        baseParam.setRepair(false);
-        if(StrUtil.isBlank(date)){
-            baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
-        }else {
-            baseParam.setDataDate(date);
-        }
-        liteFlowFeignClient.substationExecutor(baseParam);
-    }
-}
+//package com.njcn.system.timer.tasks;
+//
+//import cn.hutool.core.date.DatePattern;
+//import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.util.StrUtil;
+//import com.njcn.algorithm.pojo.bo.BaseParam;
+//import com.njcn.algorithm.pojo.liteflow.LiteFlowAlgorithmFeignClient;
+//import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
+//
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * 类的介绍：变电站算法执行链定时任务
+// *
+// * @author xuyang
+// * @version 1.0.0
+// * @createTime 2023/12/6 9:35
+// */
+//@Component
+//@RequiredArgsConstructor
+//public class SubstationTaskRunner implements TimerTaskRunner {
+//
+//    private final LiteFlowAlgorithmFeignClient liteFlowFeignClient;
+//    @Override
+//    public void action(String date) {
+//        BaseParam baseParam = new BaseParam();
+//        baseParam.setFullChain(true);
+//        baseParam.setRepair(false);
+//        if(StrUtil.isBlank(date)){
+//            baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
+//        }else {
+//            baseParam.setDataDate(date);
+//        }
+//        liteFlowFeignClient.substationExecutor(baseParam);
+//    }
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwOrgAllRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwOrgAllRunner.java
index 8da5353e2..87c0ff479 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwOrgAllRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwOrgAllRunner.java
@@ -1,31 +1,31 @@
-package com.njcn.system.timer.tasks;
-
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
-import com.njcn.prepare.harmonic.pojo.bo.BaseParam;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-/**
- * pqs
- * 每日定时统计河北两级贯通接口主网数据，用于后续定时上送国网
- * @author cdf
- * @date 2024/2/22
- */
-@Component
-@RequiredArgsConstructor
-public class UploadGwOrgAllRunner implements TimerTaskRunner {
-
-    private final LiteFlowFeignClient liteFlowFeignClient;
-
-    @Override
-    public void action(String date) {
-        BaseParam baseParam = new BaseParam();
-        baseParam.setFullChain(true);
-        baseParam.setRepair(false);
-        baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
-        liteFlowFeignClient.uploadOrgExecutor(baseParam);
-    }
-}
+//package com.njcn.system.timer.tasks;
+//
+//import cn.hutool.core.date.DatePattern;
+//import cn.hutool.core.date.DateUtil;
+//import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
+//import com.njcn.prepare.harmonic.pojo.bo.BaseParam;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * pqs
+// * 每日定时统计河北两级贯通接口主网数据，用于后续定时上送国网
+// * @author cdf
+// * @date 2024/2/22
+// */
+//@Component
+//@RequiredArgsConstructor
+//public class UploadGwOrgAllRunner implements TimerTaskRunner {
+//
+//    private final LiteFlowFeignClient liteFlowFeignClient;
+//
+//    @Override
+//    public void action(String date) {
+//        BaseParam baseParam = new BaseParam();
+//        baseParam.setFullChain(true);
+//        baseParam.setRepair(false);
+//        baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
+//        liteFlowFeignClient.uploadOrgExecutor(baseParam);
+//    }
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/energy/AirControllerRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/energy/AirControllerRunner.java
index e1e7051f9..e1e62c672 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/energy/AirControllerRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/energy/AirControllerRunner.java
@@ -1,19 +1,19 @@
-package com.njcn.system.timer.tasks.energy;
-
-
-import com.njcn.energy.pojo.api.EleAirStrategyFeignClient;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-@Component
-@RequiredArgsConstructor
-public class AirControllerRunner implements TimerTaskRunner {
-
-    private final EleAirStrategyFeignClient eleAirStrategyFeignClient;
-
-    @Override
-    public void action(String date) {
-        eleAirStrategyFeignClient.dealAirStrategyId("close");
-    }
-}
+//package com.njcn.system.timer.tasks.energy;
+//
+//
+//import com.njcn.energy.pojo.api.EleAirStrategyFeignClient;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.stereotype.Component;
+//
+//@Component
+//@RequiredArgsConstructor
+//public class AirControllerRunner implements TimerTaskRunner {
+//
+//    private final EleAirStrategyFeignClient eleAirStrategyFeignClient;
+//
+//    @Override
+//    public void action(String date) {
+//        eleAirStrategyFeignClient.dealAirStrategyId("close");
+//    }
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/energy/EleIntegrityRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/energy/EleIntegrityRunner.java
index 18a96f3d4..3a0300d0d 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/energy/EleIntegrityRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/energy/EleIntegrityRunner.java
@@ -1,18 +1,18 @@
-package com.njcn.system.timer.tasks.energy;
-
-import com.njcn.energy.pojo.api.EnergyStatisticFeignClient;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-@Component
-@RequiredArgsConstructor
-public class EleIntegrityRunner implements TimerTaskRunner {
-
-    private final EnergyStatisticFeignClient energyStatisticFeignClient;
-
-    @Override
-    public void action(String date) {
-        energyStatisticFeignClient.eleIntegrityJobHandler();
-    }
-}
+//package com.njcn.system.timer.tasks.energy;
+//
+//import com.njcn.energy.pojo.api.EnergyStatisticFeignClient;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.stereotype.Component;
+//
+//@Component
+//@RequiredArgsConstructor
+//public class EleIntegrityRunner implements TimerTaskRunner {
+//
+//    private final EnergyStatisticFeignClient energyStatisticFeignClient;
+//
+//    @Override
+//    public void action(String date) {
+//        energyStatisticFeignClient.eleIntegrityJobHandler();
+//    }
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/energy/EleOnlineRateRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/energy/EleOnlineRateRunner.java
index dd0b5e3cf..3e31d472c 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/energy/EleOnlineRateRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/energy/EleOnlineRateRunner.java
@@ -1,18 +1,18 @@
-package com.njcn.system.timer.tasks.energy;
-
-import com.njcn.energy.pojo.api.EnergyStatisticFeignClient;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-@Component
-@RequiredArgsConstructor
-public class EleOnlineRateRunner implements TimerTaskRunner {
-
-    private final EnergyStatisticFeignClient energyStatisticFeignClient;
-
-    @Override
-    public void action(String date) {
-        energyStatisticFeignClient.eleOnlineRateJobHandler();
-    }
-}
+//package com.njcn.system.timer.tasks.energy;
+//
+//import com.njcn.energy.pojo.api.EnergyStatisticFeignClient;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.stereotype.Component;
+//
+//@Component
+//@RequiredArgsConstructor
+//public class EleOnlineRateRunner implements TimerTaskRunner {
+//
+//    private final EnergyStatisticFeignClient energyStatisticFeignClient;
+//
+//    @Override
+//    public void action(String date) {
+//        energyStatisticFeignClient.eleOnlineRateJobHandler();
+//    }
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/energy/EnergyStatisticRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/energy/EnergyStatisticRunner.java
index 97929e628..be790e52a 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/energy/EnergyStatisticRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/energy/EnergyStatisticRunner.java
@@ -1,21 +1,21 @@
-package com.njcn.system.timer.tasks.energy;
-
-
-import com.njcn.energy.pojo.api.EnergyStatisticFeignClient;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-@Component
-@RequiredArgsConstructor
-public class EnergyStatisticRunner implements TimerTaskRunner {
-
-    private final EnergyStatisticFeignClient energyStatisticFeignClient;
-
-    @Override
-    public void action(String date) {
-
-        energyStatisticFeignClient.electricCalJob();
-
-    }
-}
+//package com.njcn.system.timer.tasks.energy;
+//
+//
+//import com.njcn.energy.pojo.api.EnergyStatisticFeignClient;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.stereotype.Component;
+//
+//@Component
+//@RequiredArgsConstructor
+//public class EnergyStatisticRunner implements TimerTaskRunner {
+//
+//    private final EnergyStatisticFeignClient energyStatisticFeignClient;
+//
+//    @Override
+//    public void action(String date) {
+//
+//        energyStatisticFeignClient.electricCalJob();
+//
+//    }
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/report/CustomReportRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/report/CustomReportRunner.java
index 177015e73..c0c142447 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/report/CustomReportRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/report/CustomReportRunner.java
@@ -1,38 +1,38 @@
-package com.njcn.system.timer.tasks.report;
-
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.njcn.harmonic.api.ReportFeignClient;
-import com.njcn.prepare.harmonic.api.line.CustomReportFeignClient;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * 自定义报表预处理
- */
-@Component
-@RequiredArgsConstructor
-@Slf4j
-public class CustomReportRunner implements TimerTaskRunner {
-
-    private final CustomReportFeignClient customReportFeignClient;
-
-
-    @Override
-    public void action(String date) {
-        LineParam lineParam = new LineParam();
-        if(StrUtil.isNotBlank(date)){
-            lineParam.setDataDate(date);
-        }else {
-            DateTime dealDate = DateUtil.yesterday();
-            String end = DateUtil.format(dealDate, DatePattern.NORM_DATE_PATTERN);
-            lineParam.setDataDate(end);
-        }
-        customReportFeignClient.batchReport(lineParam);
-    }
-}
+//package com.njcn.system.timer.tasks.report;
+//
+//import cn.hutool.core.date.DatePattern;
+//import cn.hutool.core.date.DateTime;
+//import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.util.StrUtil;
+//import com.njcn.harmonic.api.ReportFeignClient;
+//import com.njcn.prepare.harmonic.api.line.CustomReportFeignClient;
+//import com.njcn.prepare.harmonic.pojo.param.LineParam;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * 自定义报表预处理
+// */
+//@Component
+//@RequiredArgsConstructor
+//@Slf4j
+//public class CustomReportRunner implements TimerTaskRunner {
+//
+//    private final CustomReportFeignClient customReportFeignClient;
+//
+//
+//    @Override
+//    public void action(String date) {
+//        LineParam lineParam = new LineParam();
+//        if(StrUtil.isNotBlank(date)){
+//            lineParam.setDataDate(date);
+//        }else {
+//            DateTime dealDate = DateUtil.yesterday();
+//            String end = DateUtil.format(dealDate, DatePattern.NORM_DATE_PATTERN);
+//            lineParam.setDataDate(end);
+//        }
+//        customReportFeignClient.batchReport(lineParam);
+//    }
+//}
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/specialAnalysisIndexOverviewTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/specialAnalysisIndexOverviewTaskRunner.java
index 98452708e..080bf703b 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/specialAnalysisIndexOverviewTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/specialAnalysisIndexOverviewTaskRunner.java
@@ -1,113 +1,113 @@
-package com.njcn.system.timer.tasks;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.njcn.common.pojo.constant.BizParamConstant;
-import com.njcn.prepare.harmonic.api.specialanalysis.SpecialAnalysisFeignClient;
-import com.njcn.prepare.harmonic.pojo.param.LineParam;
-import com.njcn.system.timer.TimerTaskRunner;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Objects;
-
-/**
- * 类的介绍：
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/12/20 14:15
- */
-@Component
-@RequiredArgsConstructor
-@Slf4j
-public class specialAnalysisIndexOverviewTaskRunner implements TimerTaskRunner {
-
-    private final SpecialAnalysisFeignClient specialAnalysisFeignClient;
-
-    @Override
-    public void action(String date) {
-        log.info(LocalDateTime.now()+"专项分析-指标总览开始执行");
-        LineParam lineParam = new LineParam();
-        lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH));
-        lineParam.setDataDate(this.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH));
-        this.commDefineDate(BizParamConstant.STAT_BIZ_MONTH,lineParam);
-        specialAnalysisFeignClient.hanlder(lineParam);
-    }
-
-    public String prepareTimeDeal(String command) {
-        if (StrUtil.isBlank(command)) {
-            log.error(LocalDateTime.now() + "xxl调度任务参数未设置");
-            return null;
-        }
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Calendar calendar = Calendar.getInstance();
-        if (Objects.equals(BizParamConstant.STAT_BIZ_DAY, command)) {
-            calendar.add(Calendar.DAY_OF_MONTH, -1);
-        } else if (Objects.equals(BizParamConstant.STAT_BIZ_MONTH, command)) {
-            calendar.set(Calendar.DAY_OF_MONTH, 1);
-        } else if (Objects.equals(BizParamConstant.STAT_BIZ_QUARTER, command)) {
-            int nowMonth = calendar.get(Calendar.MONTH);
-            calendar.set(Calendar.MONTH, nowMonth - (nowMonth % 3));
-            calendar.set(Calendar.DAY_OF_MONTH, 1);
-            calendar.set(Calendar.HOUR_OF_DAY, 0);
-            calendar.set(Calendar.MINUTE, 0);
-            calendar.set(Calendar.SECOND, 0);
-            calendar.set(Calendar.MILLISECOND, 0);
-        } else if (Objects.equals(BizParamConstant.STAT_BIZ_YEAR, command)) {
-            calendar.set(Calendar.DAY_OF_YEAR, 1);
-        }
-        log.info("job调度时间:" + sdf.format(calendar.getTime()));
-        return sdf.format(calendar.getTime());
-    }
-
-    /**
-     * 根据xxl-job的参数，生成一个任务的起始时间和结束时间
-     *
-     * @author cdf
-     * @date 2023/9/20
-     */
-    public void commDefineDate(String command, LineParam lineParam) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String begin;
-        String end;
-        Calendar calendar = Calendar.getInstance();
-        calendar.add(Calendar.DAY_OF_MONTH, -1);
-        Date temDate = calendar.getTime();
-        switch (command) {
-            case BizParamConstant.STAT_BIZ_DAY:
-                begin = sdf.format(DateUtil.beginOfDay(temDate));
-                end = sdf.format(DateUtil.endOfDay(temDate));
-                break;
-            case BizParamConstant.STAT_BIZ_WEEK:
-                begin = sdf.format(DateUtil.beginOfWeek(temDate));
-                end = sdf.format(DateUtil.endOfWeek(temDate));
-                break;
-            case BizParamConstant.STAT_BIZ_MONTH:
-                begin = sdf.format(DateUtil.beginOfMonth(temDate));
-                end = sdf.format(DateUtil.endOfMonth(temDate));
-                break;
-            case BizParamConstant.STAT_BIZ_QUARTER:
-                begin = sdf.format(DateUtil.beginOfQuarter(temDate));
-                end = sdf.format(DateUtil.endOfQuarter(temDate));
-                break;
-            case BizParamConstant.STAT_BIZ_YEAR:
-                begin = sdf.format(DateUtil.beginOfYear(temDate));
-                end = sdf.format(DateUtil.endOfYear(temDate));
-                break;
-            default:
-                begin = sdf.format(DateUtil.beginOfDay(temDate));
-                end = sdf.format(DateUtil.endOfDay(temDate));
-                break;
-        }
-        lineParam.setBeginTime(begin);
-        lineParam.setEndTime(end);
-        lineParam.setDataDate(begin.substring(0, 10));
-    }
-
-}
+//package com.njcn.system.timer.tasks;
+//
+//import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.util.StrUtil;
+//import com.njcn.common.pojo.constant.BizParamConstant;
+//import com.njcn.prepare.harmonic.api.specialanalysis.SpecialAnalysisFeignClient;
+//import com.njcn.prepare.harmonic.pojo.param.LineParam;
+//import com.njcn.system.timer.TimerTaskRunner;
+//import lombok.RequiredArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.stereotype.Component;
+//
+//import java.text.SimpleDateFormat;
+//import java.time.LocalDateTime;
+//import java.util.Calendar;
+//import java.util.Date;
+//import java.util.Objects;
+//
+///**
+// * 类的介绍：
+// *
+// * @author xuyang
+// * @version 1.0.0
+// * @createTime 2023/12/20 14:15
+// */
+//@Component
+//@RequiredArgsConstructor
+//@Slf4j
+//public class specialAnalysisIndexOverviewTaskRunner implements TimerTaskRunner {
+//
+//    private final SpecialAnalysisFeignClient specialAnalysisFeignClient;
+//
+//    @Override
+//    public void action(String date) {
+//        log.info(LocalDateTime.now()+"专项分析-指标总览开始执行");
+//        LineParam lineParam = new LineParam();
+//        lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH));
+//        lineParam.setDataDate(this.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH));
+//        this.commDefineDate(BizParamConstant.STAT_BIZ_MONTH,lineParam);
+//        specialAnalysisFeignClient.hanlder(lineParam);
+//    }
+//
+//    public String prepareTimeDeal(String command) {
+//        if (StrUtil.isBlank(command)) {
+//            log.error(LocalDateTime.now() + "xxl调度任务参数未设置");
+//            return null;
+//        }
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+//        Calendar calendar = Calendar.getInstance();
+//        if (Objects.equals(BizParamConstant.STAT_BIZ_DAY, command)) {
+//            calendar.add(Calendar.DAY_OF_MONTH, -1);
+//        } else if (Objects.equals(BizParamConstant.STAT_BIZ_MONTH, command)) {
+//            calendar.set(Calendar.DAY_OF_MONTH, 1);
+//        } else if (Objects.equals(BizParamConstant.STAT_BIZ_QUARTER, command)) {
+//            int nowMonth = calendar.get(Calendar.MONTH);
+//            calendar.set(Calendar.MONTH, nowMonth - (nowMonth % 3));
+//            calendar.set(Calendar.DAY_OF_MONTH, 1);
+//            calendar.set(Calendar.HOUR_OF_DAY, 0);
+//            calendar.set(Calendar.MINUTE, 0);
+//            calendar.set(Calendar.SECOND, 0);
+//            calendar.set(Calendar.MILLISECOND, 0);
+//        } else if (Objects.equals(BizParamConstant.STAT_BIZ_YEAR, command)) {
+//            calendar.set(Calendar.DAY_OF_YEAR, 1);
+//        }
+//        log.info("job调度时间:" + sdf.format(calendar.getTime()));
+//        return sdf.format(calendar.getTime());
+//    }
+//
+//    /**
+//     * 根据xxl-job的参数，生成一个任务的起始时间和结束时间
+//     *
+//     * @author cdf
+//     * @date 2023/9/20
+//     */
+//    public void commDefineDate(String command, LineParam lineParam) {
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        String begin;
+//        String end;
+//        Calendar calendar = Calendar.getInstance();
+//        calendar.add(Calendar.DAY_OF_MONTH, -1);
+//        Date temDate = calendar.getTime();
+//        switch (command) {
+//            case BizParamConstant.STAT_BIZ_DAY:
+//                begin = sdf.format(DateUtil.beginOfDay(temDate));
+//                end = sdf.format(DateUtil.endOfDay(temDate));
+//                break;
+//            case BizParamConstant.STAT_BIZ_WEEK:
+//                begin = sdf.format(DateUtil.beginOfWeek(temDate));
+//                end = sdf.format(DateUtil.endOfWeek(temDate));
+//                break;
+//            case BizParamConstant.STAT_BIZ_MONTH:
+//                begin = sdf.format(DateUtil.beginOfMonth(temDate));
+//                end = sdf.format(DateUtil.endOfMonth(temDate));
+//                break;
+//            case BizParamConstant.STAT_BIZ_QUARTER:
+//                begin = sdf.format(DateUtil.beginOfQuarter(temDate));
+//                end = sdf.format(DateUtil.endOfQuarter(temDate));
+//                break;
+//            case BizParamConstant.STAT_BIZ_YEAR:
+//                begin = sdf.format(DateUtil.beginOfYear(temDate));
+//                end = sdf.format(DateUtil.endOfYear(temDate));
+//                break;
+//            default:
+//                begin = sdf.format(DateUtil.beginOfDay(temDate));
+//                end = sdf.format(DateUtil.endOfDay(temDate));
+//                break;
+//        }
+//        lineParam.setBeginTime(begin);
+//        lineParam.setEndTime(end);
+//        lineParam.setDataDate(begin.substring(0, 10));
+//    }
+//
+//}