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 | 76 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 36 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 24b034c..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,42 +279,45 @@
@Override
public UnitVo unit() {
UnitVo unitVo = new UnitVo();
- //闆疯揪鍦ㄧ嚎鏁伴噺
- List<ArdEquipRadar> radarList = radarMapper.selectList(null);
- Timer timer = new Timer();
- TimerTask timerTask =new TimerTask(){
- @Override
- public void run(){
- Para.setI(0);
- for (int i = 0; i < radarList.size(); i++) {
- ArdEquipRadar radar = radarList.get(i);
- String host = radar.getIp();
- String port = radar.getPort();
- Thread thread = new Thread(){
- @Override
- public void run(){
- try {
- Socket socket = new Socket(host,Integer.valueOf(port));
- } catch (Exception e) {
- int num = Para.getI();
- num++;
- }
- }
- };
- thread.start();
- }
- int n = Para.getI();
- Para.setJ(radarList.size() - Para.getI());
- }
- };
- 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);
+ 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();
+// TimerTask timerTask =new TimerTask(){
+// @Override
+// public void run(){
+// Para.setI(0);
+// for (int i = 0; i < radarList.size(); i++) {
+// ArdEquipRadar radar = radarList.get(i);
+// String host = radar.getIp();
+// String port = radar.getPort();
+// Thread thread = new Thread(){
+// @Override
+// public void run(){
+// try {
+// Socket socket = new Socket(host,Integer.valueOf(port));
+// } catch (Exception e) {
+// int num = Para.getI();
+// num++;
+// }
+// }
+// };
+// thread.start();
+// }
+// int n = Para.getI();
+// Para.setJ(radarList.size() - Para.getI());
+// }
+// };
+// Date date = new Date();
+// timer.scheduleAtFixedRate(timerTask,date,5000);
+// unitVo.setRadar(Para.getJ());
return unitVo;
}
--
Gitblit v1.9.3