From 7fe9f42d2c4bdb31516478192211df5b233e7ad1 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 11 Oct 2021 10:12:12 +0800
Subject: [PATCH] 设备mac模糊查询
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 53 +++++++++++++++++++++++++++++------------------------
1 files changed, 29 insertions(+), 24 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 4d4ea98..0691274 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
@@ -12,7 +12,7 @@
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.moral.api.service.GovMonitorPointService;
+import com.moral.api.service.OrganizationService;
import com.moral.api.service.SysDictDataService;
import com.moral.api.util.CacheUtils;
import com.moral.api.util.AdjustDataUtils;
@@ -40,6 +40,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
@@ -76,8 +77,6 @@
@Autowired
private SysDictDataService sysDictDataService;
- @Autowired
- private LogUtils logUtils;
@Autowired
private RedisTemplate redisTemplate;
@@ -93,6 +92,9 @@
@Autowired
private AdjustDataUtils adjustDataUtils;
+
+ @Autowired
+ private OrganizationService organizationService;
/*
* ���redis������������������
@@ -136,7 +138,7 @@
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
content.append("������������������").append(device.getName()).append(":").append("mac���").append(mac);
- logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
}
@Override
@@ -159,7 +161,7 @@
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
content.append("������������������").append(device.getName()).append(";").append("mac���").append(mac);
- logUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
}
@Override
@@ -219,7 +221,7 @@
}
}
- logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
}
@Override
@@ -243,8 +245,14 @@
@Override
public List<Map<String, Object>> selectMonitorsByOrgId(Integer orgId) {
+ //���������������������
+ List<Organization> organizations = organizationService.getAllChildrenOrganization(orgId);
+ List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
+ orgIds.add(orgId);
QueryWrapper<MonitorPoint> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("id", "name").eq("organization_id", orgId).eq("is_delete", Constants.NOT_DELETE);
+ queryWrapper.select("id", "name")
+ .eq("is_delete", Constants.NOT_DELETE)
+ .in("organization_id", orgIds);
return monitorPointMapper.selectMaps(queryWrapper);
}
@@ -270,9 +278,13 @@
Object orgId = parameters.get("organizationId");
Object mpId = parameters.get("monitorPointId");
- //������������������������������
+ //������������������������������,���������������
if (orgId != null) {
- queryWrapper.eq("organization_id", orgId);
+ //���������������������
+ List<Organization> organizations = organizationService.getAllChildrenOrganization(Integer.parseInt(orgId.toString()));
+ List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
+ orgIds.add(Integer.parseInt(orgId.toString()));
+ queryWrapper.in("organization_id", orgIds);
}
//������������������������������
@@ -280,14 +292,9 @@
queryWrapper.eq("monitor_point_id", mpId);
}
- //���������������������
- if (name != null) {
- queryWrapper.like("name", name);
- }
-
- //mac������������
- if (mac != null) {
- queryWrapper.like("mac", mac);
+ //���������������mac������������
+ if (name != null && mac != null) {
+ queryWrapper.like("name", name).or().like("mac", mac);
}
//������������,������create_time������
@@ -442,14 +449,12 @@
Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
if (!ObjectUtils.isEmpty(adjustFormula)) {
Map<String, Object> deviceInfo = getDeviceByMac(mac);
- //���������������������������������
- Map<String, Object> govMpInfo = (Map) deviceInfo.get("govMonitorPoint");
- if (ObjectUtils.isEmpty(govMpInfo.get("guid"))) {
- return deviceData;
+ //������������������������������������
+ Map<String, Object> govMpInfo = (Map<String, Object>) deviceInfo.get("govMonitorPoint");
+ Map<String, Object> aqiMap = null;
+ if (govMpInfo.get("guid") != null) {
+ aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMpInfo.get("guid").toString());
}
- String guid = (String) govMpInfo.get("guid");
- //���������������aqi������
- Map<String, Object> aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, guid);
return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
}
deviceData.remove("DataTime");
--
Gitblit v1.8.0