From 2d5fdd624858e438a7153a8d3a55add8d2fdfda2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期日, 08 十月 2023 16:00:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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 389646a..99d59ec 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
@@ -2,6 +2,7 @@
import com.ruoyi.statistical.param.ESParam;
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;
@@ -170,4 +171,25 @@
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);
+ }
+
}
--
Gitblit v1.9.3