|
@@ -379,8 +379,10 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
|
|
|
queryEquipDTO.setCondition(queryRuleObjRelDTO.getCondition());
|
|
|
List<EquipItem> records = groupManagementService.getEquipList(queryEquipDTO);
|
|
|
//查询项目下所有已绑定的报警对象
|
|
|
+ List<String> projectAlarmRuleIdList = projectAlarmRuleService.queryAlarmRule(queryRuleObjRelDTO);
|
|
|
QueryWrapper<ProjectAlarmRuleObjRel> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_PROJECT_ID, projectId);
|
|
|
+ queryWrapper.in(ProjectAlarmRuleObjRel.PROP_PROJECT_ALARM_RULE_ID, projectAlarmRuleIdList);
|
|
|
queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_VALID, ValidEnum.TRUE.getType());
|
|
|
queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_OPEN, 1);
|
|
|
List<ProjectAlarmRuleObjRel> list = list(queryWrapper);
|