From afda08833e460a40a2d4e509f9df9d809c6f8f31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Mar 2021 15:38:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 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 47bb13c..4c476f7 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,23 @@
 	}
 
 	@Override
-	public void updateJtype(String id,String czTime,String bz) {
-		baseMapper.updateJtype(id,czTime,bz);
+	public void updateJtype(String id,String jtype,String bz) {
+		baseMapper.updateJtype(id,jtype,bz);
+	}
+
+	@Override
+	public void updateVaddress(String vaddress, String jid) {
+		baseMapper.updateVaddress(vaddress, jid);
+	}
+
+	@Override
+	public void updatePoliceStatus(String id,String status) {
+		baseMapper.updatePoliceStatus(id,status);
+	}
+
+	@Override
+	public void updateAaddress(String aaddress, String jid) {
+		baseMapper.updateAaddress(aaddress, jid);
 	}
 
 	/**
@@ -143,7 +158,17 @@
 	}
 
 	@Override
-	public List queryPolice() {
+	public List<Map<String, Object>> queryPolice() {
 		return baseMapper.queryPolice();
 	}
+
+	@Override
+	public List<Map<String, Object>> queryPoliceTime(List policeIdArr) {
+		return baseMapper.queryPoliceTime(policeIdArr);
+	}
+
+	@Override
+	public List<Map<String, Object>> queryBa() {
+		return baseMapper.queryBa();
+	}
 }

--
Gitblit v1.9.3