From 61cd74d5b5d7e98b4a7a7a7747fb08cde5651e33 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Apr 2021 15:13:24 +0800
Subject: [PATCH] APP接口调整
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 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 7bbc177..9e5a85b 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
@@ -80,8 +80,25 @@
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials", "true");
/*Equipment detail = equipmentService.getOne(Condition.getQueryWrapper(equipment));*/
-
- return R.data(equipmentService.selectInfo(equipment));
+ EquipmentVOS equipmentVOS = equipmentService.selectInfo(equipment);
+ //获取部门数据
+ List<DeptVo> deptVos = deptFeignApi.selDeptList();
+ if (null!=equipmentVOS.getDeptId()){
+ String[] split =equipmentVOS.getDeptId().split(",");
+ List<String> list = Arrays.asList(split);
+ StringBuffer deptNameBuiffer = new StringBuffer();
+ //数据匹配封装
+ for (String deptId:list) {
+ for (DeptVo deptVo:deptVos) {
+ if (deptId.equals(deptVo.getId().toString())){
+ deptNameBuiffer.append(deptVo.getDeptName()).append("/");
+ }
+ }
+ }
+ //封装部门名称数据
+ equipmentVOS.setDeptName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
+ }
+ return R.data(equipmentVOS);
}
/**
@@ -137,10 +154,7 @@
}else{
pages.get(j).setOnlineStatus("0");
}
-
}
-
-
return R.data(pages);
}
@@ -261,8 +275,23 @@
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);
}
--
Gitblit v1.9.3