From 6971c195601ecc91b2b7b52af83efed9956dcfe0 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 09 Apr 2021 09:22:49 +0800
Subject: [PATCH] 接口提供：根据设备编码
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 7849bb6..aa0c3de 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
@@ -93,8 +93,8 @@
@GetMapping("/listAll")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入equipment")
- public R<List<EquipmentVO>> listAll(Equipment equipment, Query query) throws ParseException {
- List<EquipmentVO> pages = equipmentService.listAll();
+ public R<List<EquipmentVO>> listAll(EquipmentVO equipment, Query query) throws ParseException {
+ List<EquipmentVO> pages = equipmentService.listAll(equipment);
for (int j = 0; j < pages.size(); j++) {
String expireTime = pages.get(j).getExpireTime();
@@ -114,6 +114,22 @@
pages.get(j).setType(0);
}
}
+
+
+ //判断设备是否在线
+ String Heartbeat = pages.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)){
+ pages.get(j).setOnlineStatus("0");
+ }else{
+ pages.get(j).setOnlineStatus("1");
+ }
+ }else{
+ pages.get(j).setOnlineStatus("0");
+ }
+
}
--
Gitblit v1.9.3