From dd202fbaa4caea48aa5a0df620b87a6e41dba429 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 12 Mar 2021 16:24:44 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-BladeX
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 0dc6ced..feb0df0 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
@@ -17,6 +17,7 @@
package org.springblade.jfpt.alarm.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.jfpt.alarm.entity.Alarm;
@@ -25,6 +26,8 @@
import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springframework.stereotype.Service;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -40,6 +43,11 @@
@Override
public IPage<AlarmVO> selectAlarmPage(IPage<AlarmVO> page, AlarmVO alarm) {
return page.setRecords(baseMapper.selectAlarmPage(page, alarm));
+ }
+
+ @Override
+ public List<AlarmVO> listAll() {
+ return baseMapper.listAll();
}
@Override
@@ -92,4 +100,13 @@
baseMapper.updateJtype(id,czTime,bz);
}
+ /**
+ * 查询警情总数
+ * @param status 0:本日 1：本周 2：本月
+ * @return
+ */
+ @Override
+ public Integer selectAlarmCount(Integer status) {
+ return baseMapper.selectAlarmCount();
+ }
}
--
Gitblit v1.9.3