From f1c8a918c9e5ff4c91748269ae837d8f17c28511 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 15 Aug 2019 17:20:30 +0800
Subject: [PATCH] 添加无人机实时查询最大值和最小值的Mapper接口

---
 src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java |   78 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index abddd48..6b5800d 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -3,9 +3,14 @@
 import static com.moral.common.bean.Constants.NULL_VALUE;
 import static org.springframework.util.ObjectUtils.isEmpty;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,6 +35,7 @@
 
 import javax.annotation.Resource;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -40,6 +46,7 @@
 import com.moral.common.util.ParameterUtils;
 import com.moral.common.util.ReportTimeFormat;
 import com.moral.common.util.ResourceUtil;
+import com.moral.common.util.StringUtils;
 import com.moral.common.util.ValidateUtil;
 import com.moral.entity.Sensor;
 import com.moral.entity.charts.DataCondition;
@@ -47,9 +54,13 @@
 import com.moral.entity.charts.TimePeriod;
 import com.moral.mapper.AlarmDailyMapper;
 import com.moral.mapper.DeviceMapper;
+import com.moral.mapper.HistoryMapper;
 import com.moral.mapper.HistoryMinutelyMapper;
 import com.moral.mapper.SensorMapper;
 import com.moral.service.HistoryMinutelyService;
+import com.moral.service.SensorService;
+
+import lombok.val;
 
 @Service
 @SuppressWarnings({"unchecked", "unused", "rawtypes"})
@@ -57,6 +68,9 @@
 
     @Resource
     private HistoryMinutelyMapper historyMinutelyMapper;
+
+    @Resource
+    private HistoryMapper historyMapper;
 
     @Resource
     private DeviceMapper deviceMapper;
@@ -73,6 +87,28 @@
         LocalDate localDate = LocalDate.now();
         // ������00:00:00
         parameters.put("start", localDate.minusDays(1));
+
+        // ������00:00:00
+        parameters.put("end", localDate);
+        parameters.put("sensorKeys", Arrays.asList("e1", "e2", "e10", "e11", "e15", "e16"));
+        Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);
+        return getAQIByDataMap(average);
+    }
+
+    @Override
+    public Map<String, Object> getHourAQIByDevice(Map<String, Object> parameters) {
+        //ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
+        LocalDate localDate = LocalDate.now();
+        System.out.println("localDate:" + localDate);
+        // ������00:00:00
+        //parameters.put("start", localDate.minusDays(1));
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.set(Calendar.HOUR, calendar.get(Calendar.HOUR) - 1);
+        System.out.println("++++++" + calendar);
+        int hour = calendar.get(Calendar.HOUR) - 1;
+        System.out.println("������������������" + hour);
 
         // ������00:00:00
         parameters.put("end", localDate);
@@ -509,7 +545,45 @@
      */
     @Override
     public List<Map<String, Object>> getSensorData(Map<String, Object> parameters) {
-        parameters.put("sensorKeys",Arrays.asList("e1", "e2", "e3", "e4", "e6", "e7", "e9", "e10", "e11", "e15", "e16", "e17", "e27", "e28", "e76", "e77", "e78", "e79", "e80", "e81"));
-        return historyMinutelyMapper.getSensorData(parameters);
+        String startTime=parameters.get("startTime").toString();
+        Boolean flag=null;
+        try {
+            flag = DateUtils.isSameDay(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime), new Date());
+        }catch (ParseException e) {
+            e.printStackTrace();
+        }
+        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;
+        if(flag){
+            listMap = historyMapper.getSensorDataToday(parameters);
+        }else{
+            listMap = historyMinutelyMapper.getSensorData(parameters);
+        }
+        List<Map<String, Object>> listMapNew = new ArrayList<>();
+        Map<String, Object> new_map = new LinkedHashMap<>();
+        if (CollectionUtils.isNotEmpty(listMap)) {
+            for (Map<String, Object> map : listMap) {
+                new_map.put("������", map.get("time"));
+                for (String key : map.keySet()) {
+                    for (Sensor sensor : sensors) {
+                        if (sensor.getSensorKey().equals(key)) {
+                            if("e79".equals(key)||"e80".equals(key)||"e81".equals(key)){
+                                new_map.put(sensor.getDescription(), StringUtils.scientificCountingConversion(map.get(key).toString())+sensor.getUnit());
+                            }else{
+                                new_map.put(sensor.getDescription(), map.get(key)+sensor.getUnit());
+                            }
+                        }
+                    }
+                }
+                listMapNew.add(new_map);
+                new_map = new LinkedHashMap<>();
+            }
+        }
+        return listMapNew;
     }
 }

--
Gitblit v1.8.0