From c19520156a89c2d344f11618836dc888f4b09e18 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 27 三月 2024 10:43:27 +0800
Subject: [PATCH] 雷达在线注释掉
---
ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java | 115 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 57 insertions(+), 58 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 f5b13e3..a1a7247 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
@@ -1,7 +1,6 @@
package com.ruoyi.statistical.service.impl;
import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.alarm.access.mapper.ArdAlarmAccessMapper;
import com.ruoyi.alarm.apponekey.mapper.ArdAlarmApponekeyMapper;
@@ -22,8 +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.domain.ArdPumpStatus;
+import com.ruoyi.statistical.mapper.ArdPumpStatusMapper;
import com.ruoyi.statistical.param.ESParam;
import com.ruoyi.statistical.param.Para;
import com.ruoyi.statistical.service.StatisticalService;
@@ -75,7 +74,7 @@
@Autowired
private ArdCamerasMapper camerasMapper;
@Autowired
- private PumpStatusMapper pumpStatusMapper;
+ private ArdPumpStatusMapper ardPumpStatusMapper;
@Override
@@ -279,42 +278,42 @@
@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);
- 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());
+// //鍏夌數鏁伴噺
+// 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;
}
@@ -381,16 +380,16 @@
@Override
public List<TenVo> pump() {
List<TenVo> list = new ArrayList<>();
- QueryWrapper<PumpStatus> queryWrapper = new QueryWrapper<>();
+ QueryWrapper<ArdPumpStatus> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("alarm_type","杩愯");
- int y = pumpStatusMapper.selectCount(queryWrapper);
+ int y = ardPumpStatusMapper.selectCount(queryWrapper);
TenVo tenVo = new TenVo();
tenVo.setName("杩愯");
tenVo.setValue(y);
list.add(tenVo);
- QueryWrapper<PumpStatus> queryWrapper1 = new QueryWrapper<>();
+ QueryWrapper<ArdPumpStatus> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("alarm_type","鍋滄満");
- int t = pumpStatusMapper.selectCount(queryWrapper1);
+ int t = ardPumpStatusMapper.selectCount(queryWrapper1);
TenVo tenVo1 = new TenVo();
tenVo1.setName("鍋滄満");
tenVo1.setValue(t);
@@ -406,22 +405,22 @@
if(list.size()>0){
for (int i = 0; i < list.size(); i++) {
JSONObject j = list.get(i);
- QueryWrapper<PumpStatus> queryWrapper = new QueryWrapper<>();
+ QueryWrapper<ArdPumpStatus> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("target_id",j.getInteger("targetId")).eq("name",j.getString("name"));
- PumpStatus pumpStatus1 = pumpStatusMapper.selectOne(queryWrapper);
- if(pumpStatus1==null){
- PumpStatus pumpStatus = new PumpStatus();
- pumpStatus.setTargetId(j.getInteger("targetId"));
- pumpStatus.setName(j.getString("name"));
+ ArdPumpStatus ardPumpStatus1 = ardPumpStatusMapper.selectOne(queryWrapper);
+ if(ardPumpStatus1 ==null){
+ ArdPumpStatus ardPumpStatus = new ArdPumpStatus();
+ ardPumpStatus.setTargetId(j.getInteger("targetId"));
+ ardPumpStatus.setName(j.getString("name"));
if(j.containsKey("alarmType")){
- pumpStatus.setAlarmType(j.getString("alarmType"));
+ ardPumpStatus.setAlarmType(j.getString("alarmType"));
}else if(j.containsKey("alarm")){
- pumpStatus.setAlarmType(j.getString("alarm"));
+ ardPumpStatus.setAlarmType(j.getString("alarm"));
}
- pumpStatus.setAlarmTime(alarmTime);
- pumpStatusMapper.insert(pumpStatus);
+ ardPumpStatus.setAlarmTime(alarmTime);
+ ardPumpStatusMapper.insert(ardPumpStatus);
}else {
- String alarmType = pumpStatus1.getAlarmType();
+ String alarmType = ardPumpStatus1.getAlarmType();
Boolean bo = false;
if(j.containsKey("alarmType")){
if(alarmType.equals(j.getString("alarmType"))){
@@ -433,9 +432,9 @@
}
}
if(!bo){
- pumpStatus1.setAlarmType(j.getString("alarmType"));
- pumpStatus1.setAlarmTime(alarmTime);
- pumpStatusMapper.updateById(pumpStatus1);
+ ardPumpStatus1.setAlarmType(j.getString("alarmType"));
+ ardPumpStatus1.setAlarmTime(alarmTime);
+ ardPumpStatusMapper.updateById(ardPumpStatus1);
}
}
}
--
Gitblit v1.9.3