|
@@ -187,17 +187,7 @@ public class GroupAlarmRuleServiceImpl extends ServiceImpl<GroupAlarmRuleMapper,
|
|
List<UpdateAlarmConfigDTO> updateAlarmConfigDTOs = new ArrayList();
|
|
List<UpdateAlarmConfigDTO> updateAlarmConfigDTOs = new ArrayList();
|
|
String condition = updateGroupAlarmRuleDTO.getCondition();
|
|
String condition = updateGroupAlarmRuleDTO.getCondition();
|
|
String classCode = updateGroupAlarmRuleDTO.getClassCode();
|
|
String classCode = updateGroupAlarmRuleDTO.getClassCode();
|
|
- List<ProjectVO> projects = projectAlarmRuleService.getProject();
|
|
|
|
- List<EquipItem> records = new ArrayList<>();
|
|
|
|
- for (ProjectVO project : projects) {
|
|
|
|
- QueryEquipDTO queryEquipDTO = new QueryEquipDTO();
|
|
|
|
- queryEquipDTO.setClassCode(classCode);
|
|
|
|
- queryEquipDTO.setCondition(condition);
|
|
|
|
- queryEquipDTO.setProjectId(project.getProjectId());
|
|
|
|
- List<EquipItem> equipList = groupManagementService.getEquipList(queryEquipDTO);
|
|
|
|
- records.addAll(equipList);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ List<EquipItem> records = this.getAllEquip(classCode, condition);
|
|
Map<String, Object> stringMap = alarmConditionService.frontend2Backend(alarmCondition.getFrontend());
|
|
Map<String, Object> stringMap = alarmConditionService.frontend2Backend(alarmCondition.getFrontend());
|
|
for (EquipItem record : records) {
|
|
for (EquipItem record : records) {
|
|
AlarmCondition alarmCondit = new AlarmCondition();
|
|
AlarmCondition alarmCondit = new AlarmCondition();
|
|
@@ -345,21 +335,23 @@ public class GroupAlarmRuleServiceImpl extends ServiceImpl<GroupAlarmRuleMapper,
|
|
String condition = deleteGroupAlarmRuleDTO.getCondition();
|
|
String condition = deleteGroupAlarmRuleDTO.getCondition();
|
|
String classCode = deleteGroupAlarmRuleDTO.getClassCode();
|
|
String classCode = deleteGroupAlarmRuleDTO.getClassCode();
|
|
//查询所有设备
|
|
//查询所有设备
|
|
- List<EquipItem> records = groupManagementService.getEquipList(condition, classCode);
|
|
|
|
- List<String> objIds = records.stream().map(EquipItem::getId).collect(Collectors.toList());
|
|
|
|
|
|
+ List<EquipItem> equips = this.getAllEquip(classCode, condition);
|
|
|
|
+ List<String> objIds = equips.stream().map(EquipItem::getId).collect(Collectors.toList());
|
|
QueryAlarmConfigDTO queryAlarmConfigDTO = new QueryAlarmConfigDTO();
|
|
QueryAlarmConfigDTO queryAlarmConfigDTO = new QueryAlarmConfigDTO();
|
|
queryAlarmConfigDTO.setObjId(objIds);
|
|
queryAlarmConfigDTO.setObjId(objIds);
|
|
DmpResult<List<AlarmConfigItem>> query = alarmConfigService.query(queryAlarmConfigDTO);
|
|
DmpResult<List<AlarmConfigItem>> query = alarmConfigService.query(queryAlarmConfigDTO);
|
|
//所有设备条件
|
|
//所有设备条件
|
|
List<AlarmConfigItem> data = query.getData();
|
|
List<AlarmConfigItem> data = query.getData();
|
|
//组织删除参数
|
|
//组织删除参数
|
|
- data.forEach(alarmConfigItem -> {
|
|
|
|
- DeleteAlarmConfigDTO deleteAlarmConfigDTO = new DeleteAlarmConfigDTO();
|
|
|
|
- deleteAlarmConfigDTO.setId(alarmConfigItem.getId());
|
|
|
|
- alarmConfigs.add(deleteAlarmConfigDTO);
|
|
|
|
- });
|
|
|
|
- batchDeleteAlarmConfigDTO.setAlarmConfigs(alarmConfigs);
|
|
|
|
- alarmConfigService.batchDelete(batchDeleteAlarmConfigDTO);
|
|
|
|
|
|
+ if(data.size()>0){
|
|
|
|
+ data.forEach(alarmConfigItem -> {
|
|
|
|
+ DeleteAlarmConfigDTO deleteAlarmConfigDTO = new DeleteAlarmConfigDTO();
|
|
|
|
+ deleteAlarmConfigDTO.setId(alarmConfigItem.getId());
|
|
|
|
+ alarmConfigs.add(deleteAlarmConfigDTO);
|
|
|
|
+ });
|
|
|
|
+ batchDeleteAlarmConfigDTO.setAlarmConfigs(alarmConfigs);
|
|
|
|
+ alarmConfigService.batchDelete(batchDeleteAlarmConfigDTO);
|
|
|
|
+ }
|
|
//删除设备报警条件 end
|
|
//删除设备报警条件 end
|
|
}
|
|
}
|
|
|
|
|
|
@@ -410,4 +402,19 @@ public class GroupAlarmRuleServiceImpl extends ServiceImpl<GroupAlarmRuleMapper,
|
|
}
|
|
}
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ public List<EquipItem> getAllEquip(String classCode,String condition){
|
|
|
|
+ //查询所有项目
|
|
|
|
+ List<ProjectVO> projects = projectAlarmRuleService.getProject();
|
|
|
|
+ List<EquipItem> records = new ArrayList<>();
|
|
|
|
+ for (ProjectVO project : projects) {
|
|
|
|
+ QueryEquipDTO queryEquipDTO = new QueryEquipDTO();
|
|
|
|
+ queryEquipDTO.setProjectId(project.getProjectId());
|
|
|
|
+ queryEquipDTO.setClassCode(classCode);
|
|
|
|
+ queryEquipDTO.setCondition(condition);
|
|
|
|
+ List<EquipItem> record = groupManagementService.getEquipList(queryEquipDTO);
|
|
|
|
+ records.addAll(record);
|
|
|
|
+ }
|
|
|
|
+ return records;
|
|
|
|
+ }
|
|
}
|
|
}
|