From 1b259de8c0a06e6e16941a4ac3189d950fc542ab Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 09 十月 2023 16:26:58 +0800
Subject: [PATCH] 报警统计
---
ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java b/ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java
index 628ac8e..7d9a463 100644
--- a/ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java
+++ b/ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java
@@ -1,8 +1,8 @@
package com.ruoyi.statistical.controller;
import com.ruoyi.statistical.param.ESParam;
-import com.ruoyi.statistical.param.MonthParam;
import com.ruoyi.statistical.service.StatisticalService;
+import com.ruoyi.statistical.vo.NumVo;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -74,6 +74,9 @@
}else if("1007".equals(type)){
//绉诲姩缁堢
return Results.succeed(statisticalService.apponekeyYear(esParam));
+ }else if("1008".equals(type)){
+ //绉诲姩缁堢
+ return Results.succeed(statisticalService.pumpYear(esParam));
}else if("1010".equals(type)){
//鐢靛瓙鍥存爮
return Results.succeed(statisticalService.wallYear(esParam));
@@ -120,6 +123,9 @@
}else if("1007".equals(type)){
//绉诲姩缁堢
return Results.succeed(statisticalService.apponekeyMonth(esParam));
+ }else if("1008".equals(type)){
+ //闆疯揪鍋滄満
+ return Results.succeed(statisticalService.pumpMonth(esParam));
}else if("1010".equals(type)){
//鐢靛瓙鍥存爮
return Results.succeed(statisticalService.wallMonth(esParam));
@@ -156,4 +162,43 @@
}
}
+ /**
+ * 鍦ㄧ嚎璁惧鏁�
+ */
+ @ApiOperation("鍦ㄧ嚎璁惧鏁�")
+ @GetMapping("unit")
+ public Results unit(){
+ return Results.succeed(statisticalService.unit());
+ }
+
+ /**
+ * 鎶ヨ鏁伴噺
+ */
+ @ApiOperation("鎶ヨ鏁伴噺")
+ @GetMapping("alarm/num")
+ public Results num(){
+ NumVo numVo = new NumVo();
+ numVo.setStealelec(statisticalService.stealelecNum());
+ numVo.setCamera(statisticalService.cameraNum());
+ numVo.setMove(statisticalService.moveNum());
+ numVo.setFire(statisticalService.fireNum());
+ numVo.setExternal(statisticalService.externalNum());
+ numVo.setAccess(statisticalService.accessNum());
+ numVo.setApponekey(statisticalService.apponekeyNum());
+ numVo.setPump(statisticalService.pumpNum());
+ numVo.setWall(statisticalService.wallNum());
+ numVo.setDigitization(statisticalService.digitizationNum());
+ numVo.setTube(statisticalService.tubeNum());
+ return Results.succeed(numVo);
+ }
+
+ /**
+ * 24灏忔椂鎶ヨ鍏磋叮鐐瑰墠鍗�
+ */
+ @ApiOperation("24灏忔椂鎶ヨ鍏磋叮鐐瑰墠鍗�")
+ @GetMapping("alarm/ten")
+ public Results ten(){
+ return Results.succeed(statisticalService.ten());
+ }
+
}
--
Gitblit v1.9.3