From 2e9a6554d676f5c696590b39258bd2644a8f2dc6 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期日, 09 十月 2022 10:05:27 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 61 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index c591d87..f8e1e3a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -19,16 +19,14 @@
import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.A1TernaryCodeReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.A5LightResetReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.EmptyRequestInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.response.A1DeviceMacRespInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.response.A1TernaryCodeRespInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.A1OrderEnum;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.A2OrderEnum;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.DeviceStateEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.*;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.admin.param.PoleParam;
@@ -261,7 +259,7 @@
DeviceOnLineCountVO ledNova = new DeviceOnLineCountVO();
ledPlayerEntities.forEach(
Volume -> {
- String s = redisUtils.get(DeviceRedisKey.IP_BROADCAST + Volume.getId());
+ String s = redisUtils.get(DeviceRedisKey.NOVA + Volume.getId());
if (s != null) {
RedisDeviceStatus redisDeviceStatus = JSON.parseObject(s, RedisDeviceStatus.class);
if (redisDeviceStatus.getStatus() == 0) {
@@ -368,12 +366,19 @@
//鍗曠伅
List<LightBo> lights = SpringContextHolder.getBean(LightService.class).listLightOnHome();
+ BaseConditionVO baseConditionVO = new BaseConditionVO();
+ baseConditionVO.setPageNo(1);
+ baseConditionVO.setPageSize(999);
+ System.out.println("鍗曠伅鏁呴殰缁熻鏃堕棿: " + LocalDateTime.now());
+ CommonPage commonPage = SpringContextHolder.getBean(LightReportErrorService.class).queryErrorCode(baseConditionVO);
+ System.out.println("鍗曠伅鏁呴殰缁熻鏃堕棿: " + LocalDateTime.now());
new Thread(new Runnable() {
@Override
public void run() {
+
AtomicInteger onLine = new AtomicInteger(0);
AtomicInteger offLine = new AtomicInteger(0);
- AtomicInteger error = new AtomicInteger(0);
+ AtomicInteger error = new AtomicInteger(commonPage.getList().size());
DeviceOnLineCountVO light = new DeviceOnLineCountVO();
@@ -390,7 +395,7 @@
offLine.getAndIncrement();
}
} else {
- error.getAndIncrement();
+ offLine.getAndIncrement();
}
}
);
@@ -420,20 +425,24 @@
DeviceOnLineCountVO c3m = new DeviceOnLineCountVO();
c3mChargings.forEach(
device -> {
- String s = redisUtils.get(DeviceRedisKey.C3M + device.getC3Id());
+// RedisUtils.getBean().set(C3mRedisConstant.C3_STATUS.getCode() + heartbeatReportInnerFrame.getHeartBeatDataPackage().getC3Mac()
+// , heartbeatReportInnerFrame.getHeartBeatDataPackage(), 300L);
+ String s = redisUtils.get(C3mRedisConstant.C3_STATUS.getCode() + device.getC3Mac());
+ RedisDeviceStatus redisDeviceStatus = new RedisDeviceStatus();
+ redisDeviceStatus.setDeviceId(device.getC3Id().toString());
if (s != null) {
- RedisDeviceStatus redisDeviceStatus = JSON.parseObject(s, RedisDeviceStatus.class);
- if (redisDeviceStatus.getStatus() == 0) {
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage = JSON.parseObject(s, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage.class);
+ if ("5".equals(heartBeatDataPackage.getStatusBit())) {
//鍦ㄧ嚎
onLine.getAndIncrement();
- } else if (redisDeviceStatus.getStatus() == 1) {
- //绂荤嚎
- offLine.getAndIncrement();
} else {
+ //鏁呴殰
+ onLine.getAndIncrement();
error.getAndIncrement();
}
} else {
- error.getAndIncrement();
+ //绂荤嚎
+ offLine.getAndIncrement();
}
}
);
@@ -569,7 +578,7 @@
}
}).start();
try {
- countDownLatch.await(12000, TimeUnit.MILLISECONDS);
+ countDownLatch.await(20000, TimeUnit.MILLISECONDS);
countDownLatchUtil.remove(str);
} catch (InterruptedException e) {
throw new RuntimeException(e);
@@ -1101,7 +1110,11 @@
if (pole == null) {
throw new BusinessException("鐏潌涓嶅瓨鍦�");
}
+
+ //涓�绾у鎴� -1 userId
+ //浜岀骇瀹㈡埛 涓婄骇瀹㈡埛id userId
pole.setClientId(-1L);
+ pole.setUserId(-1L);
r = updateById(pole);
if (!r) {
@@ -1329,7 +1342,7 @@
}
//璁剧疆瑙﹀彂鏉′欢 瀛樺叆Redis 15鍒嗛挓瓒呮椂 15鍒嗛挓鍐呭啀娆¤皟鐢ㄧ洿鎺ヨ繑鍥�
- redisUtils.set("redisStatusKeyTimeout", System.currentTimeMillis(), 60*15);
+ redisUtils.set("redisStatusKeyTimeout", System.currentTimeMillis(), 60 * 15);
CountDownLatch countDownLatch = new CountDownLatch(7);//todo
//鑾峰彇涓�涓�7浣嶉殢鏈烘暟
@@ -1361,14 +1374,14 @@
System.out.println("鍗曠伅鎵ц");
}
}).start();
- new Thread(new Runnable() {
- @Override
- public void run() {
- SpringContextHolder.getBean(C3ChargingService.class).setCacheData();
- countDownLatchUtil.countDown(str);
- System.out.println("鍏呯數妗╂墽琛�");
- }
- }).start();
+// new Thread(new Runnable() {
+// @Override
+// public void run() {
+// SpringContextHolder.getBean(C3ChargingService.class).setCacheData();
+// countDownLatchUtil.countDown(str);
+// System.out.println("鍏呯數妗╂墽琛�");
+// }
+// }).start();
new Thread(new Runnable() {
@Override
public void run() {
--
Gitblit v1.9.3