From 0405d15e79bcb62cfe737e5f3f618f7aa34855f0 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 10 十月 2023 14:57:30 +0800
Subject: [PATCH] 报警

---
 ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java |   56 ++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 40 insertions(+), 16 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 9f43a69..2275bda 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
@@ -21,6 +21,8 @@
 import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
 import com.ruoyi.device.radar.domain.ArdEquipRadar;
 import com.ruoyi.device.radar.mapper.ArdEquipRadarMapper;
+import com.ruoyi.statistical.domain.PumpStatus;
+import com.ruoyi.statistical.mapper.PumpStatusMapper;
 import com.ruoyi.statistical.param.ESParam;
 import com.ruoyi.statistical.param.Para;
 import com.ruoyi.statistical.service.StatisticalService;
@@ -71,6 +73,8 @@
     private ArdEquipRadarMapper radarMapper;
     @Autowired
     private ArdCamerasMapper camerasMapper;
+    @Autowired
+    private PumpStatusMapper pumpStatusMapper;
 
 
     @Override
@@ -208,67 +212,67 @@
     @Override
     public List<CountVo> stealelecMonth(ESParam esParam) {
         List<CountVo> list = stealelecMapper.stealelecMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> cameraMonth(ESParam esParam) {
         List<CountVo> list = cameraMapper.cameraMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> moveMonth(ESParam esParam) {
         List<CountVo> list = moveMapper.moveMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> fireMonth(ESParam esParam) {
         List<CountVo> list = fireMapper.fileMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> externalMonth(ESParam esParam) {
         List<CountVo> list = externalMapper.externalMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> accessMonth(ESParam esParam) {
         List<CountVo> list = accessMapper.accessMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> apponekeyMonth(ESParam esParam) {
         List<CountVo> list = apponekeyMapper.apponekeyMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> pumpMonth(ESParam esParam) {
         List<CountVo> list = pumpMapper.pumpMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> wallMonth(ESParam esParam) {
         List<CountVo> list = wallMapper.wallMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> digitizationMonth(ESParam esParam) {
         List<CountVo> list = digitization3Mapper.digitizationMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
     public List<CountVo> tubeMonth(ESParam esParam) {
         List<CountVo> list = tubeMapper.tubeMonth(esParam);
-        return esMonth(list,esParam.getEnd());
+        return esMonth(list,esParam);
     }
 
     @Override
@@ -373,6 +377,26 @@
         return moveMapper.ten();
     }
 
+    @Override
+    public List<TenVo> pump() {
+        List<TenVo> list = new ArrayList<>();
+        QueryWrapper<PumpStatus> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("alarm_type","杩愯");
+        int y = pumpStatusMapper.selectCount(queryWrapper);
+        TenVo tenVo = new TenVo();
+        tenVo.setName("杩愯");
+        tenVo.setValue(y);
+        list.add(tenVo);
+        QueryWrapper<PumpStatus> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("alarm_type","鍋滄満");
+        int t = pumpStatusMapper.selectCount(queryWrapper1);
+        TenVo tenVo1 = new TenVo();
+        tenVo1.setName("鍋滄満");
+        tenVo1.setValue(t);
+        list.add(tenVo1);
+        return list;
+    }
+
     public List<CountVo> es(List<CountVo> list){
         List<CountVo> countVoList = new ArrayList<>();
         for (int i = 1; i <= 12 ; i++) {
@@ -397,17 +421,17 @@
         return countVoList;
     }
 
-    public List<CountVo> esMonth(List<CountVo> list,String end){
+    public List<CountVo> esMonth(List<CountVo> list,ESParam esParam){
         List<CountVo> countVoList = new ArrayList<>();
-        Integer day = Integer.valueOf(end.substring(end.length() - 2));
-        String month = end.substring(5,7);
+        Integer day = Integer.valueOf(esParam.getEnd().substring(esParam.getEnd().length() - 2));
+        Integer month = esParam.getMonth();
         for (int i = 1; i <= day ; i++) {
             CountVo vo = new CountVo();
-            String d = month + "鏈�" + i + "鏃�";
+            String d = month + "-" + i ;
             Boolean bo = false;
             for (int j = 0; j < list.size(); j++) {
                 CountVo countVo = list.get(j);
-                String mon = month + "鏈�" + Integer.valueOf(countVo.getDate()) + "鏃�";
+                String mon = month + "-" + Integer.valueOf(countVo.getDate());
                 if(mon.equals(d)){
                     bo = true;
                     vo.setDate(mon);

--
Gitblit v1.9.3