|
@@ -368,6 +368,7 @@ public class MonitorIndicatorRecordServiceImpl implements IMonitorIndicatorRecor
|
|
|
private void sendIndicatorDataToAlarmServer(ProjectDTO projectDTO) throws Exception {
|
|
|
//通过报警服务查询报警规则
|
|
|
List<AlarmRuleDTO> projectAlarmRules = energyAlarmService.getProjectAlarmRules(projectDTO.getProjectId());
|
|
|
+ log.error("获取到的项目报警规则:" + projectDTO.getProjectId() + ";" + projectAlarmRules);
|
|
|
if (CollectionUtils.isEmpty(projectAlarmRules)) {
|
|
|
return;
|
|
|
}
|
|
@@ -376,6 +377,7 @@ public class MonitorIndicatorRecordServiceImpl implements IMonitorIndicatorRecor
|
|
|
if (CollectionUtils.isEmpty(objIdAlarmItemCodeAndInfoCodes) || objIdAlarmItemCodeAndInfoCodes.size() == 0) {
|
|
|
return;
|
|
|
}
|
|
|
+ log.error("获取到的设备与监测点位映射关系:" + objIdAlarmItemCodeAndInfoCodes);
|
|
|
for (Map.Entry<String, List<String>> entry : objIdAlarmItemCodeAndInfoCodes.entrySet()) {
|
|
|
String objIdAndAlarmItemCode = entry.getKey();
|
|
|
int indexOf = objIdAndAlarmItemCode.indexOf("_");
|