Browse Source

Merge branch 'v1.0.0' of http://39.106.8.246:3003/apm/energy-alarm-service into v1.0.0

lixing 3 years ago
parent
commit
2d7357e203

+ 1 - 1
src/main/java/com/persagy/apm/alarmservice/project/alarmrule/service/impl/ProjectAlarmRuleServiceImpl.java

@@ -294,7 +294,7 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
             addProjectAlarmRuleObjRelDTO.setProjectAlarmRuleId(id);
             addProjectAlarmRuleObjRelDTO.setObjId(updateAlarmItemDTO.getObjId());
             addProjectAlarmRuleObjRelDTO.setProjectId(projectId);
-            addProjectAlarmRuleObjRelDTO.setOpen(updateAlarmItemDTO.getOpen());
+            addProjectAlarmRuleObjRelDTO.setOpen(1);
             addProjectAlarmRuleObjRelDTO.setObjName(updateAlarmItemDTO.getObjName());
             list.add(addProjectAlarmRuleObjRelDTO);
         }

+ 1 - 1
src/main/java/com/persagy/apm/alarmservice/project/alarmruleobjrel/service/impl/ProjectAlarmRuleObjRelServiceImpl.java

@@ -366,7 +366,7 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
             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);
+            queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_OPEN, 1);
             List<ProjectAlarmRuleObjRel> list = list(queryWrapper);
             list.stream().map(ProjectAlarmRuleObjRel::getObjId).distinct().collect(Collectors.toList());
             resultList.addAll(list);