From ba0f00cf00c2a5c693e9608a56d1f7d032f5e216 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 23 Mar 2021 19:19:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
index 75cfd12..f71df96 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
@@ -136,10 +136,12 @@
int equipmentCount = 0;
long hearbeat = 0;
//遍历集合数据，对比心跳时间，得出在线的设备数量
- if (status==0){
+ if (status==0 && equipmentVOS.size()>0){
for (EquipmentVO e:equipmentVOS) {
try {
- hearbeat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(e.getHeartbeat()).getTime();
+ if(null!=e.getHeartbeat()) {
+ hearbeat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(e.getHeartbeat()).getTime();
+ }
} catch (ParseException parseException) {
parseException.printStackTrace();
}
@@ -152,4 +154,14 @@
//返回数据
return equipmentCount;
}
+
+ @Override
+ public void updateexpireTime(String expireTime, String deviceNumber) {
+ baseMapper.updateexpireTime(expireTime,deviceNumber);
+ }
+
+ @Override
+ public void updateExstate(String state, String reason, String deviceNumber) {
+ baseMapper.updateExstate(state, reason, deviceNumber);
+ }
}
--
Gitblit v1.9.3