From 2fad5b9483d3e6fec4b8bd1e6f8c578e270b4688 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期日, 08 十月 2023 13:33:50 +0800
Subject: [PATCH] 报警数量统计

---
 ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 106 insertions(+), 3 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java b/ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java
index 45ac8cc..c65b702 100644
--- a/ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java
@@ -9,6 +9,7 @@
 import com.ruoyi.alarm.external.mapper.ArdAlarmExternalMapper;
 import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarFireMapper;
 import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarMoveMapper;
+import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarPumpMapper;
 import com.ruoyi.alarm.steal.mapper.ArdAlarmStealelecMapper;
 import com.ruoyi.alarm.tube.mapper.ArdAlarmTubeMapper;
 import com.ruoyi.alarm.wall.mapper.ArdAlarmWallMapper;
@@ -24,6 +25,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 
@@ -51,6 +53,8 @@
     private ArdAlarmAccessMapper accessMapper;
     @Autowired
     private ArdAlarmApponekeyMapper apponekeyMapper;
+    @Autowired
+    private ArdAlarmRadarPumpMapper pumpMapper;
     @Autowired
     private ArdAlarmWallMapper wallMapper;
     @Autowired
@@ -168,6 +172,12 @@
     }
 
     @Override
+    public List<CountVo> pumpYear(ESParam esParam) {
+        List<CountVo> list = pumpMapper.pumpYear(esParam);
+        return es(list);
+    }
+
+    @Override
     public List<CountVo> wallYear(ESParam esParam) {
         List<CountVo> list = wallMapper.wallYear(esParam);
         return es(list);
@@ -185,9 +195,75 @@
         return es(list);
     }
 
+    @Override
+    public List<CountVo> stealelecMonth(ESParam esParam) {
+        List<CountVo> list = stealelecMapper.stealelecMonth(esParam);
+        return esMonth(list,esParam.getEnd());
+    }
+
+    @Override
+    public List<CountVo> cameraMonth(ESParam esParam) {
+        List<CountVo> list = cameraMapper.cameraMonth(esParam);
+        return esMonth(list,esParam.getEnd());
+    }
+
+    @Override
+    public List<CountVo> moveMonth(ESParam esParam) {
+        List<CountVo> list = moveMapper.moveMonth(esParam);
+        return esMonth(list,esParam.getEnd());
+    }
+
+    @Override
+    public List<CountVo> fireMonth(ESParam esParam) {
+        List<CountVo> list = fireMapper.fileMonth(esParam);
+        return esMonth(list,esParam.getEnd());
+    }
+
+    @Override
+    public List<CountVo> externalMonth(ESParam esParam) {
+        List<CountVo> list = externalMapper.externalMonth(esParam);
+        return esMonth(list,esParam.getEnd());
+    }
+
+    @Override
+    public List<CountVo> accessMonth(ESParam esParam) {
+        List<CountVo> list = accessMapper.accessMonth(esParam);
+        return esMonth(list,esParam.getEnd());
+    }
+
+    @Override
+    public List<CountVo> apponekeyMonth(ESParam esParam) {
+        List<CountVo> list = apponekeyMapper.apponekeyMonth(esParam);
+        return esMonth(list,esParam.getEnd());
+    }
+
+    @Override
+    public List<CountVo> pumpMonth(ESParam esParam) {
+        List<CountVo> list = pumpMapper.pumpMonth(esParam);
+        return esMonth(list,esParam.getEnd());
+    }
+
+    @Override
+    public List<CountVo> wallMonth(ESParam esParam) {
+        List<CountVo> list = wallMapper.wallMonth(esParam);
+        return esMonth(list,esParam.getEnd());
+    }
+
+    @Override
+    public List<CountVo> digitizationMonth(ESParam esParam) {
+        List<CountVo> list = digitization3Mapper.digitizationMonth(esParam);
+        return esMonth(list,esParam.getEnd());
+    }
+
+    @Override
+    public List<CountVo> tubeMonth(ESParam esParam) {
+        List<CountVo> list = tubeMapper.tubeMonth(esParam);
+        return esMonth(list,esParam.getEnd());
+    }
+
     public List<CountVo> es(List<CountVo> list){
         for (int i = 1; i <= 12 ; i++) {
-            String month = null;
+            String month;
             if(i<=10){
                 month = "0"+i;
             }else {
@@ -196,14 +272,41 @@
             Boolean bo = false;
             for (int j = 0; j < list.size(); j++) {
                 CountVo countVo = list.get(j);
-                String mon = countVo.getMonth();
+                String mon = countVo.getDate();
                 if(mon.equals(month)){
                     bo = true;
                 }
             }
             if(!bo){
                 CountVo countVo = new CountVo();
-                countVo.setMonth(month);
+                countVo.setDate(month);
+                countVo.setCount(0);
+                list.add(countVo);
+            }
+        }
+        return list;
+    }
+
+    public List<CountVo> esMonth(List<CountVo> list,String end){
+        Integer day = Integer.valueOf(end.substring(end.length() - 2));
+        for (int i = 1; i <= day ; i++) {
+            String d;
+            if(i<=10){
+                d = "0"+i;
+            }else {
+                d = String.valueOf(i);
+            }
+            Boolean bo = false;
+            for (int j = 0; j < list.size(); j++) {
+                CountVo countVo = list.get(j);
+                String mon = countVo.getDate();
+                if(mon.equals(d)){
+                    bo = true;
+                }
+            }
+            if(!bo){
+                CountVo countVo = new CountVo();
+                countVo.setDate(d);
                 countVo.setCount(0);
                 list.add(countVo);
             }

--
Gitblit v1.9.3