修改分析光伏预警生成数据不对

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

@@ -2430,7 +2430,6 @@ public class CommonServiceImpl {
      *
      * @param fanHealthIndices
      */
-    @Async
     public void insertFanDataTDEngine(ArrayList<FanHealthIndex> fanHealthIndices, String recDate, String analysisType) {
         idxFanHealthIndexMapper.deleteAllDataByTableName("fan_health_index_latest_data", analysisType);
         // 按时刻 - 测点插入
@@ -2988,7 +2987,6 @@ public class CommonServiceImpl {
      *
      * @param pvHealthIndices
      */
-    @Async
     public void insertPvDataTDEngine(ArrayList<PvHealthIndex> pvHealthIndices, String recDate, String analysisType) {
 
         idxFanHealthIndexMapper.deleteAllDataByTableName("pv_health_index_latest_data", analysisType);

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

@@ -167,7 +167,6 @@ public class HealthStatusIndicatorServiceImpl {
 	 */
 
 	// @Scheduled(cron = "0 0 */1 * * ?")
-	@Async("async")
 	public void healthWarningMinuteGF(Date time) {
 		String format = DateUtil.format(time, "yyyy-MM-dd HH:mm:00");
 //        Date date = DateUtils.dateAddHours(time, -8);
@@ -545,7 +544,6 @@ public class HealthStatusIndicatorServiceImpl {
 //
 //    }
 
-	@Async("async")
 	public void healthWarningMinuteGF(Date time, String gatewayId) {
 		if (!openHealth) {
 			return;
@@ -753,7 +751,6 @@ public class HealthStatusIndicatorServiceImpl {
 	 */
 
 	// @Scheduled(cron = "0 0 0/1 * * ?")
-	@Async("async")
 	public void healthWarningHourGF() {
 		if (!openHealth) {
 			return;
@@ -959,7 +956,6 @@ public class HealthStatusIndicatorServiceImpl {
 
 //    @Scheduled(cron = "0 0 0/1 * * ?")
 //    @Scheduled(cron = "0 0/5 * * * ?")
-	@Async("async")
 	public void healthWarningHourGFNew() {
 
 		if (!openHealth) {
@@ -1181,7 +1177,6 @@ public class HealthStatusIndicatorServiceImpl {
 	 */
 
 	// @Scheduled(cron = "0 0 0 0/1 * ? ")
-	@Async("async")
 	public void healthWarningDayGF() {
 		if (!openHealth) {
 			return;
@@ -1390,7 +1385,6 @@ public class HealthStatusIndicatorServiceImpl {
 	}
 
 //    @Scheduled(cron = "0 0 0 0/1 * ? ")
-	@Async("async")
 	public void healthWarningDayGFNew() {
 		if (!openHealth) {
 			return;
@@ -1611,7 +1605,6 @@ public class HealthStatusIndicatorServiceImpl {
 	}
 
 	// @Scheduled(cron = "0 0 */1 * * ?")
-	@Async("async")
 	public void healthWarningMinute(Date time) {
 		if (!openHealth) {
 			return;
@@ -1836,7 +1829,6 @@ public class HealthStatusIndicatorServiceImpl {
 		fetchDataFan(tdFanWarningRecordList, stationMap);
 	}
 
-	@Async("async")
 	// @PostConstruct
 	public void healthWarningMinute(Date time, String gatewayId) {
 		if (!openHealth) {
@@ -2069,7 +2061,6 @@ public class HealthStatusIndicatorServiceImpl {
 	 */
 
 	// @Scheduled(cron = "0 0 0/1 * * ?")
-	@Async("async")
 	// @PostConstruct
 	public void healthWarningHour() {
 //        if (!openHealth) {
@@ -2294,7 +2285,6 @@ public class HealthStatusIndicatorServiceImpl {
 	}
 
 //    @Scheduled(cron = "0 0 0/1 * * ?")
-	@Async("async")
 	public void healthWarningHourNew() {
 		if (!openHealth) {
 			return;
@@ -2517,7 +2507,6 @@ public class HealthStatusIndicatorServiceImpl {
 	 */
 
 	// @Scheduled(cron = "0 0 0 0/1 * ? ")
-	@Async("async")
 	public void healthWarningDay() {
 		if (!openHealth) {
 			return;
@@ -2734,7 +2723,6 @@ public class HealthStatusIndicatorServiceImpl {
 	}
 
 //    @Scheduled(cron = "0 0 0 0/1 * ? ")
-	@Async("async")
 	public void healthWarningDayNew() {
 		if (!openHealth) {
 			return;