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/service/StatisticalService.java | 2 ++
ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java | 9 +++++++++
ard-work/src/main/java/com/ruoyi/statistical/domain/PumpStatus.java | 14 ++++++++++++++
ard-work/src/main/java/com/ruoyi/statistical/mapper/PumpStatusMapper.java | 11 +++++++++++
ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java | 24 ++++++++++++++++++++++++
5 files changed, 60 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 09168d6..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
@@ -237,4 +237,13 @@
return Results.succeed(statisticalService.ten());
}
+ /**
+ * 鎶芥补鏈鸿繍琛岀姸鎬�
+ */
+ @ApiOperation("鎶芥补鏈鸿繍琛岀姸鎬�")
+ @GetMapping("alarm/pump")
+ public Results pump(){
+ return Results.succeed(statisticalService.pump());
+ }
+
}
diff --git a/ard-work/src/main/java/com/ruoyi/statistical/domain/PumpStatus.java b/ard-work/src/main/java/com/ruoyi/statistical/domain/PumpStatus.java
new file mode 100644
index 0000000..30bbacd
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/statistical/domain/PumpStatus.java
@@ -0,0 +1,14 @@
+package com.ruoyi.statistical.domain;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class PumpStatus {
+ private String id;
+ private String name;
+ private String alarmType;
+ private String alarmTime;
+}
diff --git a/ard-work/src/main/java/com/ruoyi/statistical/mapper/PumpStatusMapper.java b/ard-work/src/main/java/com/ruoyi/statistical/mapper/PumpStatusMapper.java
new file mode 100644
index 0000000..9050027
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/statistical/mapper/PumpStatusMapper.java
@@ -0,0 +1,11 @@
+package com.ruoyi.statistical.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.statistical.domain.PumpStatus;
+
+/**
+ * @author Administrator
+ */
+public interface PumpStatusMapper extends BaseMapper<PumpStatus> {
+}
diff --git a/ard-work/src/main/java/com/ruoyi/statistical/service/StatisticalService.java b/ard-work/src/main/java/com/ruoyi/statistical/service/StatisticalService.java
index c857edd..6c1945f 100644
--- a/ard-work/src/main/java/com/ruoyi/statistical/service/StatisticalService.java
+++ b/ard-work/src/main/java/com/ruoyi/statistical/service/StatisticalService.java
@@ -59,4 +59,6 @@
int tubeNum();
List<TenVo> ten();
+
+ List<TenVo> pump();
}
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..d655e27 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
@@ -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++) {
--
Gitblit v1.9.3