From 296d509996b9500c35be0b81860fa14c1d275048 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 10:47:51 +0800
Subject: [PATCH] 更改五分钟数据接口,添加界面左侧站点设备信息接口

---
 src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java |   21 +++++++++++++++++++++
 1 files changed, 21 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 75017d5..a5ca8e6 100644
--- a/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
@@ -75,8 +75,23 @@
     }
 
     @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){
+            alarmConfig = new AlarmConfig();
+            alarmConfig.setValue(getDefaultAlarmConfigValue());
+        }
+        return Optional.ofNullable(alarmConfig);
+    }
+
+    @Override
+    public Optional<AlarmConfig> queryByDeviceMac(String mac) {
+        AlarmConfig alarmConfig = alarmConfigMapper.selectByDeviceMac(mac);
         if(alarmConfig==null){
             alarmConfig = new AlarmConfig();
             alarmConfig.setValue(getDefaultAlarmConfigValue());
@@ -102,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