From d897abf4a86c0f3c6e3b80b2eef1324a06a9132e Mon Sep 17 00:00:00 2001
From: jpy <812110275@qq.com>
Date: Sat, 27 May 2023 11:08:17 +0800
Subject: [PATCH] test
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 90 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 83 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index 4ddfbcb..7c66607 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -10,6 +10,7 @@
import com.moral.api.entity.*;
import com.moral.api.mapper.HistoryFiveMinutelyMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.mapper.HistoryHourlyMapper;
import com.moral.api.pojo.dto.Wind.WindData;
import com.moral.api.pojo.dto.historyFiveMinutely.DeviceAndFiveMinuteDataDTO;
import com.moral.api.pojo.form.device.MonitorPointQueryForm;
@@ -48,6 +49,9 @@
RedisTemplate redisTemplate;
@Autowired
HistoryFiveMinutelyMapper historyFiveMinutelyMapper;
+
+ @Autowired
+ HistoryHourlyMapper historyHourlyMapper;
@Autowired
DeviceService deviceService;
@@ -73,6 +77,26 @@
}
//���������������������������������
List<DeviceAndFiveMinuteDataDTO> dtos = new ArrayList<>();
+ if (form.getChooseTime().equals("true")){
+ String time = form.getTime();
+ String timeUnits = DateUtils.stringToDateString(time, "yyyy-MM-dd HH:mm", DateUtils.yyyyMM_EN);
+ for (Device device : devices) {
+ DeviceAndFiveMinuteDataDTO dto = new DeviceAndFiveMinuteDataDTO();
+ String mac = device.getMac();
+ String dbDataStr = historyHourlyMapper.queryLastHourlyMac(mac, time, timeUnits);
+// String dbDataStr = historyFiveMinutelyMapper.queryLastFiveMinutely(mac, time, timeUnits);
+ HashMap sensorValues = JSON.parseObject(dbDataStr, HashMap.class);
+ Map<String, Object> sensorValue = new HashMap<>();
+ if (sensorValues != null && sensorValues.get(sensorCode) != null)
+ sensorValue.put(sensorCode, sensorValues.get(sensorCode));
+ else
+ sensorValue.put(sensorCode, null);
+ dto.setDevice(device);
+ dto.setSensorValue(sensorValue);
+ dtos.add(dto);
+ }
+ return dtos;
+ }
for (Device device : devices) {
DeviceAndFiveMinuteDataDTO dto = new DeviceAndFiveMinuteDataDTO();
String mac = device.getMac();
@@ -117,21 +141,53 @@
@Override
public List<Object> getAreaWindData(Map<String, Object> params) {
- String timeUnits = DateUtils.dateToDateString(new Date(), DateUtils.yyyyMM_EN);
- params.put("timeUnits", timeUnits);
- //������������
- List<WindData> windData = historyFiveMinutelyMapper.getAreaWindData(params);
+// String timeUnits = DateUtils.dateToDateString(new Date(), DateUtils.yyyyMM_EN);
+// params.put("timeUnits", timeUnits);
+// //������������
+// List<WindData> windData = historyFiveMinutelyMapper.getAreaWindData(params);
+// return getWindData(windData);
+ String chooseTime = params.get("chooseTime").toString();
+ List<WindData> windData=null;
+ if (chooseTime.equals("true")){
+ String time = params.get("time").toString();
+ String timeUnits = DateUtils.stringToDateString(time, "yyyy-MM-dd HH:mm", DateUtils.yyyyMM_EN);
+ params.put("timeUnits", timeUnits);
+ windData = historyHourlyMapper.getArea(params);
+ }else {
+ String timeUnits = DateUtils.dateToDateString(new Date(), DateUtils.yyyyMM_EN);
+ params.put("timeUnits", timeUnits);
+ //������������
+ windData = historyFiveMinutelyMapper.getAreaWindData(params);
+ }
+
return getWindData(windData);
}
+
//���������������������������
@Override
- public Map<String, Object> getPopDataByMac(String mac) {
- Map<String, Object> datas = queryLastDataByMac(mac);
+ public Map<String, Object> getPopDataByMac(Map<String, Object> params) {
+// Map<String, Object> datas = queryLastDataByMac(mac);
+ String chooseTime = params.get("chooseTime").toString();
+ String mac = params.get("mac").toString();
+ Map<String, Object> datas=null;
+ if (chooseTime.equals("true")){
+ String time = params.get("time").toString();
+ String timeUnits = DateUtils.stringToDateString(time, "yyyy-MM-dd HH:mm", DateUtils.yyyyMM_EN);
+ String dbDataStr = historyHourlyMapper.queryLastHourlyMac(mac, time, timeUnits);
+ if (dbDataStr==null){
+ return null;
+ }
+// String dbDataStr = historyFiveMinutelyMapper.queryLastFiveMinutely(mac, time, timeUnits);
+ datas = JSON.parseObject(dbDataStr, HashMap.class);
+ datas.put("dataTime",time);
+ }else {
+ datas = queryLastDataByMac(mac);
+ }
//������������������
Map<String, Object> result = new HashMap<>();
//������������������code������
- List<String> sensorCodes = Arrays.asList("a34004", "a34002", "a21005", "a21004", "a21026", "a05024", "a99054");
+ List<String> sensorCodes = Arrays.asList("a34004", "a34002", "a21005", "a21004", "a21026", "a05024", "a99054","a01008","a01007");
//������������������
Device device = deviceService.getDeviceUnitAlramInforByMac(mac);
//���������������������������
@@ -168,6 +224,8 @@
Object NO2 = data.get("a21004");
Object CO = data.get("a21005");
Object O3 = data.get("a05024");
+ Object a01008 = data.get("a01008");
+ Object a01007 = data.get("a01007");
Object name = data.get("name");
Object time = data.get("dataTime");
if(name!=null)
@@ -186,6 +244,10 @@
result.put("���������O������",O3);
if(time!=null)
result.put("������",time);
+ if (a01008!=null)
+ result.put("������",a01008);
+ if (a01007!=null)
+ result.put("������",a01007);
return result;
}
@@ -240,7 +302,9 @@
List<Object> list = new ArrayList<>();
List<Map<String, Object>> mapList = new ArrayList<>();
for (WindData data : windData) {
+ //������
Double longitude = data.getLongitude();
+ //������
Double latitude = data.getLatitude();
GeoCoordinates geoCoordinates = GeoCoordinates.create(longitude, latitude);
points.add(geoCoordinates);
@@ -248,14 +312,18 @@
laList.add(latitude);
Map<String, Object> map = new HashMap<>();
+ //������
Double windDir = data.getWindDir();
+ //������
Double windSpeed = data.getWindSpeed();
if (windDir == null) {
windDir = 0d;
windSpeed = 0d;
}
double dir = (360.0 - (windDir + 180.0) * Math.PI / 180.0);
+ //���������
U = windSpeed * Math.cos(dir);
+ //���������������
V = windSpeed * Math.sin(dir);
map.put("lo", longitude);
map.put("la", latitude);
@@ -282,12 +350,20 @@
laLaMap.put("minLa", lami);
Double lo1 = lomi - length * 0.00001141;
+// Double lo1 = lomi - length * 0.000001141 * 2;
Double lo2 = loma + length * 0.00001141;
+// Double lo2 = loma + length * 0.000001141 * 2;
+// Double la2 = lami - length * 0.000000899 * 2;
Double la2 = lami - length * 0.00000899;
+// Double la1 = lama + length * 0.000000899 * 2;
Double la1 = lama + length * 0.00000899;
double dx = 0.00001141 * perdlen;
double dy = 0.00000899 * perdlen;
+
+// double dx = 0.000001141 * perdlen * 2;
+// double dy = 0.000000899 * perdlen * 2;
+
int nx = (int) Math.floor((lo2 - lo1) / dx);
int ny = (int) Math.floor((la1 - la2) / dy);
--
Gitblit v1.8.0