From 49c12cd602a111eb417f3024b9ed965bcb0f69fc Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 11 May 2021 15:54:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
index 8332a9e..2091070 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -275,7 +275,22 @@
page.getRecords().get(j).setType(0);
}
}
+
+ //判断设备是否在线
+ String Heartbeat = page.getRecords().get(j).getHeartbeat();
+ if (Heartbeat != null){
+ long st = sim.parse(Heartbeat).getTime();
+ long en = sim.parse(end).getTime();
+ if ((en - st) >= (60 * 60 * 24 * 1000)){
+ page.getRecords().get(j).setOnlineStatus("0");
+ }else{
+ page.getRecords().get(j).setOnlineStatus("1");
+ }
+ }else{
+ page.getRecords().get(j).setOnlineStatus("0");
+ }
}
+
return R.data(page);
}
@@ -534,4 +549,14 @@
return R.data(map);
}
+ /**
+ * 监控台统计
+ * @author arsn 2021-5-6
+ * @return
+ */
+ @PostMapping("/SeleCs")
+ public R SeleCs() {
+ return R.data(equipmentService.selEqTypeSum());
+ }
+
}
--
Gitblit v1.9.3