|
@@ -382,10 +382,12 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
|
|
|
List<String> projectAlarmRuleIdList = projectAlarmRuleService.queryAlarmRule(queryRuleObjRelDTO);
|
|
|
QueryWrapper<ProjectAlarmRuleObjRel> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_PROJECT_ID, projectId);
|
|
|
- if(projectAlarmRuleIdList.size()>0)
|
|
|
- queryWrapper.in(ProjectAlarmRuleObjRel.PROP_PROJECT_ALARM_RULE_ID, projectAlarmRuleIdList);
|
|
|
+ if (projectAlarmRuleIdList.size() > 0)
|
|
|
+ queryWrapper.in(ProjectAlarmRuleObjRel.PROP_PROJECT_ALARM_RULE_ID, projectAlarmRuleIdList);
|
|
|
queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_VALID, ValidEnum.TRUE.getType());
|
|
|
- queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_OPEN, 1);
|
|
|
+ //新增项目报警,要把屏蔽的查出来
|
|
|
+ if (StringUtils.isBlank(queryRuleObjRelDTO.getProjectAlarmRuleId()))
|
|
|
+ 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));
|
|
|
|
|
@@ -395,57 +397,11 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
|
|
|
if (!partitionMap.containsKey(id)) {
|
|
|
ProjectAlarmRuleObjRel projectAlarmRuleObjRelVO = new ProjectAlarmRuleObjRel();
|
|
|
projectAlarmRuleObjRelVO.setObjId(record.getId());
|
|
|
- projectAlarmRuleObjRelVO.setObjName(record.getName());
|
|
|
+ projectAlarmRuleObjRelVO.setObjName(record.getLocalName());
|
|
|
resultList.add(projectAlarmRuleObjRelVO);
|
|
|
}
|
|
|
}
|
|
|
return ConvertProjectAlarmRuleObjRelTool.INSTANCE.convert2List(resultList);
|
|
|
-//
|
|
|
-// List<ProjectAlarmRuleObjRelListItemVO> resultList = new ArrayList<>();
|
|
|
-// //查询未绑定的报警对象 begin
|
|
|
-// String projectId = queryRuleObjRelDTO.getProjectId();
|
|
|
-// QueryEquipDTO queryEquipDTO = new QueryEquipDTO();
|
|
|
-// queryEquipDTO.setProjectId(projectId);
|
|
|
-// 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));
|
|
|
-// //根据项目报警ID查询已绑定的报警对象
|
|
|
-// List<String> projectAlarmRuleIdList = projectAlarmRuleService.queryAlarmRule(queryRuleObjRelDTO);
|
|
|
-// List<ProjectAlarmRuleObjRel> rels = this.queryObjRelList(projectAlarmRuleIdList);
|
|
|
-// List<String> objIds = rels.stream().map(ProjectAlarmRuleObjRel::getObjId).distinct().collect(Collectors.toList());
|
|
|
-// if (objIds.size() == 0) {
|
|
|
-// for (EquipItem record : records) {
|
|
|
-// ProjectAlarmRuleObjRelListItemVO projectAlarmRuleObjRelVO = new ProjectAlarmRuleObjRelListItemVO();
|
|
|
-// projectAlarmRuleObjRelVO.setObjId(record.getId());
|
|
|
-// projectAlarmRuleObjRelVO.setObjName(record.getName());
|
|
|
-// resultList.add(projectAlarmRuleObjRelVO);
|
|
|
-// }
|
|
|
-// } else {
|
|
|
-// for (String objId : objIds) {
|
|
|
-// if (!partitionMap.containsKey(objId)) {
|
|
|
-// ProjectAlarmRuleObjRelListItemVO projectAlarmRuleObjRelVO = new ProjectAlarmRuleObjRelListItemVO();
|
|
|
-// EquipItem equipItem = partitionMap.get(objId);
|
|
|
-// projectAlarmRuleObjRelVO.setObjId(equipItem.getId());
|
|
|
-// projectAlarmRuleObjRelVO.setObjName(equipItem.getName());
|
|
|
-// resultList.add(projectAlarmRuleObjRelVO);
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
-// //查询未绑定的报警对象 end
|
|
|
-// if (StringUtils.isNotBlank(queryRuleObjRelDTO.getProjectAlarmRuleId())) {
|
|
|
-// //修改
|
|
|
-// QueryWrapper<ProjectAlarmRuleObjRel> queryWrapper = new QueryWrapper<>();
|
|
|
-// queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_PROJECT_ALARM_RULE_ID, queryRuleObjRelDTO.getProjectAlarmRuleId());
|
|
|
-// queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_VALID, ValidEnum.TRUE.getType());
|
|
|
-// queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_OPEN, 1);
|
|
|
-// List<ProjectAlarmRuleObjRel> relList = list(queryWrapper);
|
|
|
-// resultList = ConvertProjectAlarmRuleObjRelTool.INSTANCE.convert2List(relList);
|
|
|
-//
|
|
|
-// }
|
|
|
-// resultList = resultList.stream().filter(item -> item.getObjName() != null).sorted(Comparator.comparing(ProjectAlarmRuleObjRelListItemVO::getObjName,
|
|
|
-// Collator.getInstance(java.util.Locale.CHINA))).collect(Collectors.toList());
|
|
|
-// return resultList;
|
|
|
}
|
|
|
|
|
|
private static <T> Predicate<T> distinctByKey(Function<? super T, Object> keyExtractor) {
|