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/catalog/mapper/catalogMapper.java | 2
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java | 2
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/Netty/controller/nettyController.java | 4 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 8 ++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java | 6 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java | 4 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 45 ++++++++++++----------
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml | 2
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java | 2
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java | 2
10 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/Netty/controller/nettyController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/Netty/controller/nettyController.java
index 4f39697..e5cdca5 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/Netty/controller/nettyController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/Netty/controller/nettyController.java
@@ -146,7 +146,7 @@
//根据查询条件得到所有设备
List<EquipmentVO> pages = null;
- List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(pid);
+ List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber();
//根据传入的id递归出该节点下所有的设备
List<Map<String, Object>> childList = treeMenuList(treedatas, Integer.parseInt(pid));
@@ -203,7 +203,7 @@
//根据查询条件得到所有设备
List<EquipmentVO> pages = null;
- List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(pid);
+ List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber();
//根据传入的id递归出该节点下所有的设备
List<Map<String, Object>> childList = treeMenuList(treedatas, Integer.parseInt(pid));
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java
index cc48181..1e85d35 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java
@@ -37,7 +37,7 @@
List<Map<String, Object>> selectEq();
List<Map<String, Object>> selectWar(String beginTime,String endTime);
- List selectCatalogEqNUmber(String pid);
+ List<Map<String, Object>> selectCatalogEqNUmber();
List<catalogVO> lazyTree(String tenantId, Long parentId);
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
index 646d90d..3e93c3c 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
@@ -28,7 +28,7 @@
<select id="selectCatalogEqNUmber" resultType="java.util.HashMap">
SELECT
- *
+ id,name,pId,eqid
FROM
sys_catalog
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java
index 259276d..a949f1a 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/catalogService.java
@@ -31,7 +31,7 @@
*/
public interface catalogService extends IService<catalog> {
List<Map<String, Object>> selectCatalogList();
- List<Map<String, Object>> selectCatalogEqNUmber(String pid);
+ List<Map<String, Object>> selectCatalogEqNUmber();
List<Map<String, Object>> selectCount();
List<Map<String, Object>> selectAddvcd();
List<Map<String, Object>> selectEq();
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java
index 8206486..06320c6 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java
@@ -42,8 +42,8 @@
}
@Override
- public List selectCatalogEqNUmber(String pid) {
- return baseMapper.selectCatalogEqNUmber(pid);
+ public List selectCatalogEqNUmber() {
+ return baseMapper.selectCatalogEqNUmber();
}
@Override
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);
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
index 464a3b6..24eb001 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
@@ -34,7 +34,7 @@
*/
public interface EquipmentMapper extends BaseMapper<Equipment> {
- List<EquipmentVO> selectEquipmentPage(IPage page, EquipmentVO equipment);
+ List<EquipmentVO> selectEquipmentPage(IPage page, EquipmentVO equipment,List childList);
void s(Equipment equipment);
void updateOne(Equipment equipment);
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
index 224d681..8e925ff 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
@@ -80,6 +80,14 @@
<if test="equipment.dtype!=null">
and dtype=#{equipment.dtype}
</if>
+
+ <if test="childList!=null and childList.size>0">
+ and deviceNumber in
+ <foreach collection="childList" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+
</select>
<!--新增-->
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
index 909403c..ab589dd 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
@@ -34,7 +34,7 @@
*/
public interface IEquipmentService extends IService<Equipment> {
- IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment);
+ IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment,List childList);
IPage<EquipmentVO> selectPage(IPage<EquipmentVO> page, EquipmentVO equipment,String pid);
/**
* 树形结构
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
index 2dabe91..a560473 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
@@ -43,14 +43,14 @@
private static final String PARENT_ID = "parentId";
@Override
- public IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment) {
- return page.setRecords(baseMapper.selectEquipmentPage(page,equipment));
+ public IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment,List childList) {
+ return page.setRecords(baseMapper.selectEquipmentPage(page,equipment,childList));
}
@Override
public IPage<EquipmentVO> selectPage(IPage<EquipmentVO> page, EquipmentVO equipment,String pid) {
- return page.setRecords(baseMapper.selectEquipmentPage(page,equipment));
+ return page.setRecords(baseMapper.selectEquipmentPage(page,equipment,null));
}
@Override
--
Gitblit v1.9.3