|
@@ -8,8 +8,6 @@ import com.google.common.base.CaseFormat;
|
|
|
import com.persagy.apm.alarmservice.group.management.model.equip.dto.QueryEquipDTO;
|
|
|
import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipItem;
|
|
|
import com.persagy.apm.alarmservice.group.management.service.GroupManagementService;
|
|
|
-import com.persagy.apm.alarmservice.project.alarmrule.dao.ProjectAlarmRuleMapper;
|
|
|
-import com.persagy.apm.alarmservice.project.alarmrule.model.ProjectAlarmRule;
|
|
|
import com.persagy.apm.alarmservice.project.alarmrule.service.IProjectAlarmRuleService;
|
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.dao.ProjectAlarmRuleObjRelMapper;
|
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.ConvertProjectAlarmRuleObjRelTool;
|
|
@@ -359,7 +357,7 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
|
|
|
List<String> projectAlarmRuleIdList = projectAlarmRuleService.queryAlarmRule(queryRuleObjRelDTO);
|
|
|
List<ProjectAlarmRuleObjRel> relationList = this.queryObjRelList(projectAlarmRuleIdList);
|
|
|
Map<String, ProjectAlarmRuleObjRel> partitionMap = relationList.stream().collect(Collectors.toMap(
|
|
|
- ProjectAlarmRuleObjRel::getObjId, equip -> equip));
|
|
|
+ ProjectAlarmRuleObjRel::getObjId, equip -> equip,(k1,k2)->k1));
|
|
|
String condition = queryRuleObjRelDTO.getCondition();
|
|
|
String classCode = queryRuleObjRelDTO.getClassCode();
|
|
|
String projectId = queryRuleObjRelDTO.getProjectId();
|
|
@@ -380,7 +378,14 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
|
|
|
return resultList;
|
|
|
}
|
|
|
|
|
|
- private List<ProjectAlarmRuleObjRel> queryObjRelList(List<String> projectAlarmRuleIdList) {
|
|
|
+ @Override
|
|
|
+ public List<ProjectAlarmRuleObjRel> query(String id) {
|
|
|
+ QueryWrapper<ProjectAlarmRuleObjRel> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_PROJECT_ALARM_RULE_ID, id);
|
|
|
+ return list(queryWrapper);
|
|
|
+ }
|
|
|
+
|
|
|
+ public List<ProjectAlarmRuleObjRel> queryObjRelList(List<String> projectAlarmRuleIdList) {
|
|
|
List<ProjectAlarmRuleObjRel> list = new ArrayList<>();
|
|
|
for (String projectAlarmRuleId : projectAlarmRuleIdList) {
|
|
|
QueryWrapper<ProjectAlarmRuleObjRel> queryWrapper = new QueryWrapper<>();
|