diff --git a/src/main/java/com/gunshi/project/hsz/service/WarningRuleService.java b/src/main/java/com/gunshi/project/hsz/service/WarningRuleService.java index 22c0adf..393d6b9 100644 --- a/src/main/java/com/gunshi/project/hsz/service/WarningRuleService.java +++ b/src/main/java/com/gunshi/project/hsz/service/WarningRuleService.java @@ -2,6 +2,7 @@ package com.gunshi.project.hsz.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gunshi.project.hsz.entity.so.WarningRulePageSo; @@ -87,7 +88,11 @@ public class WarningRuleService extends ServiceImpl eq = warningConditionService.lambdaQuery().eq(WarningCondition::getRuleId, dto.getId()); + boolean remove = warningConditionService.remove(eq); + if(remove){ + warningConditionService.updateBatchById(conditions); + } return true; } diff --git a/src/main/java/com/gunshi/project/hsz/timetask/WarningRuleTask.java b/src/main/java/com/gunshi/project/hsz/timetask/WarningRuleTask.java index 008c7e6..6f13bf4 100644 --- a/src/main/java/com/gunshi/project/hsz/timetask/WarningRuleTask.java +++ b/src/main/java/com/gunshi/project/hsz/timetask/WarningRuleTask.java @@ -12,7 +12,9 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Profile; +import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.math.BigDecimal; @@ -64,6 +66,8 @@ public class WarningRuleTask { @Autowired private RainBasinDivisionService rainBasinDivisionService; + @Scheduled(fixedDelay = 60 * 60 * 1000) // 75分钟,单位毫秒 + @Async public void warningRuleExecute(){ //获取配置的预警规则 List warningRules = warningRuleService.listData();