From 7fd5a980147f7ee9df50b5cea8df7eb13c7c21f9 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期二, 10 十月 2023 10:51:42 +0800 Subject: [PATCH] 抽油机运行状态 --- ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java | 92 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 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..2b01bb9 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,9 @@ 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.statistical.vo.TenVo; import com.ruoyi.utils.result.Results; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -10,7 +11,9 @@ import javax.annotation.Resource; import java.time.LocalDate; +import java.util.ArrayList; import java.util.Calendar; +import java.util.List; import java.util.Map; /** @@ -74,6 +77,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 +126,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 +165,85 @@ } } + /** + * 鍦ㄧ嚎璁惧鏁� + */ + @ApiOperation("鍦ㄧ嚎璁惧鏁�") + @GetMapping("unit") + public Results unit(){ + return Results.succeed(statisticalService.unit()); + } + + /** + * 鎶ヨ鏁伴噺 + */ + @ApiOperation("鎶ヨ鏁伴噺") + @GetMapping("alarm/num") + public Results num(){ + List<TenVo> tenVo = new ArrayList<>(); + TenVo stealelec = new TenVo(); + stealelec.setName("鐩楃數鎶ヨ"); + stealelec.setValue(statisticalService.stealelecNum()); + tenVo.add(stealelec); + TenVo camera = new TenVo(); + camera.setName("閫氱敤鍏夌數"); + camera.setValue(statisticalService.cameraNum()); + tenVo.add(camera); + TenVo move = new TenVo(); + move.setName("闆疯揪绉诲姩"); + move.setValue(statisticalService.moveNum()); + tenVo.add(move); + TenVo fire = new TenVo(); + fire.setName("闆疯揪闃茬伀"); + fire.setValue(statisticalService.fireNum()); + tenVo.add(fire); + TenVo external = new TenVo(); + external.setName("澶栬仈鎶ヨ"); + external.setValue(statisticalService.externalNum()); + tenVo.add(external); + TenVo access = new TenVo(); + access.setName("闂ㄧ鎶ヨ"); + access.setValue(statisticalService.accessNum()); + tenVo.add(access); + TenVo apponekey = new TenVo(); + apponekey.setName("绉诲姩缁堢"); + apponekey.setValue(statisticalService.apponekeyNum()); + tenVo.add(apponekey); + TenVo pump = new TenVo(); + pump.setName("闆疯揪鍋滄満"); + pump.setValue(statisticalService.pumpNum()); + tenVo.add(pump); + TenVo wall = new TenVo(); + wall.setName("鐢靛瓙鍥存爮"); + wall.setValue(statisticalService.wallNum()); + tenVo.add(wall); + TenVo digitization = new TenVo(); + digitization.setName("棰勮鎶ヨ"); + digitization.setValue(statisticalService.digitizationNum()); + tenVo.add(digitization); + TenVo tube = new TenVo(); + tube.setName("绠$嚎娉勯湶"); + tube.setValue(statisticalService.tubeNum()); + tenVo.add(tube); + return Results.succeed(tenVo); + } + + /** + * 24灏忔椂鎶ヨ鍏磋叮鐐瑰墠鍗� + */ + @ApiOperation("24灏忔椂鎶ヨ鍏磋叮鐐瑰墠鍗�") + @GetMapping("alarm/ten") + public Results ten(){ + return Results.succeed(statisticalService.ten()); + } + + /** + * 鎶芥补鏈鸿繍琛岀姸鎬� + */ + @ApiOperation("鎶芥补鏈鸿繍琛岀姸鎬�") + @GetMapping("alarm/pump") + public Results pump(){ + return Results.succeed(statisticalService.pump()); + } + } -- Gitblit v1.9.3