From 32995c21fea6034dad8834f28e23c7fb177eb423 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 10 Mar 2023 15:39:55 +0800
Subject: [PATCH] 出警次数
---
src/main/java/org/springblade/modules/dp/mapper/ComprehensiveStatisticsMapper.java | 2 --
src/main/java/org/springblade/modules/dp/service/impl/ComprehensiveStatisticsServiceImpl.java | 4 +++-
src/main/java/org/springblade/modules/dp/mapper/ComprehensiveStatisticsMapper.xml | 5 +++--
src/main/java/org/springblade/modules/dp/controller/ComprehensiveStatisticsController.java | 3 +--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dp/controller/ComprehensiveStatisticsController.java b/src/main/java/org/springblade/modules/dp/controller/ComprehensiveStatisticsController.java
index 6c54d53..0eba41a 100644
--- a/src/main/java/org/springblade/modules/dp/controller/ComprehensiveStatisticsController.java
+++ b/src/main/java/org/springblade/modules/dp/controller/ComprehensiveStatisticsController.java
@@ -33,10 +33,9 @@
public class ComprehensiveStatisticsController extends BladeController {
private IComprehensiveStatisticsService comprehensiveStatisticsService;
private IFireService fireService;
- private IFireSupplementService fireSupplementService;
/**
- * 数据概览 (出警次数还没有统计)
+ * 数据概览
*/
@GetMapping("/dataOverview")
@ApiOperation(value = "数据概览", notes = "数据概览")
diff --git a/src/main/java/org/springblade/modules/dp/mapper/ComprehensiveStatisticsMapper.java b/src/main/java/org/springblade/modules/dp/mapper/ComprehensiveStatisticsMapper.java
index 839480d..76eeeba 100644
--- a/src/main/java/org/springblade/modules/dp/mapper/ComprehensiveStatisticsMapper.java
+++ b/src/main/java/org/springblade/modules/dp/mapper/ComprehensiveStatisticsMapper.java
@@ -1,13 +1,11 @@
package org.springblade.modules.dp.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.HashMap;
import java.util.List;
-@Repository
public interface ComprehensiveStatisticsMapper {
List<HashMap<String, String>> getDataOverview();
diff --git a/src/main/java/org/springblade/modules/dp/mapper/ComprehensiveStatisticsMapper.xml b/src/main/java/org/springblade/modules/dp/mapper/ComprehensiveStatisticsMapper.xml
index 56c0f64..6cad202 100644
--- a/src/main/java/org/springblade/modules/dp/mapper/ComprehensiveStatisticsMapper.xml
+++ b/src/main/java/org/springblade/modules/dp/mapper/ComprehensiveStatisticsMapper.xml
@@ -4,11 +4,12 @@
<select id="getDataOverview" resultType="java.util.HashMap">
- SELECT a.deptNumber,b.policeCarNumber,c.deviceNumber
+ SELECT a.deptNumber,b.policeCarNumber,c.deviceNumber,d.outNumber
FROM(
( SELECT COUNT(*) AS deptNumber FROM blade_dept dept WHERE dept.is_deleted = 0 ) a,
( SELECT COUNT(*) AS policeCarNumber FROM sys_vehicle vehicle WHERE vehicle.is_deleted = 0 ) b,
- ( SELECT COUNT(*) AS deviceNumber FROM sys_device device WHERE device.is_deleted = 0 ) c
+ ( SELECT COUNT(*) AS deviceNumber FROM sys_device device WHERE device.is_deleted = 0 ) c,
+ ( SELECT COUNT(*) AS outNumber FROM sys_fire fire WHERE fire.is_deleted = 0 AND fire.status !=1 ) d
);
</select>
diff --git a/src/main/java/org/springblade/modules/dp/service/impl/ComprehensiveStatisticsServiceImpl.java b/src/main/java/org/springblade/modules/dp/service/impl/ComprehensiveStatisticsServiceImpl.java
index e12eb1e..a395c60 100644
--- a/src/main/java/org/springblade/modules/dp/service/impl/ComprehensiveStatisticsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/dp/service/impl/ComprehensiveStatisticsServiceImpl.java
@@ -1,5 +1,6 @@
package org.springblade.modules.dp.service.impl;
+import lombok.AllArgsConstructor;
import org.springblade.modules.dp.mapper.ComprehensiveStatisticsMapper;
import org.springblade.modules.dp.service.IComprehensiveStatisticsService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -11,8 +12,9 @@
import java.util.Map;
@Service
+@AllArgsConstructor
public class ComprehensiveStatisticsServiceImpl implements IComprehensiveStatisticsService {
- @Autowired
+
private ComprehensiveStatisticsMapper comprehensiveStatisticsMapper;
@Override
--
Gitblit v1.9.3