From 657182c7989dc77b69bb3f9adaf6c75b6466ff95 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 09 Jun 2021 10:31:35 +0800
Subject: [PATCH] screen-manage 编辑账号接口删除分配角色功能，分配角色功能变为单独接口
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 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..01836ff 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
@@ -83,6 +83,7 @@
deviceMapper.insert(device);
Map<String, Object> deviceInfo = selectDeviceInfoById(device.getId());
//������������������������redis
+ RedisUtil.del("device_" + device.getMac());
RedisUtil.set("device_" + device.getMac(), deviceInfo);
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
@@ -177,17 +178,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,12 +196,26 @@
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);
}
if (mac != null) {
queryWrapper.like("mac", mac);
}
+
//������������,������create_time������
if (order != null && orderType != null) {
@@ -255,6 +266,9 @@
deviceInfo.put("createTime", DateUtils.dateToDateString(device.getCreateTime()));
deviceInfo.put("installTime", device.getInstallTime() == null ? null : DateUtils.dateToDateString(device.getInstallTime()));
+ //������������
+ deviceInfo.put("extend", device.getExtend());
+
//������
deviceInfo.put("profession", device.getProfession());
deviceInfo.put("professionName", device.getProfessionName());
@@ -302,6 +316,7 @@
mpInfo.put("id", monitorPoint.getId());
mpInfo.put("name", monitorPoint.getName());
deviceInfo.put("monitorPoint", mpInfo);
+
RedisUtil.set("device_" + mac, deviceInfo);
return deviceInfo;
}
--
Gitblit v1.8.0