From 1babbf1c0b2bc8d27f2874c85369e394b545594a Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 11 May 2020 11:24:00 +0800
Subject: [PATCH] add轨迹信息显示按秒级显示,update轨迹数据先从history表查询,update报表单位问题
---
src/main/java/com/moral/service/impl/HistoryServiceImpl.java | 864 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 468 insertions(+), 396 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index 6a32a37..8622a40 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -1,11 +1,13 @@
package com.moral.service.impl;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
@@ -21,6 +23,7 @@
import javax.annotation.Resource;
+import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -34,6 +37,7 @@
import com.moral.entity.Sensor;
import com.moral.mapper.DeviceMapper;
import com.moral.mapper.HistoryMapper;
+import com.moral.mapper.HistoryMinutelyMapper;
import com.moral.mapper.MonitorPointMapper;
import com.moral.mapper.OrganizationRelationMapper;
import com.moral.mapper.SensorMapper;
@@ -46,430 +50,498 @@
@Service
public class HistoryServiceImpl implements HistoryService {
- @Resource
- private AccountService accountService;
+ @Resource
+ private AccountService accountService;
- @Resource
- private HistoryMapper historyMapper;
+ @Resource
+ private HistoryMapper historyMapper;
- @Resource
- private DeviceMapper deviceMapper;
+ @Resource
+ private HistoryMinutelyMapper historyMinutelyMapper;
- @Resource
- private SensorMapper sensorMapper;
+ @Resource
+ private DeviceMapper deviceMapper;
+
+ @Resource
+ private SensorMapper sensorMapper;
@Resource
private ProfessionService professionService;
-
+
@Resource
private OrganizationRelationMapper organizationRelationMapper;
-
+
@Resource
private MonitorPointMapper monitorPointMapper;
- @Override
- public Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters) throws Exception {
- ValidateUtil.notNull(parameters.get("areaCode"), "param.is.null");
- ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
- Map<String,Object> resultMap = new LinkedHashMap<String, Object>();
- accountService.setOrgIdsByAccount(parameters);
- LocalDateTime time = LocalDateTime.now();
- // ������������ -10������
- parameters.put("start", time.minusMinutes(10));
- // ������������ -5������
- parameters.put("end", time.minusMinutes(5));
- List<Sensor> Sensors = sensorMapper.getSensorsByCriteria(parameters);
- List<String> sensorKeys = new ArrayList<String>();
- for (Sensor sensor : Sensors) {
- sensorKeys.add(sensor.getSensorKey());
- }
- parameters.put("sensorKeys", sensorKeys);
- List<Map<String, Object>> list = historyMapper.getAreaAllDataByAccount(parameters);
- resultMap.putAll(list.get(0));
- return resultMap;
- }
+ @Override
+ public Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters) throws Exception {
+ ValidateUtil.notNull(parameters.get("areaCode"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
+ Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
+ accountService.setOrgIdsByAccount(parameters);
+ LocalDateTime time = LocalDateTime.now();
+ // ������������ -10������
+ parameters.put("start", time.minusMinutes(10));
+ // ������������ -5������
+ parameters.put("end", time.minusMinutes(5));
+ List<Sensor> Sensors = sensorMapper.getSensorsByCriteria(parameters);
+ List<String> sensorKeys = new ArrayList<String>();
+ for (Sensor sensor : Sensors) {
+ sensorKeys.add(sensor.getSensorKey());
+ }
+ parameters.put("sensorKeys", sensorKeys);
+ List<Map<String, Object>> list = historyMapper.getAreaAllDataByAccount(parameters);
+ resultMap.putAll(list.get(0));
+ return resultMap;
+ }
- @Override
- public Map<String, Object> getDeviceRankingBySensorAverage(Map<String, Object> parameters) {
- ValidateUtil.notNull(parameters.get("areaCode"), "param.is.null");
- ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
- Object macKey = parameters.get("macKey");
- ValidateUtil.notNull(macKey, "param.is.null");
+ @Override
+ public Map<String, Object> getDeviceRankingBySensorAverage(Map<String, Object> parameters) {
+ ValidateUtil.notNull(parameters.get("areaCode"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
+ Object macKey = parameters.get("macKey");
+ ValidateUtil.notNull(macKey, "param.is.null");
- Map<String, Object> result = new LinkedHashMap<String, Object>();
- accountService.setOrgIdsByAccount(parameters);
- LocalDateTime time = LocalDateTime.now();
- // ������������ -1������
- parameters.put("start", time.minusHours(1));
- parameters.put("end", time);
- List<String> sensorKeys = new ArrayList<String>();
- sensorKeys.add(macKey.toString());
- parameters.put("sensorKeys", sensorKeys);
- List<Map<String, Object>> list = historyMapper.getAreaAllDataByAccount(parameters);
+ Map<String, Object> result = new LinkedHashMap<String, Object>();
+ accountService.setOrgIdsByAccount(parameters);
+ LocalDateTime time = LocalDateTime.now();
+ // ������������ -1������
+ parameters.put("start", time.minusHours(1));
+ parameters.put("end", time);
+ List<String> sensorKeys = new ArrayList<String>();
+ sensorKeys.add(macKey.toString());
+ parameters.put("sensorKeys", sensorKeys);
+ List<Map<String, Object>> list = historyMapper.getAreaAllDataByAccount(parameters);
- for (Map<String, Object> map : list) {
- result.put((String) map.get("name"), map.get(macKey.toString()));
- }
- return result;
- }
- @Override
- public String queryValueByMacAndTime(String mac, Date time){
- return historyMapper.selectValueByMacAndTime(mac, time);
- }
+ for (Map<String, Object> map : list) {
+ result.put((String) map.get("name"), map.get(macKey.toString()));
+ }
+ return result;
+ }
- @Override
- public List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters) {
- ValidateUtil.notNull(parameters.get("regionCode"), "param.is.null");
- ValidateUtil.notNull(parameters.get("dimension"), "param.is.null");
- ValidateUtil.notNull(parameters.get("sensorKey"), "param.is.null");
- ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
+ @Override
+ public String queryValueByMacAndTime(String mac, Date time) {
+ return historyMapper.selectValueByMacAndTime(mac, time);
+ }
- String regionCode = parameters.get("regionCode").toString();
- parameters.put("provinceCode", regionCode.substring(0,2).concat("0000"));
- String regionType = "village";
- String nextLevel = "";
- if (regionCode.length() == 6) {
- if (regionCode.endsWith("0000")) {
- regionType = "province";
- nextLevel = "city";
- } else if (regionCode.endsWith("00")) {
- regionType = "city";
- nextLevel = "area";
- } else {
- regionType = "area";
- nextLevel = "town";
- }
- } else {
- if (regionCode.endsWith("000")) {
- regionType = "town";
- nextLevel = "village";
- }
- }
- parameters.put("regionType", regionType);
- parameters.put("nextLevel", nextLevel);
+ @Override
+ public List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters) {
+ ValidateUtil.notNull(parameters.get("regionCode"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("dimension"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("sensorKey"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
- LocalDate localDate = LocalDate.now();
- Object timeType = parameters.get("timeType");
- String table = "history";
- String column = "value";
- if ("month".equals(timeType)) {
- if (1 != localDate.getDayOfMonth()) {
- table = "history_daily";
- column = "json";
- }
- parameters.put("start", localDate.with(TemporalAdjusters.firstDayOfMonth()));
- } else if ("day".equals(timeType)) {
- parameters.put("start", localDate);
- } else if ("hour".equals(timeType)) {
- parameters.put("start", LocalDateTime.now().truncatedTo(ChronoUnit.HOURS));
- } else {
- parameters.put("start", LocalDateTime.now().minusMinutes(5));
- }
- parameters.put("table", table);
- parameters.put("column", column);
-
- String dimension = "";
- if ("discharge".equals(parameters.get("dimension"))) {
- dimension = "discharge";
- parameters.put("dimension","monitorPoint");
- }
-
- accountService.setOrgIdsByAccount(parameters);
-
- List<Map<String, Object>> result = historyMapper.getRegionRankingData(parameters);
- for (Map<String, Object> map : result) {
- if (ObjectUtils.isEmpty(map.get("avg"))) {
- map.put("avg", 0);
- }
- }
- if ("profession".equals(parameters.get("dimension"))) {
- List<Profession> professions = professionService.getProfessiontList(parameters);
- for (Map<String, Object> map : result) {
- for (Profession profession : professions) {
- if (map.get("name").equals(profession.getName())) {
- professions.remove(profession);
+ String regionCode = parameters.get("regionCode").toString();
+ parameters.put("provinceCode", regionCode.substring(0, 2).concat("0000"));
+ String regionType = "village";
+ String nextLevel = "";
+ if (regionCode.length() == 6) {
+ if (regionCode.endsWith("0000")) {
+ regionType = "province";
+ nextLevel = "city";
+ } else if (regionCode.endsWith("00")) {
+ regionType = "city";
+ nextLevel = "area";
+ } else {
+ regionType = "area";
+ nextLevel = "town";
+ }
+ } else {
+ if (regionCode.endsWith("000")) {
+ regionType = "town";
+ nextLevel = "village";
+ }
+ }
+ parameters.put("regionType", regionType);
+ parameters.put("nextLevel", nextLevel);
+
+ LocalDate localDate = LocalDate.now();
+ Object timeType = parameters.get("timeType");
+ String table = "history";
+ String column = "value";
+ if ("month".equals(timeType)) {
+ if (1 != localDate.getDayOfMonth()) {
+ table = "history_daily";
+ column = "json";
+ }
+ parameters.put("start", localDate.with(TemporalAdjusters.firstDayOfMonth()));
+ } else if ("day".equals(timeType)) {
+ parameters.put("start", localDate);
+ } else if ("hour".equals(timeType)) {
+ parameters.put("start", LocalDateTime.now().truncatedTo(ChronoUnit.HOURS));
+ } else {
+ parameters.put("start", LocalDateTime.now().minusMinutes(5));
+ }
+ parameters.put("table", table);
+ parameters.put("column", column);
+
+ String dimension = "";
+ if ("discharge".equals(parameters.get("dimension"))) {
+ dimension = "discharge";
+ parameters.put("dimension", "monitorPoint");
+ }
+
+ accountService.setOrgIdsByAccount(parameters);
+
+ List<Map<String, Object>> result = historyMapper.getRegionRankingData(parameters);
+ for (Map<String, Object> map : result) {
+ if (ObjectUtils.isEmpty(map.get("avg"))) {
+ map.put("avg", 0);
+ }
+ }
+ if ("profession".equals(parameters.get("dimension"))) {
+ List<Profession> professions = professionService.getProfessiontList(parameters);
+ for (Map<String, Object> map : result) {
+ for (Profession profession : professions) {
+ if (map.get("name").equals(profession.getName())) {
+ professions.remove(profession);
// if (ObjectUtils.isEmpty(map.get("avg"))) {
// map.put("avg", 0);
// }
- break;
- }
- }
- }
- for (Profession profession : professions) {
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("name", profession.getName());
- map.put("avg", 0);
- result.add(map);
- }
- } else if ("region".equals(parameters.get("dimension"))) {
- List<String> regions = historyMapper.selectNextLevelRegion(parameters);
- for (Map<String, Object> map : result) {
- if (regions.contains(map.get("name"))) {
- regions.remove(map.get("name"));
+ break;
+ }
+ }
+ }
+ for (Profession profession : professions) {
+ Map<String, Object> map = new HashMap<String, Object>();
+ map.put("name", profession.getName());
+ map.put("avg", 0);
+ result.add(map);
+ }
+ } else if ("region".equals(parameters.get("dimension"))) {
+ List<String> regions = historyMapper.selectNextLevelRegion(parameters);
+ for (Map<String, Object> map : result) {
+ if (regions.contains(map.get("name"))) {
+ regions.remove(map.get("name"));
// if (ObjectUtils.isEmpty(map.get("avg"))) {
// map.put("avg", 0);
// }
- }
-
- }
- for (String region : regions) {
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("name", region);
- map.put("avg", 0);
- result.add(map);
- }
- }
- if ("discharge".equals(dimension)) {
- parameters.put("year", LocalDate.now().getYear());
- List<Map<String, Object>> discharges = historyMapper.getDischargeByRegion(parameters);
- for (Map<String, Object> map : result) {
- for (Map<String, Object> discharge : discharges) {
- if (map.get("name").equals(discharge.get("name"))) {
- map.put("value", discharge.get("value"));
- discharges.remove(discharge);
- break;
- }
- }
- }
- Collections.sort(result, new Comparator<Map<String, Object>>() {
- @Override
- public int compare(Map<String, Object> o1, Map<String, Object> o2) {
- return Double.compare(((Double) o2.get("avg"))- Double.valueOf((String) o2.get("value")),
- ((Double) o1.get("avg")) - Double.valueOf((String) o1.get("value")));
- }
- });
- }
- return result;
- }
-
+ }
+
+ }
+ for (String region : regions) {
+ Map<String, Object> map = new HashMap<String, Object>();
+ map.put("name", region);
+ map.put("avg", 0);
+ result.add(map);
+ }
+ }
+ if ("discharge".equals(dimension)) {
+ parameters.put("year", LocalDate.now().getYear());
+ List<Map<String, Object>> discharges = historyMapper.getDischargeByRegion(parameters);
+ for (Map<String, Object> map : result) {
+ for (Map<String, Object> discharge : discharges) {
+ if (map.get("name").equals(discharge.get("name"))) {
+ map.put("value", discharge.get("value"));
+ discharges.remove(discharge);
+ break;
+ }
+ }
+ }
+ Collections.sort(result, new Comparator<Map<String, Object>>() {
+ @Override
+ public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+ return Double.compare(((Double) o2.get("avg")) - Double.valueOf((String) o2.get("value")),
+ ((Double) o1.get("avg")) - Double.valueOf((String) o1.get("value")));
+ }
+ });
+ }
+ return result;
+ }
+
@Override
- public List<Map<String, Object>> getSensorsDataByDevice(Map<String, Object> parameters) {
- ValidateUtil.notNull(parameters.get("deviceVersionId"), "param.is.null");
- ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
- ValidateUtil.notNull(parameters.get("deviceId"), "param.is.null");
- List<Map<String, Object>> sensors = sensorMapper.getSensorsByDeviceVersionId(parameters);
- parameters.put("size", 1);
- List<Map<String, Object>> values = historyMapper.getValueByMacAndSize(parameters);
- JSONObject map = null;
- if (!ObjectUtils.isEmpty(values)) {
- map = JSON.parseObject(values.get(0).get("value").toString());
- }
- Device device = deviceMapper.selectByPrimaryKey(Integer.valueOf((String) parameters.get("deviceId")));
- Map<String, Object> sensorUnits = getSensorUnitByDeviceMac(parameters);
- for (Map<String, Object> sensor : sensors) {
- Object sensorKey = sensor.get("sensor_key");
- sensor.put("name", sensor.get("description"));
- sensor.put("state", device.getState());
- if (!ObjectUtils.isEmpty(map)) {
- sensor.put("value", map.remove(sensor.get("sensor_key")));
- }
- if (sensorUnits.containsKey(sensorKey)) {
- Map<String, Object> sensorUnit = (Map<String, Object>) sensorUnits.get(sensorKey);
- sensor.put("unit", sensorUnit.get("name"));
- if (sensor.containsKey("value")) {
- Object value = sensor.get("value");
- String rules = sensorUnit.get("rules").toString();
- rules = rules.replace("d", "").replace("{0}", "value");
- Expression expression = AviatorEvaluator.compile(rules);
- Map<String, Object> env = new HashMap<String, Object>();
- env.put("value", Double.valueOf(value.toString()));
- value = expression.execute(env);
- sensor.put("value",String.format("%.2f", value));
- }
- }
- }
- return sensors;
- }
+ public List<Map<String, Object>> getSensorsDataByDevice(Map<String, Object> parameters) {
+ ValidateUtil.notNull(parameters.get("deviceVersionId"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("deviceId"), "param.is.null");
+ List<Map<String, Object>> sensors = sensorMapper.getSensorsByDeviceVersionId(parameters);
+ parameters.put("size", 1);
+ List<Map<String, Object>> values = historyMapper.getValueByMacAndSize(parameters);
+ JSONObject map = null;
+ if (!ObjectUtils.isEmpty(values)) {
+ map = JSON.parseObject(values.get(0).get("value").toString());
+ }
+ Device device = deviceMapper.selectByPrimaryKey(Integer.valueOf((String) parameters.get("deviceId")));
+ Map<String, Object> sensorUnits = getSensorUnitByDeviceMac(parameters);
+ for (Map<String, Object> sensor : sensors) {
+ Object sensorKey = sensor.get("sensor_key");
+ sensor.put("name", sensor.get("description"));
+ sensor.put("state", device.getState());
+ if (!ObjectUtils.isEmpty(map)) {
+ sensor.put("value", map.remove(sensor.get("sensor_key")));
+ }
+ if (sensorUnits.containsKey(sensorKey)) {
+ Map<String, Object> sensorUnit = (Map<String, Object>) sensorUnits.get(sensorKey);
+ sensor.put("unit", sensorUnit.get("name"));
+ if (sensor.containsKey("value")) {
+ Object value = sensor.get("value");
+ String rules = sensorUnit.get("rules").toString();
+ rules = rules.replace("d", "").replace("{0}", "value");
+ Expression expression = AviatorEvaluator.compile(rules);
+ Map<String, Object> env = new HashMap<String, Object>();
+ env.put("value", Double.valueOf(value.toString()));
+ value = expression.execute(env);
+ sensor.put("value", String.format("%.2f", value));
+ }
+ }
+ }
+ return sensors;
+ }
- @Override
- public List<Map<String, Object>> getSensorDataBySensorKey(Map<String, Object> parameters) {
- Object sensorKey = parameters.get("sensorKey");
- ValidateUtil.notNull(sensorKey, "param.is.null");
- ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
- ValidateUtil.notNull(parameters.get("size"), "param.is.null");
- parameters.put("size", Integer.valueOf(parameters.remove("size").toString()));
- List<Map<String, Object>> values = historyMapper.getValueByMacAndSize(parameters);
- Map<String, Object> sensorUnits = getSensorUnitByDeviceMac(parameters);
- for (Map<String, Object> value : values) {
- JSONObject json = JSON.parseObject(value.remove("value").toString());
- Object sensorKeyValue = json.get(sensorKey);
- if (sensorUnits.containsKey(sensorKey)) {
- Map<String, Object> sensorUnit = (Map<String, Object>) sensorUnits.get(sensorKey);
- String rules = sensorUnit.get("rules").toString();
- rules = rules.replace("d", "").replace("{0}", "value");
- Expression expression = AviatorEvaluator.compile(rules);
- Map<String, Object> env = new HashMap<String, Object>();
- env.put("value", Double.valueOf(sensorKeyValue.toString()));
- sensorKeyValue = expression.execute(env);
- sensorKeyValue = String.format("%.2f", sensorKeyValue);
- }
- value.put("value", sensorKeyValue);
- }
- return values;
- }
+ @Override
+ public List<Map<String, Object>> getSensorDataBySensorKey(Map<String, Object> parameters) {
+ Object sensorKey = parameters.get("sensorKey");
+ ValidateUtil.notNull(sensorKey, "param.is.null");
+ ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("size"), "param.is.null");
+ parameters.put("size", Integer.valueOf(parameters.remove("size").toString()));
+ List<Map<String, Object>> values = historyMapper.getValueByMacAndSize(parameters);
+ Map<String, Object> sensorUnits = getSensorUnitByDeviceMac(parameters);
+ for (Map<String, Object> value : values) {
+ JSONObject json = JSON.parseObject(value.remove("value").toString());
+ Object sensorKeyValue = json.get(sensorKey);
+ if (sensorUnits.containsKey(sensorKey)) {
+ Map<String, Object> sensorUnit = (Map<String, Object>) sensorUnits.get(sensorKey);
+ String rules = sensorUnit.get("rules").toString();
+ rules = rules.replace("d", "").replace("{0}", "value");
+ Expression expression = AviatorEvaluator.compile(rules);
+ Map<String, Object> env = new HashMap<String, Object>();
+ env.put("value", Double.valueOf(sensorKeyValue.toString()));
+ sensorKeyValue = expression.execute(env);
+ sensorKeyValue = String.format("%.2f", sensorKeyValue);
+ }
+ value.put("value", sensorKeyValue);
+ }
+ return values;
+ }
- @Override
- public Map<String, Object> getActualDataByRegion(Map<String, Object> parameters) {
- Object sensorKey = parameters.get("sensorKey");
- ValidateUtil.notNull(sensorKey, "param.is.null");
- ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
- ValidateUtil.notNull(parameters.get("interval"), "param.is.null");
- Integer interval = Integer.valueOf(parameters.get("interval").toString());
- LocalDateTime start, end;
- if (!parameters.containsKey("time")) {
- end = LocalDateTime.now();
- int second = end.getSecond() / interval * interval;
- end = end.truncatedTo(ChronoUnit.MINUTES).plusSeconds(second);
- start = end.minusSeconds(interval);
- } else {
- //start = LocalDateTime.ofEpochSecond(Long.valueOf(parameters.get("time").toString()) / 1000, 0, ZoneOffset.ofHours(8));
- start = LocalDateTime.ofInstant(Instant.ofEpochMilli(Long.valueOf(parameters.get("time").toString())),ZoneId.of("+8"));
- end = start.plusSeconds(interval);
- }
- parameters.put("start", start);
- parameters.put("end", end);
- parameters.put("sensorKeys", Arrays.asList(((String) sensorKey).split(",")));
- accountService.setOrgIdsByAccount(parameters);
- Map<String, Object> result = historyMapper.getActualDataByRegion(parameters);
- if (ObjectUtils.isEmpty(result)) {
- result = new HashMap<String, Object>();
- }
- result.put("time", end.toInstant(ZoneOffset.of("+8")).toEpochMilli());
- return result;
- }
+ @Override
+ public Map<String, Object> getActualDataByRegion(Map<String, Object> parameters) {
+ Object sensorKey = parameters.get("sensorKey");
+ ValidateUtil.notNull(sensorKey, "param.is.null");
+ ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("interval"), "param.is.null");
+ Integer interval = Integer.valueOf(parameters.get("interval").toString());
+ LocalDateTime start, end;
+ if (!parameters.containsKey("time")) {
+ end = LocalDateTime.now();
+ int second = end.getSecond() / interval * interval;
+ end = end.truncatedTo(ChronoUnit.MINUTES).plusSeconds(second);
+ start = end.minusSeconds(interval);
+ } else {
+ //start = LocalDateTime.ofEpochSecond(Long.valueOf(parameters.get("time").toString()) / 1000, 0, ZoneOffset.ofHours(8));
+ start = LocalDateTime.ofInstant(Instant.ofEpochMilli(Long.valueOf(parameters.get("time").toString())), ZoneId.of("+8"));
+ end = start.plusSeconds(interval);
+ }
+ parameters.put("start", start);
+ parameters.put("end", end);
+ parameters.put("sensorKeys", Arrays.asList(((String) sensorKey).split(",")));
+ accountService.setOrgIdsByAccount(parameters);
+ Map<String, Object> result = historyMapper.getActualDataByRegion(parameters);
+ if (ObjectUtils.isEmpty(result)) {
+ result = new HashMap<String, Object>();
+ }
+ result.put("time", end.toInstant(ZoneOffset.of("+8")).toEpochMilli());
+ return result;
+ }
- @Resource
- private SensorUnitMapper sensorUnitMapper;
- @Override
- public Map<String, Object> getSensorUnitByDeviceMac(Map<String, Object> parameters){
- Map<String, Object> resultMap = new HashMap<String, Object>();
- List<Map<String, Object>> list = sensorUnitMapper.getSensorUnitByDeviceMac(parameters);
- for (Map<String, Object> map : list) {
- resultMap.put(map.remove("sensor_key").toString(), map);
- }
- return resultMap;
-
- }
+ @Resource
+ private SensorUnitMapper sensorUnitMapper;
- @Override
- public Map<String, Object> gitHourlyAQIByMacAndTimeslot(Map<String, Object> parameters) {
- String mac = parameters.get("mac").toString();
- //������������
- LocalDate localDate = LocalDate.now();
- Calendar c = Calendar.getInstance();//������������������������������������
- int endHour = c.get(Calendar.HOUR_OF_DAY);
- String endTime = localDate+" "+endHour+":00:00";
-
- String startTime;
- if(endHour == 0) {
- LocalDate startDate = localDate.minusDays(1);
- startTime = startDate+" "+"23:00:00";
- }else {
- int startHour = endHour-1;
- startTime = localDate+" "+startHour+":00:00";
- }
- Map<String, Object> map = historyMapper.getAVGValueByMacAndTimeslot(mac, startTime, endTime);
- System.out.println(map);
- Map<String, Object> returnMap = new HashMap<>();
- if (map.isEmpty()) {
- returnMap.put("AQI", "N/V");
- } else {
- Map<String, Double> AQIMap = new HashMap<>();
- for (Map.Entry<String, Object> entry : map.entrySet()) {
- String key = entry.getKey();
- Double value = Double.parseDouble(entry.getValue().toString());
- AQIMap.put(key, value);
- }
- returnMap = AQICalculation.hourlyAQI(AQIMap);
- }
-
- return returnMap;
- }
+ @Override
+ public Map<String, Object> getSensorUnitByDeviceMac(Map<String, Object> parameters) {
+ Map<String, Object> resultMap = new HashMap<String, Object>();
+ List<Map<String, Object>> list = sensorUnitMapper.getSensorUnitByDeviceMac(parameters);
+ for (Map<String, Object> map : list) {
+ resultMap.put(map.remove("sensor_key").toString(), map);
+ }
+ return resultMap;
- @Override
- public List<Map<String, Object>> getMointorPointRankByOrganizationId(Map<String, Object> parameters) {
- //������������id
- String organizationId = parameters.get("organization_id").toString();
- //������������������������������������������������������id
- List<Object> organizationIdList = new ArrayList<>();
- organizationIdList.add(organizationId);
- //���������������������������������id
- List<Object> parentIdList = new ArrayList<>();
- parentIdList.add(organizationId);
-
- //������������
- for(int i=0;i<10;i++) {
- if(!parentIdList.isEmpty()) {
- //������������������������������
- List<Map<String, Object>> childIdList = organizationRelationMapper.getChildIdByParentId(parentIdList);
- //���������������id������
- parentIdList.clear();
- //������������id������������������
- for (Map<String, Object> map : childIdList) {
- organizationIdList.add(map.get("child_id"));
- parentIdList.add(map.get("child_id"));
- }
- }else {
- break;
- }
- }
-
- //������������id������������id
- List<Map<String, Object>> monitorPointIdListMap = monitorPointMapper.getIdByOrganizationId(organizationIdList);
- //���List<Map<String, Object>>���������List<Object>
- List<Object> monitorPointIdList = new ArrayList<>();
- for (Map<String, Object> map : monitorPointIdListMap) {
- monitorPointIdList.add(map.get("id"));
- }
-
- //������������id���������������������������
- //������������������������
- Calendar rightNow = Calendar.getInstance();
- //���������������������������
- Calendar beforeTime = Calendar.getInstance();
- beforeTime.add(Calendar.MINUTE, -5);// 5���������������������
- Date beforeD = beforeTime.getTime();
- Date end = rightNow.getTime();
- String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(end);
- String before5Time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(beforeD); // ������������������
-
- String sensor = parameters.get("sensor").toString();
- List<Map<String, Object>> result = historyMapper.getAVGSensorRankByMonitorPointIdList(sensor, monitorPointIdList, before5Time, endTime);
- return result;
- }
+ }
- @Override
- public Map<String, Object> gitHourlyAQIByMonitorPointIdAndTimeslot(Map<String, Object> parameters) {
- String monitor_point_id = parameters.get("monitor_point_id").toString();
- //������������
- LocalDate localDate = LocalDate.now();
- Calendar c = Calendar.getInstance();//������������������������������������
- int endHour = c.get(Calendar.HOUR_OF_DAY);
- String endTime = localDate+" "+endHour+":00:00";
-
- String startTime;
- if(endHour == 0) {
- LocalDate startDate = localDate.minusDays(1);
- startTime = startDate+" "+"23:00:00";
- }else {
- int startHour = endHour-1;
- startTime = localDate+" "+startHour+":00:00";
- }
- Map<String, Object> map = historyMapper.getMonitorPointAVGValueByMonitorPointIdAndTimeslot(monitor_point_id, startTime, endTime);
- System.out.println(map);
- Map<String, Object> returnMap = new HashMap<>();
- if (map.isEmpty()) {
- returnMap.put("AQI", "N/V");
- } else {
- Map<String, Double> AQIMap = new HashMap<>();
- for (Map.Entry<String, Object> entry : map.entrySet()) {
- String key = entry.getKey();
- Double value = Double.parseDouble(entry.getValue().toString());
- AQIMap.put(key, value);
- }
- returnMap = AQICalculation.hourlyAQI(AQIMap);
- }
-
- return returnMap;
- }
+ @Override
+ public Map<String, Object> gitHourlyAQIByMacAndTimeslot(Map<String, Object> parameters) {
+ String mac = parameters.get("mac").toString();
+ //������������
+ LocalDate localDate = LocalDate.now();
+ Calendar c = Calendar.getInstance();//������������������������������������
+ int endHour = c.get(Calendar.HOUR_OF_DAY);
+ String endTime = localDate + " " + endHour + ":00:00";
+
+ String startTime;
+ if (endHour == 0) {
+ LocalDate startDate = localDate.minusDays(1);
+ startTime = startDate + " " + "23:00:00";
+ } else {
+ int startHour = endHour - 1;
+ startTime = localDate + " " + startHour + ":00:00";
+ }
+ Map<String, Object> map = historyMapper.getAVGValueByMacAndTimeslot(mac, startTime, endTime);
+ Map<String, Object> returnMap = new HashMap<>();
+ if (map.isEmpty()) {
+ returnMap.put("AQI", "N/V");
+ } else {
+ Map<String, Double> AQIMap = new HashMap<>();
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String key = entry.getKey();
+ Double value = Double.parseDouble(entry.getValue().toString());
+ AQIMap.put(key, value);
+ }
+ returnMap = AQICalculation.hourlyAQI(AQIMap);
+ }
+
+ return returnMap;
+ }
+
+ @Override
+ public List<Map<String, Object>> getMointorPointRankByOrganizationId(Map<String, Object> parameters) {
+ //������������id
+ String organizationId = parameters.get("organization_id").toString();
+ //������������������������������������������������������id
+ List<Object> organizationIdList = new ArrayList<>();
+ organizationIdList.add(organizationId);
+ //���������������������������������id
+ List<Object> parentIdList = new ArrayList<>();
+ parentIdList.add(organizationId);
+
+ //������������
+ for (int i = 0; i < 10; i++) {
+ if (!parentIdList.isEmpty()) {
+ //������������������������������
+ List<Map<String, Object>> childIdList = organizationRelationMapper.getChildIdByParentId(parentIdList);
+ //���������������id������
+ parentIdList.clear();
+ //������������id������������������
+ for (Map<String, Object> map : childIdList) {
+ organizationIdList.add(map.get("child_id"));
+ parentIdList.add(map.get("child_id"));
+ }
+ } else {
+ break;
+ }
+ }
+
+ //������������id������������id
+ List<Map<String, Object>> monitorPointIdListMap = monitorPointMapper.getIdByOrganizationId(organizationIdList);
+ //���List<Map<String, Object>>���������List<Object>
+ List<Object> monitorPointIdList = new ArrayList<>();
+ for (Map<String, Object> map : monitorPointIdListMap) {
+ monitorPointIdList.add(map.get("id"));
+ }
+
+ //������������id���������������������������
+ //������������������������
+ Calendar rightNow = Calendar.getInstance();
+ //���������������������������
+ Calendar beforeTime = Calendar.getInstance();
+ beforeTime.add(Calendar.MINUTE, -5);// 5���������������������
+ Date beforeD = beforeTime.getTime();
+ Date end = rightNow.getTime();
+ String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(end);
+ String before5Time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(beforeD); // ������������������
+
+ String sensor = parameters.get("sensor").toString();
+ List<Map<String, Object>> result = historyMapper.getAVGSensorRankByMonitorPointIdList(sensor, monitorPointIdList, before5Time, endTime);
+ return result;
+ }
+
+ @Override
+ public Map<String, Object> gitHourlyAQIByMonitorPointIdAndTimeslot(Map<String, Object> parameters) {
+ String monitor_point_id = parameters.get("monitor_point_id").toString();
+ //������������
+ LocalDate localDate = LocalDate.now();
+ Calendar c = Calendar.getInstance();//������������������������������������
+ int endHour = c.get(Calendar.HOUR_OF_DAY);
+ String endTime = localDate + " " + endHour + ":00:00";
+
+ String startTime;
+ if (endHour == 0) {
+ LocalDate startDate = localDate.minusDays(1);
+ startTime = startDate + " " + "23:00:00";
+ } else {
+ int startHour = endHour - 1;
+ startTime = localDate + " " + startHour + ":00:00";
+ }
+ Map<String, Object> map = historyMapper.getMonitorPointAVGValueByMonitorPointIdAndTimeslot(monitor_point_id, startTime, endTime);
+ Map<String, Object> returnMap = new HashMap<>();
+ if (map.isEmpty()) {
+ returnMap.put("AQI", "N/V");
+ } else {
+ Map<String, Double> AQIMap = new HashMap<>();
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String key = entry.getKey();
+ Double value = Double.parseDouble(entry.getValue().toString());
+ AQIMap.put(key, value);
+ }
+ returnMap = AQICalculation.hourlyAQI(AQIMap);
+ }
+
+ return returnMap;
+ }
+
+ @Override
+ public List<List<Map<String, Object>>> getCarSensorData(Map<String, Object> parameters) throws Exception {
+ String startTime = parameters.get("startTime").toString();
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ LocalDateTime startTimeLocalDateTime = LocalDateTime.parse(startTime, dateTimeFormatter);
+ int year = startTimeLocalDateTime.getYear();
+ int month = startTimeLocalDateTime.getMonthValue();
+ String monthStr = month < 10 ? ("0" + month) : month + "";
+ String yearAndMonth = year + monthStr;
+ List<Sensor> sensors = sensorMapper.getSensorsByMac(parameters);
+ List<String> sensorKeys = new ArrayList<>();
+ for (Sensor sensor : sensors) {
+ sensorKeys.add(sensor.getSensorKey());
+ }
+ parameters.put("sensorKeys", sensorKeys);
+ List<Map<String, Object>> listMap = null;
+ listMap = historyMapper.listGetSensorData(parameters);
+ if (CollectionUtils.isEmpty(listMap)) {
+ listMap = historyMapper.getCarSensorData(parameters);
+ if (CollectionUtils.isEmpty(listMap)) {
+ if (year <= 2019) {
+ listMap = historyMinutelyMapper.getSensorData(parameters);
+ } else {
+ parameters.put("yearAndMonth", yearAndMonth);
+ listMap = historyMinutelyMapper.getSensorData2020(parameters);
+ }
+ }
+ }
+ List<List<Map<String, Object>>> listMaps = new ArrayList<>();
+ List<Map<String, Object>> listMapAvg = new ArrayList<>();
+ List<Map<String, Object>> listMapMin = new ArrayList<>();
+ List<Map<String, Object>> listMapMax = new ArrayList<>();
+ if (CollectionUtils.isNotEmpty(listMap)) {
+ for (Map<String, Object> map : listMap) {
+ Map<String, Object> mapAvg = new LinkedHashMap<>();
+ Map<String, Object> mapMin = new LinkedHashMap<>();
+ Map<String, Object> mapMax = new LinkedHashMap<>();
+ mapAvg.put("time", map.get("time"));
+ mapMin.put("time", map.get("time"));
+ mapMax.put("time", map.get("time"));
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ for (Sensor sensor : sensors) {
+ if (sensor.getSensorKey().equals(entry.getKey())) {
+ mapAvg.put(entry.getKey(), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString() + sensor.getUnit());
+ } else if (("min" + sensor.getSensorKey()).equals(entry.getKey())) {
+ mapMin.put(entry.getKey().substring(3), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString());
+ } else if (("max" + sensor.getSensorKey()).equals(entry.getKey())) {
+ mapMax.put(entry.getKey().substring(3), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString());
+ }
+ }
+ }
+ if ("0��".equals(mapAvg.get("e76")) || "0".equals(mapMin.get("e76")) || "0".equals(mapMax.get("e76")) || "0��".equals(mapAvg.get("e77")) || "0".equals(mapMin.get("e77")) || "0".equals(mapMax.get("e77"))) {
+ continue;
+ }
+ listMapAvg.add(mapAvg);
+ listMapMin.add(mapMin);
+ listMapMax.add(mapMax);
+ }
+ listMaps.add(listMapAvg);
+ listMaps.add(listMapMin);
+ listMaps.add(listMapMax);
+ }
+ return listMaps;
+ }
}
--
Gitblit v1.8.0