From 6a54b2b44e4ae62b5f2a884c19e8d81bd5391a12 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 27 May 2021 17:42:38 +0800
Subject: [PATCH] 根据组织，站点获取设备
---
screen-manage/src/main/java/com/moral/api/service/DeviceService.java | 4 +-
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 26 +++++++++----
screen-manage/src/main/java/com/moral/api/controller/DeviceController.java | 32 +++++++++++++---
3 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java b/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
index 27bef1f..8b0f88e 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
@@ -148,21 +148,41 @@
@ApiOperation(value = "���������������������", notes = "���������������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "orderType", value = "������������������������0������������1", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "organizationId", value = "������id", required = false, paramType = "query", dataType = "int"),
})
@RequestMapping(value = "devicesByOrgId", method = RequestMethod.GET)
- public ResultMessage selectDevicesByOrg(Integer orgId) {
- List<Map<String, Object>> devices = deviceService.selectDevicesByOrgId(orgId);
+ public ResultMessage selectDevicesByOrg(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ if (parameters.get("organizationId") == null) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Map<String, Object> devices = deviceService.selectDevicesByOrgId(parameters);
return ResultMessage.ok(devices);
}
@ApiOperation(value = "���������������������", notes = "���������������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "orderType", value = "������������������������0������������1", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "monitorPointId", value = "������id", required = false, paramType = "query", dataType = "int"),
})
@RequestMapping(value = "devicesByMpId", method = RequestMethod.GET)
- public ResultMessage selectDevicesByMp(Integer mpId) {
- List<Map<String, Object>> devices = deviceService.selectDevicesByMpId(mpId);
+ public ResultMessage selectDevicesByMp(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ if (parameters.get("monitorPointId") == null) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Map<String, Object> devices = deviceService.selectDevicesByMpId(parameters);
return ResultMessage.ok(devices);
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/DeviceService.java b/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
index a377a42..eb68f0a 100644
--- a/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
@@ -41,10 +41,10 @@
List<Map<String, Object>> selectMonitorsByOrgId(Integer orgId);
//������������������������
- List<Map<String, Object>> selectDevicesByOrgId(Integer orgId);
+ Map<String, Object> selectDevicesByOrgId(Map<String, Object> parameters);
//������������������������
- List<Map<String, Object>> selectDevicesByMpId(Integer orgId);
+ Map<String, Object> selectDevicesByMpId(Map<String, Object> parameters);
//������������������������������
Map<String, Object> selectDevices(Map<String, Object> parameters);
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