启动类注释部分

generationXK-service/src/main/java/com/gyee/generation/GenerationMain.java

@@ -55,14 +55,14 @@ public class GenerationMain {
             logger.info(df.format(c.getTime()).toString());
 
 
-            EquipmentInfo1Service equipmentInfo1Service = SpringUtils.getBean("equipmentInfo1Service");
+//            EquipmentInfo1Service equipmentInfo1Service = SpringUtils.getBean("equipmentInfo1Service");
 //            EquipmentInfo2Service equipmentInfo2Service = SpringUtils.getBean("equipmentInfo2Service");
 //            EquipmentInfo3Service equipmentInfo3Service = SpringUtils.getBean("equipmentInfo3Service");
 
 
-            equipmentInfo1Service.calEquipmentInfoDay(begin);
-            logger.info("equipmentInfo1Service完成一次!。。。。。。");
-            TimeUnit.SECONDS.sleep(3);
+//            equipmentInfo1Service.calEquipmentInfoDay(begin);
+//            logger.info("equipmentInfo1Service完成一次!。。。。。。");
+//            TimeUnit.SECONDS.sleep(3);
 //            equipmentInfo2Service.calEquipmentInfoDay(begin);
 //            logger.info("equipmentInfo2Service完成一次!。。。。。。");
 //            TimeUnit.SECONDS.sleep(3);

generationXK-service/src/main/java/com/gyee/generation/task/AnalysisTask.java

@@ -32,6 +32,8 @@ public class AnalysisTask {
     private EquipmentInfo2Service equipmentInfo2Service;
     @Autowired
     private EquipmentInfo4Service equipmentInfo4Service;
+    @Autowired
+    private EquipmentInfo1Service equipmentInfo1Service;
 
     @Resource
     @Qualifier("taskScheduler") // 指定使用特定的 TaskScheduler
@@ -94,6 +96,20 @@ public class AnalysisTask {
     // 每15分钟 - 设备指标2
     @Async
     @Scheduled(cron = "0 0/15 * * * ?")
+    public void sbzb1() {
+        try {
+            logger.info("设备指标1调度程序执行开始");
+            Date date = new Date();
+            equipmentInfo1Service.calEquipmentInfoDay(date);
+            logger.info("设备指标1调度程序执行完成");
+        } catch (Exception e) {
+            logger.error("设备指标1调度任务执行失败", e);
+        }
+    }
+
+    // 每15分钟 - 设备指标2
+    @Async
+    @Scheduled(cron = "0 0/15 * * * ?")
     public void sbzb2() {
         try {
             logger.info("设备指标2调度程序执行开始");

generationXK-service/src/main/java/com/gyee/generation/task/thread/EquipmentInfo1ThreadPool.java

@@ -117,8 +117,8 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 
         if (pewp.getWindpowerstationId().contains(WpType.FDC.id)) {
             //*******************************************日信息统计*********************************************************/
-            if (pointmap.containsKey(ContantXk.RPJFS)) {
-                ProBasicEquipmentPoint point = pointmap.get(ContantXk.RPJFS);
+            if (pointmap.containsKey(ContantXk.CJ_SSFS)) {
+                ProBasicEquipmentPoint point = pointmap.get(ContantXk.CJ_SSFS);
                 List<PointData> pointls = edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime() / 1000, end.getTime() / 1000);
 
                 pointls = pointls.stream().filter(n -> (n.getPointValueInDouble() > 0 && n.getPointValueInDouble() < 30)).collect(Collectors.toList());