diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BizAlarmLevelServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BizAlarmLevelServiceImpl.java index fe6c7c6..8875b73 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BizAlarmLevelServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BizAlarmLevelServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.modular.system.dao.BizAlarmLevelMapper; import com.casic.missiles.modular.system.model.BizAlarmLevel; -import com.casic.missiles.modular.system.model.BizAlarmRule; import com.casic.missiles.modular.system.model.BizSensor; import com.casic.missiles.modular.system.service.IBizAlarmLevelService; import com.casic.missiles.modular.system.service.IBizAlarmRuleService; @@ -38,14 +37,9 @@ List sensors = sensorService.selectList(query); sensors.stream().forEach(sensor -> { // 查询告警规则 - EntityWrapper ruleQuery = new EntityWrapper<>(); - ruleQuery.eq("del_flag", 0); + EntityWrapper ruleQuery = new EntityWrapper<>(); ruleQuery.eq("sensor", sensor.getSensor()); - sensor.setHasAlarmLevel(ruleService.selectCount(ruleQuery) > 0); - // 查询配置规则 - EntityWrapper sensorQuery = new EntityWrapper(); - sensorQuery.eq("sensor", sensor.getSensor()); - BizSensor bizSensor = sensorService.selectOne(sensorQuery); + sensor.setHasAlarmLevel(this.selectCount(ruleQuery) > 0); }); return sensors; }