From 49a12928b30f758d15074ead307390ecdbdd43da Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Feb 2021 09:55:29 +0800
Subject: [PATCH] 初版
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 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 4d428c8..7d228a5 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
@@ -98,17 +98,23 @@
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials", "true");
- List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(pid);
- //根据传入的id递归出该节点下所有的设备
- List<Map<String, Object>> childList = treeIdList(treedatas, pid);
+ IPage<EquipmentVO> page = null;
+ //清空全局参数
+ childMenu = new ArrayList();
+ if (pid == null || pid.equals("")) {
+ //根据查询条件得到所有设备
+ page = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment, null);
+ } else {
+ List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber();
+ //根据传入的id递归出该节点下所有的设备
+ List<Map<String, Object>> childList = treeIdList(treedatas, pid);
- System.out.println(childList);
+ //根据查询条件得到所有设备
+ page = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment, childList);
+ }
-
-
-
- return R.data(null);
+ return R.data(page);
}
/**
@@ -126,11 +132,10 @@
childMenu = new ArrayList();
//根据查询条件得到所有设备
- IPage<EquipmentVO> pageData = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
+ IPage<EquipmentVO> pageData = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment, null);
List<EquipmentVO> pages = pageData.getRecords();
List<EquipmentVO> datas = new ArrayList();
-
if (pid == null || pid.equals("")) {
@@ -153,7 +158,7 @@
}
datas = pages;
} else {
- List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(pid);
+ List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber();
//根据传入的id递归出该节点下所有的设备
List<Map<String, Object>> childList = treeMenuList(treedatas, pid);
//将得到的设备与查询所得设备进行匹配
@@ -175,7 +180,7 @@
pages.get(j).setType(0);
}
- if (childList.get(i).get("eqid") != null) {
+ if (childList.get(i).get("eqid") != null && !childList.get(i).get("eqid").equals("")) {
if (childList.get(i).get("eqid").equals(pages.get(j).getDeviceNumber())) {
datas.add(pages.get(j));
}
@@ -197,9 +202,9 @@
//遍历出父id等于参数的id，add进子节点集合
if (!pid.equals(0)) {
- if (menuList.get(i).get("pId").toString().equals(pid) ) {
+ if (menuList.get(i).get("pId").toString().equals(pid)) {
//递归遍历下一级
- treeMenuList(menuList, menuList.get(i).get("id").toString());
+ treeMenuList(menuList, menuList.get(i).get("id").toString());
childMenu.add(menuList.get(i));
}
}
@@ -213,10 +218,10 @@
//遍历出父id等于参数的id，add进子节点集合
if (!pid.equals(0)) {
- if (menuList.get(i).get("pId").toString().equals(pid) ) {
+ if (menuList.get(i).get("pId").toString().equals(pid)) {
//递归遍历下一级
- treeIdList(menuList, menuList.get(i).get("id").toString());
- if (menuList.get(i).get("eqid") != null || menuList.get(i).get("eqid") != "") {
+ treeIdList(menuList, menuList.get(i).get("id").toString());
+ if (menuList.get(i).get("eqid") != null && !menuList.get(i).get("eqid").equals("")) {
childMenu.add(menuList.get(i).get("eqid"));
}
}
@@ -269,15 +274,15 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入equipment")
public R submit(@Valid @RequestBody Equipment equipment) {
- if (equipment.getStime() != null && equipment.getStime().equals("")){
+ if (equipment.getStime() != null && equipment.getStime().equals("")) {
equipment.setStime(null);
}
- if (equipment.getExpireTime() != null && equipment.getExpireTime().equals("")){
+ if (equipment.getExpireTime() != null && equipment.getExpireTime().equals("")) {
equipment.setExpireTime(null);
}
- if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")){
+ if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")) {
equipment.setHeartbeat(null);
}
--
Gitblit v1.9.3