From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
index d4d8113..5e0ae86 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
@@ -97,8 +97,8 @@
}
@Override
- public void updateJtype(String id,String jtype,String bz) {
- baseMapper.updateJtype(id,jtype,bz);
+ public void updateJtype(String id,String jtype,String bz,String securityArr) {
+ baseMapper.updateJtype(id,jtype,bz,securityArr);
}
@Override
@@ -176,6 +176,11 @@
return baseMapper.queryBa();
}
+ @Override
+ public List<Map<String, Object>> getAlarm(AlarmVO alarmVO) {
+ return baseMapper.getAlarm(alarmVO);
+ }
+
/**
* 查询当前时间段一键求助报警总次数
* @param conditionVo
--
Gitblit v1.9.3