From 182b43ff052176b182a32eff9c928717f8f4c61a Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 10 十月 2023 14:22:59 +0800
Subject: [PATCH] 设备健康列表
---
ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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..b2f51a8 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++) {
@@ -403,11 +427,11 @@
String month = end.substring(5,7);
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