From 5ee338a5e19319386f2f6298d22a8e4ac96dc7cb Mon Sep 17 00:00:00 2001 From: Administrator <admin> Date: Thu, 06 May 2021 15:24:42 +0800 Subject: [PATCH] 1.设备故障状态合并到设备状态中，设备状态接口修改 2.警情处理完成后修改设备状态为正常，修改警情处理接口 --- blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/Netty/controller/nettyController.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 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 9b30c94..798f9a2 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 @@ -144,9 +144,9 @@ childMenu = new ArrayList(); //根据查询条件得到所有设备 - List<EquipmentVO> pages = equipmentService.selectEquipmentPage(null, null, null, null); + List<EquipmentVO> pages = null; - List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(pid); + List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(null); //根据传入的id递归出该节点下所有的设备 List<Map<String, Object>> childList = treeMenuList(treedatas, Integer.parseInt(pid)); @@ -201,9 +201,9 @@ childMenu = new ArrayList(); //根据查询条件得到所有设备 - List<EquipmentVO> pages = equipmentService.selectEquipmentPage(null, null, null, null); + List<EquipmentVO> pages = null; - List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(pid); + List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(null); //根据传入的id递归出该节点下所有的设备 List<Map<String, Object>> childList = treeMenuList(treedatas, Integer.parseInt(pid)); -- Gitblit v1.9.3