From 65007f6811e580d8660340b8216296e68fae598c Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Tue, 01 Dec 2020 16:04:18 +0800 Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2 --- src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java index 6ea34b6..a5ca8e6 100644 --- a/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java +++ b/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java @@ -75,6 +75,11 @@ } @Override + public String getValueByOrganizationId(int organizationId) { + return alarmConfigMapper.getValueByOrganizationId(organizationId); + } + + @Override public Optional<AlarmConfig> queryByMonitorPointId(int mpId) { AlarmConfig alarmConfig = alarmConfigMapper.selectByMonitorPointId(mpId); if(alarmConfig==null){ @@ -112,6 +117,12 @@ throw ex; } } + + @Override + public int containOrgId(Integer orgId) { + return alarmConfigMapper.containOrgId(orgId); + } + public AlarmConfigValue simplifyAlarmConfigValue(AlarmConfigValue value){ Map<String,AlarmSensorLevel> alarmSensorLevelMap = value.getAlarmLevels(); List<String> cleanKeys = new ArrayList<>(); -- Gitblit v1.8.0