From 2d5fdd624858e438a7153a8d3a55add8d2fdfda2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期日, 08 十月 2023 16:00:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java | 69 +++++++++++++++++++++++++++++++---
1 files changed, 63 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 0f1532c..9c4d6a6 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
@@ -280,22 +280,24 @@
@Override
public void run(){
Para.setI(0);
- for(Object o : radarList){
+ 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("192.168.5.226",1200);
+ Socket socket = new Socket(host,Integer.valueOf(port));
} catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- int i = Para.getI();
- i++;
+ int num = Para.getI();
+ num++;
}
}
};
thread.start();
}
+ int n = Para.getI();
Para.setJ(radarList.size() - Para.getI());
}
};
@@ -310,6 +312,61 @@
return unitVo;
}
+ @Override
+ public int stealelecNum() {
+ return stealelecMapper.selectCount(null);
+ }
+
+ @Override
+ public int cameraNum() {
+ return cameraMapper.selectCount(null);
+ }
+
+ @Override
+ public int moveNum() {
+ return moveMapper.selectCount(null);
+ }
+
+ @Override
+ public int fireNum() {
+ return fireMapper.selectCount(null);
+ }
+
+ @Override
+ public int externalNum() {
+ return externalMapper.selectCount(null);
+ }
+
+ @Override
+ public int accessNum() {
+ return accessMapper.selectCount(null);
+ }
+
+ @Override
+ public int apponekeyNum() {
+ return apponekeyMapper.selectCount(null);
+ }
+
+ @Override
+ public int pumpNum() {
+ return pumpMapper.selectCount(null);
+ }
+
+ @Override
+ public int wallNum() {
+ return wallMapper.selectCount(null);
+ }
+
+ @Override
+ public int digitizationNum() {
+ return digitization3Mapper.selectCount(null);
+ }
+
+ @Override
+ public int tubeNum() {
+ return tubeMapper.selectCount(null);
+ }
+
public List<CountVo> es(List<CountVo> list){
for (int i = 1; i <= 12 ; i++) {
String month;
--
Gitblit v1.9.3