From e0d1a9a05fee8ef75ce8f5bd7107be32ec8c8e82 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 20 Mar 2021 08:55:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 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 68f1a52..9a87906 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
@@ -98,8 +98,13 @@
}
@Override
- public void updateJtype(String id,String czTime,String bz) {
- baseMapper.updateJtype(id,czTime,bz);
+ public void updateJtype(String id,String jtype,String bz,String jjtime) {
+ baseMapper.updateJtype(id,jtype,bz,jjtime);
+ }
+
+ @Override
+ public void updatePoliceStatus(String id,String status) {
+ baseMapper.updatePoliceStatus(id,status);
}
/**
@@ -141,4 +146,14 @@
//返回数据
return null;
}
+
+ @Override
+ public List<Map<String, Object>> queryPolice() {
+ return baseMapper.queryPolice();
+ }
+
+ @Override
+ public List<Map<String, Object>> queryPoliceTime(List policeIdArr) {
+ return baseMapper.queryPoliceTime(policeIdArr);
+ }
}
--
Gitblit v1.9.3