|
@@ -326,7 +326,7 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
|
|
|
public void deleteBatch() {
|
|
|
List<ProjectVO> project = projectAlarmRuleService.getProject();
|
|
|
List<String> list = project.stream().map(ProjectVO::getProjectId).collect(Collectors.toList());
|
|
|
- list.forEach(projectId-> projectId = "Pj" +projectId);
|
|
|
+ list.forEach(projectId -> projectId = "Pj" + projectId);
|
|
|
QueryWrapper<ProjectAlarmRuleObjRel> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.in(ProjectAlarmRuleObjRel.PROP_PROJECT_ID, list);
|
|
|
ProjectAlarmRuleObjRel projectAlarmRuleObjRel = new ProjectAlarmRuleObjRel();
|
|
@@ -373,14 +373,23 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
|
|
|
List<String> projectAlarmRuleIdList = projectAlarmRuleService.queryAlarmRule(queryRuleObjRelDTO);
|
|
|
List<ProjectAlarmRuleObjRel> rels = this.queryObjRelList(projectAlarmRuleIdList);
|
|
|
List<String> objIds = rels.stream().map(ProjectAlarmRuleObjRel::getObjId).distinct().collect(Collectors.toList());
|
|
|
- for (String objId : objIds) {
|
|
|
- if (!partitionMap.containsKey(objId)) {
|
|
|
+ if (objIds.size() == 0) {
|
|
|
+ for (EquipItem record : records) {
|
|
|
ProjectAlarmRuleObjRelListItemVO projectAlarmRuleObjRelVO = new ProjectAlarmRuleObjRelListItemVO();
|
|
|
- EquipItem equipItem = partitionMap.get(objId);
|
|
|
- projectAlarmRuleObjRelVO.setObjId(equipItem.getId());
|
|
|
- projectAlarmRuleObjRelVO.setObjName(equipItem.getName());
|
|
|
+ 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())) {
|
|
@@ -391,7 +400,7 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
|
|
|
resultList = ConvertProjectAlarmRuleObjRelTool.INSTANCE.convert2List(relList);
|
|
|
|
|
|
}
|
|
|
- resultList = resultList.stream().sorted(Comparator.comparing(ProjectAlarmRuleObjRelListItemVO::getObjName,
|
|
|
+ resultList = resultList.stream().filter(item -> item.getObjName() != null).sorted(Comparator.comparing(ProjectAlarmRuleObjRelListItemVO::getObjName,
|
|
|
Collator.getInstance(java.util.Locale.CHINA))).collect(Collectors.toList());
|
|
|
return resultList;
|
|
|
}
|