|
@@ -378,21 +378,21 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
|
|
|
queryEquipDTO.setClassCode(queryRuleObjRelDTO.getClassCode());
|
|
|
queryEquipDTO.setCondition(queryRuleObjRelDTO.getCondition());
|
|
|
List<EquipItem> records = groupManagementService.getEquipList(queryEquipDTO);
|
|
|
- Map<String, EquipItem> partitionMap = records.stream().collect(Collectors.toMap(EquipItem::getId, equip -> equip, (k1, k2) -> k1));
|
|
|
//查询项目下所有已绑定的报警对象
|
|
|
QueryWrapper<ProjectAlarmRuleObjRel> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_PROJECT_ID, projectId);
|
|
|
queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_VALID, ValidEnum.TRUE.getType());
|
|
|
queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_OPEN, 1);
|
|
|
List<ProjectAlarmRuleObjRel> list = list(queryWrapper);
|
|
|
+ Map<String, ProjectAlarmRuleObjRel> partitionMap = list.stream().collect(Collectors.toMap(ProjectAlarmRuleObjRel::getObjId, equip -> equip, (k1, k2) -> k1));
|
|
|
+
|
|
|
//筛选未绑定的报警对象
|
|
|
- for (ProjectAlarmRuleObjRel projectAlarmRuleObjRel : list) {
|
|
|
- String objId = projectAlarmRuleObjRel.getObjId();
|
|
|
- if (!partitionMap.containsKey(objId)) {
|
|
|
- EquipItem equipItem = partitionMap.get(objId);
|
|
|
+ for (EquipItem record : records) {
|
|
|
+ String id = record.getId();
|
|
|
+ if (!partitionMap.containsKey(id)) {
|
|
|
ProjectAlarmRuleObjRel projectAlarmRuleObjRelVO = new ProjectAlarmRuleObjRel();
|
|
|
- projectAlarmRuleObjRelVO.setObjId(equipItem.getId());
|
|
|
- projectAlarmRuleObjRelVO.setObjName(equipItem.getName());
|
|
|
+ projectAlarmRuleObjRelVO.setObjId(record.getId());
|
|
|
+ projectAlarmRuleObjRelVO.setObjName(record.getName());
|
|
|
resultList.add(projectAlarmRuleObjRelVO);
|
|
|
}
|
|
|
}
|