From 7b3fb2ea4eb3c8539ce3019bfafacb7ca3b21096 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Tue, 02 Mar 2021 10:06:13 +0800
Subject: [PATCH] 1.目录树调整
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 66 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 3 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 7d228a5..839243f 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
@@ -88,6 +88,37 @@
}
/**
+ * 查询所有
+ */
+ @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();
+
+ for (int j = 0; j < pages.size(); j++) {
+ String expireTime = pages.get(j).getExpireTime();
+ //1.获取当前时间
+ Date dd = new Date();
+ SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String end = sim.format(dd);
+ //把string类型转换为long类型的
+ long st = sim.parse(expireTime).getTime();
+ long en = sim.parse(end).getTime();
+ //计算天数
+ int day = (int) ((st - en) / 86400000);
+ if (day <= 30) {
+ pages.get(j).setType(1);
+ } else {
+ pages.get(j).setType(0);
+ }
+ }
+
+
+ return R.data(pages);
+ }
+
+ /**
* 自定义分页
*/
@GetMapping("/pages")
@@ -110,8 +141,35 @@
//根据传入的id递归出该节点下所有的设备
List<Map<String, Object>> childList = treeIdList(treedatas, pid);
- //根据查询条件得到所有设备
- page = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment, childList);
+ if (childList.size() > 0) {
+ //根据查询条件得到所有设备
+ page = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment, childList);
+ } else {
+ page = null;
+ }
+ }
+
+ if (page != null){
+ for (int j = 0; j < page.getRecords().size(); j++) {
+ String expireTime = page.getRecords().get(j).getExpireTime();
+ //1.获取当前时间
+ Date dd = new Date();
+ SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String end = sim.format(dd);
+ //把string类型转换为long类型的
+
+ if (expireTime != null){
+ long st = sim.parse(expireTime).getTime();
+ long en = sim.parse(end).getTime();
+ //计算天数
+ int day = (int) ((st - en) / 86400000);
+ if (day <= 30) {
+ page.getRecords().get(j).setType(1);
+ } else {
+ page.getRecords().get(j).setType(0);
+ }
+ }
+ }
}
return R.data(page);
@@ -285,7 +343,9 @@
if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")) {
equipment.setHeartbeat(null);
}
-
+ String deviceName = equipment.getDeviceName();
+ String deviceNumber = equipment.getDeviceNumber();
+ catalogService.updateCatalog(deviceName,deviceNumber);
return R.status(equipmentService.saveOrUpdate(equipment));
}
--
Gitblit v1.9.3