From f5af2c565dbe38f22763ec17bf3868d58afafb97 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 16 Nov 2020 16:30:39 +0800
Subject: [PATCH] 更改报表导出时间段 由原先的0-23 改为1-第二天零点
---
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