From 79794fdb2213fb38732e838308066aa681a1f58f Mon Sep 17 00:00:00 2001
From: zhangjianrock@163.com <zhangjianrock@163.com>
Date: 星期六, 13 四月 2024 13:30:45 +0800
Subject: [PATCH] 空闲时间段为空,则返回全天
---
ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 a1a7247..8d5f6e7 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
@@ -137,7 +137,8 @@
}
//璁板綍well琛ㄤ腑oil_production涓烘娊娌规満鐨勬暟鎹湁澶氬皯鏉�
QueryWrapper<ArdAlarmpointsWell> queryWrapperWell = new QueryWrapper<>();
- queryWrapperWell.eq("oil_production","鎶芥补鏈�");
+// queryWrapperWell.eq("oil_production","鎶芥补鏈�");
+ queryWrapperWell.eq("well_type","1");
int num = wellMapper.selectCount(queryWrapperWell);
jsonObject.put("well",String.valueOf(num));
return Results.succeed(jsonObject);
@@ -278,6 +279,14 @@
@Override
public UnitVo unit() {
UnitVo unitVo = new UnitVo();
+ QueryWrapper<ArdEquipRadar> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("state","1");
+ List<ArdEquipRadar> radarList = radarMapper.selectList(queryWrapper);
+ unitVo.setRadar(radarList.size());
+ QueryWrapper<ArdCameras> queryWrapperC = new QueryWrapper<>();
+ queryWrapperC.select("id").eq("gdtype","0").eq("state","1");
+ List<ArdCameras> ardCameras = camerasMapper.selectList(queryWrapperC);
+ unitVo.setCamera(ardCameras.size());
// //闆疯揪鍦ㄧ嚎鏁伴噺
// List<ArdEquipRadar> radarList = radarMapper.selectList(null);
// Timer timer = new Timer();
@@ -309,11 +318,6 @@
// Date date = new Date();
// timer.scheduleAtFixedRate(timerTask,date,5000);
// unitVo.setRadar(Para.getJ());
-// //鍏夌數鏁伴噺
-// QueryWrapper<ArdCameras> queryWrapper = new QueryWrapper<>();
-// queryWrapper.select("id").eq("gdtype","0").eq("state","1");
-// List<ArdCameras> ardCameras = camerasMapper.selectList(queryWrapper);
-// unitVo.setCamera(ardCameras.size());
return unitVo;
}
--
Gitblit v1.9.3