From 2a781bbf1d42191c3b8225a9973bf3d0ecccd66b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 27 Sep 2021 14:33:36 +0800
Subject: [PATCH] screen-aqi 增加获取监测站数据显示接口
---
screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
index e7d58e4..e27b929 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
@@ -1,10 +1,15 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.entity.Device;
import com.moral.api.entity.GovMonitorPoint;
+import com.moral.api.entity.Organization;
+import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.GovMonitorPointMapper;
import com.moral.api.service.GovMonitorPointService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.OrganizationService;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.RegionCodeUtils;
@@ -12,7 +17,11 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* <p>
@@ -30,8 +39,14 @@
@Autowired
RedisTemplate redisTemplate;
+ @Resource
+ private OrganizationService organizationService;
+
+ @Autowired(required = false)
+ private DeviceMapper deviceMapper;
+
@Override
- public List<GovMonitorPoint> queryGovMonitorPointAndDataByRegionCode(Integer regionCode) {
+ public List<GovMonitorPoint> queryGovMonitorPointAndDataByRegionCode(Integer regionCode,String sensorCode) {
String regionCodeStr = RegionCodeUtils.regionCodeConvertToName(regionCode);
QueryWrapper<GovMonitorPoint> wrapper = new QueryWrapper<>();
wrapper.eq(regionCodeStr,regionCode);
@@ -40,9 +55,29 @@
List<GovMonitorPoint> govMonitorPoints = govMonitorPointMapper.selectList(wrapper);
for (GovMonitorPoint govMonitorPoint : govMonitorPoints) {
Object data = redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMonitorPoint.getGuid());
- if(data!=null)
- govMonitorPoint.setData(String.valueOf(data));
+ Map<String,Object> dataMap = (Map<String, Object>) data;
+ if(data!=null&&dataMap.get(sensorCode)!=null)
+ govMonitorPoint.setData(String.valueOf(dataMap.get(sensorCode)));
}
return govMonitorPoints;
}
+
+ @Override
+ public List<GovMonitorPoint> selectGovMonitorPointsByOrgid(Map map) {
+ //������������id���������������
+ List<Organization> organizations = organizationService.getChildrenOrganizationsById(Integer.parseInt(map.get("organization_id").toString()));
+ Set<Integer> organization_ids = organizations.stream().map(organization -> organization.getId()).collect(Collectors.toSet());
+ organization_ids.add(Integer.parseInt(map.get("organization_id").toString()));
+ //������������������������������
+ QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
+ wrapper_device.in("organization_id",organization_ids).eq("is_delete",Constants.NOT_DELETE);
+ List<Device> devices = deviceMapper.selectList(wrapper_device);
+ //������������������������������id
+ Set<String> guids = devices.stream().map(device -> device.getGuid()).collect(Collectors.toSet());
+ //������������������������������
+ QueryWrapper<GovMonitorPoint> wrapper_govMonitorPoint = new QueryWrapper<>();
+ wrapper_govMonitorPoint.eq("is_delete",Constants.NOT_DELETE).in("guid",guids);
+ List<GovMonitorPoint> govMonitorPointList = govMonitorPointMapper.selectList(wrapper_govMonitorPoint);
+ return govMonitorPointList;
+ }
}
--
Gitblit v1.8.0