From d1eddc4e49d9cd02df513361315bd65bce076642 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 14 Dec 2021 15:34:25 +0800
Subject: [PATCH] 最近12小时热力图数据接口
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 113 +++++++++++++++++++++++++++++++++++++
screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java | 17 +++++
screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java | 9 +++
3 files changed, 139 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java b/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
index 0f1da06..d10d3b1 100644
--- a/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
@@ -52,4 +52,21 @@
return ResultMessage.ok(resultMap);
}
+ @RequestMapping(value = "getLastTwelveHourDataByOrgIdAndSensorCode", method = RequestMethod.GET)
+ @ResponseBody
+ public ResultMessage getLastTwelveHourDataByOrgIdAndSensorCode(HttpServletRequest request){
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
+ Object orgid = parameters.get("organization_id");
+ Object sensorCode = parameters.get("sensor_code");
+ if (ObjectUtils.isEmpty(orgid) || ObjectUtils.isEmpty(sensorCode)){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Organization organization = organizationMapper.selectById(Integer.parseInt(orgid.toString()));
+ if (ObjectUtils.isEmpty(organization)){
+ return ResultMessage.fail(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode(), ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
+ }
+ Map<String, Object> resultMap = historyHourlyService.getLastTwelveHourDataByOrgIdAndSensorCode(parameters);
+ return ResultMessage.ok(resultMap);
+ }
+
}
diff --git a/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java b/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
index c10e14b..8429e03 100644
--- a/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
+++ b/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
@@ -27,6 +27,15 @@
*@Date: 2021/12/7 10:07
**/
Map<String, Object> getLastHourDataByOrgIdAndSensorCode(Map map);
+
+ /**
+ *@Description: ������������id���������������������������12���������������
+ *@Param: [map]
+ *@return: java.util.Map<java.lang.String,java.lang.Object>
+ *@Author: lizijie
+ *@Date: 2021/12/10 14:57
+ **/
+ Map<String, Object> getLastTwelveHourDataByOrgIdAndSensorCode(Map map);
/**
* @Description: ������mac������������������������
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index 0b837c6..49f8672 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -144,6 +144,119 @@
double longitudeMin = Collections.min(longitudeList)-0.2/(111*Math.cos(latitudeMin));
double longitudeMax = Collections.max(longitudeList)+0.2/(111*Math.cos(latitudeMin));
List<Double> bound = new ArrayList<>();
+ bound.add(longitudeMin);
+ bound.add(latitudeMax);
+ bound.add(longitudeMax);
+ bound.add(latitudeMin);
+ resultMap.put("bound",bound);
+ List<List> bound1 = new ArrayList<>();
+ List<Double> left_up = new ArrayList<>();
+ left_up.add(latitudeMax);
+ left_up.add(longitudeMin);
+ List<Double> right_up = new ArrayList<>();
+ right_up.add(latitudeMax);
+ right_up.add(longitudeMax);
+ List<Double> left_down = new ArrayList<>();
+ left_down.add(latitudeMin);
+ left_down.add(longitudeMin);
+ List<Double> right_down = new ArrayList<>();
+ right_down.add(latitudeMin);
+ right_down.add(longitudeMax);
+ bound1.add(left_up);
+ bound1.add(right_up);
+ bound1.add(right_down);
+ bound1.add(left_down);
+ List<GeoCoordinate> geoCoordinates = new ArrayList<>();
+ for (List bo:bound1) {
+ GeoCoordinate g = new GeoCoordinate();
+ g.setLatitude(Double.parseDouble(bo.get(0).toString()));
+ g.setLongitude(Double.parseDouble(bo.get(1).toString()));
+ geoCoordinates.add(g);
+ }
+ GeoCoordinate centerPoint400 = GetCenterPointFromListOfCoordinates.getCenterPoint400(geoCoordinates);
+ List centerPoint = new ArrayList();
+ centerPoint.add(centerPoint400.getLongitude());
+ centerPoint.add(centerPoint400.getLatitude());
+ resultMap.put("centerPoint",centerPoint);
+ return resultMap;
+ }
+
+ @Override
+ public Map<String, Object> getLastTwelveHourDataByOrgIdAndSensorCode(Map parameters) {
+ Map<String, Object> resultMap = new HashMap<>();
+ int orgId = Integer.parseInt(parameters.get("organization_id").toString());
+ //���������������������������������id
+ List<Integer> allOrgId = new ArrayList<>();
+ allOrgId.add(orgId);
+ //������������
+ //���������������
+ List<Organization> allChildrenOrganization = organizationService.getChildrenOrganizationsById(orgId);
+ if (!ObjectUtils.isEmpty(allChildrenOrganization) || allChildrenOrganization.size() < 1){
+ for (Organization organization:allChildrenOrganization) {
+ allOrgId.add(organization.getId());
+ }
+ }
+ //������������
+ List<Integer> allOrgIdWithoutDuplicates = allOrgId.stream().distinct().collect(Collectors.toList());
+ //������������list���������������mac
+ List<String> deviceMacList = new ArrayList<>();
+ //������������map���Mac������key���device������value
+ Map<String,Device> deviceMap = new HashMap<>();
+ List<Double> longitudeList = new ArrayList<>();
+ List<Double> latitudeList = new ArrayList<>();
+ for (Integer orgIdWithoutDuplicates:allOrgIdWithoutDuplicates) {
+ //������id������������������
+ QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
+ wrapper_device.eq("is_delete",Constants.NOT_DELETE).eq("organization_id",orgIdWithoutDuplicates);
+ List<Device> devices = new ArrayList<>();
+ devices = deviceMapper.selectList(wrapper_device);
+ if (devices.size()>0){
+ for (Device device:devices) {
+ String mac = device.getMac();
+ deviceMacList.add(mac);
+ deviceMap.put(mac,device);
+ double longitude = device.getLongitude();
+ double latitude = device.getLatitude();
+ longitudeList.add(longitude);
+ latitudeList.add(latitude);
+ }
+ }else {
+ continue;
+ }
+ }
+ List<Object> list = new ArrayList<>();
+ //������������
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH");
+ for (int i=12;i>0;i--){
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.HOUR_OF_DAY,calendar.get(Calendar.HOUR_OF_DAY)-i);
+ String time = df.format(calendar.getTime())+":00:00";
+ String timeUnits = DateUtils.dateToDateString(calendar.getTime(), DateUtils.yyyyMM_EN);
+ List<Map<String,Object>> historyHourlyDatas = new ArrayList<>();
+ historyHourlyDatas = historyHourlyMapper.selectDataByMacsAndTime(timeUnits, deviceMacList, time);
+ List<Object> oneHourlyList = new ArrayList<>();
+ for (Map historyHourlyData:historyHourlyDatas) {
+ List<Object> list1 = new ArrayList<>();
+ String mac = historyHourlyData.get("mac").toString();
+ Device device = deviceMap.get(mac);
+ double longitude = device.getLongitude();
+ double latitude = device.getLatitude();
+ JSONObject value = JSONObject.parseObject(historyHourlyData.get("value").toString());
+ double num = Double.parseDouble(value.get(parameters.get("sensor_code")).toString());
+ int level = PollutantUtils.pollutantLevel(num, (parameters.get("sensor_code")).toString());
+ list1.add(longitude);
+ list1.add(latitude);
+ list1.add(level);
+ oneHourlyList.add(list1);
+ }
+ list.add(oneHourlyList);
+ }
+ resultMap.put("list",list);
+ double latitudeMin = Collections.min(latitudeList)-0.0018;
+ double latitudeMax = Collections.max(latitudeList)+0.0018;
+ double longitudeMin = Collections.min(longitudeList)-0.2/(111*Math.cos(latitudeMin));
+ double longitudeMax = Collections.max(longitudeList)+0.2/(111*Math.cos(latitudeMin));
+ List<Double> bound = new ArrayList<>();
bound.add(latitudeMax);
bound.add(longitudeMax);
bound.add(latitudeMin);
--
Gitblit v1.8.0