解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorAsync.java

-package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
-
-import com.google.common.collect.Lists;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.IndexDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @description:
- * @author: tw
- * @createDate: 2023/7/4
- */
-@Component
-public class MonitorFanIndicatorAsync {
-    @Autowired
-    MonitorFanIndicatorImpl monitorFanIndicatorImpl;
-    @Value("${station.section}")
-    private int stationSection;
-    @Value("${station.isok}")
-    private boolean  isok;
-
-
-    @Async("jxiopAsyncExecutor")
-    public void UpdateMonitorFanIndicator(List<IndexDto> list){
-        monitorFanIndicatorImpl.UpdateMonitorFanIndicator(list);
-    }
-
-
-}
+//package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+//
+//import com.google.common.collect.Lists;
+//import com.yeejoin.amos.boot.module.jxiop.api.dto.IndexDto;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.scheduling.annotation.Async;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.List;
+//
+///**
+// * @description:
+// * @author: tw
+// * @createDate: 2023/7/4
+// */
+//@Component
+//public class MonitorFanIndicatorAsync {
+//    @Autowired
+//    MonitorFanIndicatorImpl monitorFanIndicatorImpl;
+//    @Value("${station.section}")
+//    private int stationSection;
+//    @Value("${station.isok}")
+//    private boolean  isok;
+//
+//
+//    @Async("jxiopAsyncExecutor")
+//    public void UpdateMonitorFanIndicator(List<IndexDto> list){
+//        monitorFanIndicatorImpl.UpdateMonitorFanIndicator(list);
+//    }
+//
+//
+//}

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/StationDataTaskImpl.java

@@ -36,8 +36,8 @@ public class StationDataTaskImpl {
 
 //    @Autowired
 //    InfluxDButils influxDButils;
-    @Autowired
-    MonitorFanIndicatorAsync monitorFanIndicatorAsync;
+//    @Autowired
+//    MonitorFanIndicatorAsync monitorFanIndicatorAsync;
 
     /**
      * 获取 List<StationTaksDto>