From 5bacbb17debde58d6ff2581e4a03a866ca009c02 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 31 May 2021 15:33:05 +0800
Subject: [PATCH] 菜单接口合并，查询父菜单列表
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index c5573f4..b34ad91 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -177,17 +177,13 @@
}
@Override
- public List<Map<String, Object>> selectDevicesByOrgId(Integer orgId) {
- QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_delete", Constants.NOT_DELETE).eq("organization_id", orgId);
- return deviceMapper.selectMaps(queryWrapper);
+ public Map<String, Object> selectDevicesByOrgId(Map<String, Object> parameters) {
+ return selectDevices(parameters);
}
@Override
- public List<Map<String, Object>> selectDevicesByMpId(Integer mpId) {
- QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_delete", Constants.NOT_DELETE).eq("monitor_point_id", mpId);
- return deviceMapper.selectMaps(queryWrapper);
+ public Map<String, Object> selectDevicesByMpId(Map<String, Object> parameters) {
+ return selectDevices(parameters);
}
@Override
@@ -199,6 +195,19 @@
Object orderType = parameters.get("orderType");
Object name = parameters.get("name");
Object mac = parameters.get("mac");
+ Object orgId = parameters.get("organizationId");
+ Object mpId = parameters.get("monitorPointId");
+
+ //������������������������������
+ if (orgId != null) {
+ queryWrapper.eq("organization_id", orgId);
+ }
+
+ //������������������������������
+ if (mpId != null) {
+ queryWrapper.eq("monitor_point_id", mpId);
+ }
+
if (name != null) {
queryWrapper.like("name", name);
}
@@ -206,6 +215,7 @@
queryWrapper.like("mac", mac);
}
+
//������������,������create_time������
if (order != null && orderType != null) {
if (Constants.ORDER_ASC.equals(orderType)) {
--
Gitblit v1.8.0