From 8beab91730f3e3cd6b53e4d498f763ff9dc65ef5 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:16:55 +0800
Subject: [PATCH] 修改污染溯源接口,从history表中获取改为从history天表获取

---
 src/main/java/com/moral/controller/ScreenController.java | 1292 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 1,207 insertions(+), 85 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 269c6a1..3fa1e6e 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1,11 +1,11 @@
 package com.moral.controller;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
+import java.lang.reflect.Array;
+import java.net.URLEncoder;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -15,9 +15,45 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+
+import com.alibaba.fastjson.JSONObject;
+import com.googlecode.aviator.AviatorEvaluator;
+import com.googlecode.aviator.Expression;
+import com.moral.common.bean.Constants;
+import com.moral.common.bean.JsonData;
+import com.moral.common.bean.PageResult;
+import com.moral.common.bean.ResultBean;
+import com.moral.common.util.BeanUtils;
+import com.moral.common.util.ParameterUtils;
+import com.moral.common.util.ValidateUtil;
+import com.moral.common.util.WebUtils;
+import com.moral.common.xml.Version;
+import com.moral.entity.*;
+import com.moral.entity.alarm.AlarmConfig;
+import com.moral.entity.alarm.AlarmConfigValue;
+import com.moral.entity.alarm.AlarmSensorLevel;
+import com.moral.entity.charts.DataSortCondition;
+import com.moral.entity.layout.RealTimeDeviceLayout;
+import com.moral.service.*;
+import com.moral.util.*;
+
+import com.rabbitmq.client.*;
+import com.rabbitmq.client.Channel;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
+import jdk.nashorn.internal.runtime.regexp.joni.Regex;
+import net.sf.json.JSONString;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.net.ftp.FTPClient;
+import org.apache.ibatis.annotations.Param;
 import org.apache.log4j.Logger;
 import org.dom4j.Document;
 import org.dom4j.Element;
@@ -39,64 +75,9 @@
 import org.springframework.web.servlet.ModelAndView;
 import org.xml.sax.InputSource;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.googlecode.aviator.AviatorEvaluator;
-import com.googlecode.aviator.Expression;
-import com.moral.common.bean.Constants;
-import com.moral.common.bean.JsonData;
-import com.moral.common.bean.PageResult;
-import com.moral.common.bean.ResultBean;
-import com.moral.common.util.BeanUtils;
-import com.moral.common.util.ParameterUtils;
-import com.moral.common.util.ValidateUtil;
-import com.moral.common.util.WebUtils;
-import com.moral.common.xml.Version;
-import com.moral.entity.Account;
-import com.moral.entity.AreaNames;
-import com.moral.entity.Device;
-import com.moral.entity.DeviceVersion;
-import com.moral.entity.MapBounds;
-import com.moral.entity.MonitorPoint;
-import com.moral.entity.Organization;
-import com.moral.entity.Point;
-import com.moral.entity.Region;
-import com.moral.entity.alarm.AlarmConfig;
-import com.moral.entity.alarm.AlarmConfigValue;
-import com.moral.entity.alarm.AlarmSensorLevel;
-import com.moral.entity.charts.DataSortCondition;
-import com.moral.entity.layout.RealTimeDeviceLayout;
-import com.moral.service.AccountService;
-import com.moral.service.AlarmConfigService;
-import com.moral.service.AlarmDailyService;
-import com.moral.service.AreaService;
-import com.moral.service.DeviceService;
-import com.moral.service.DeviceVersionService;
-import com.moral.service.DictionaryDataService;
-import com.moral.service.HangzhouAqiService;
-import com.moral.service.HistoryDailyService;
-import com.moral.service.HistoryHourlyService;
-import com.moral.service.HistoryMinutelyService;
-import com.moral.service.HistoryService;
-import com.moral.service.MachineActivateService;
-import com.moral.service.MonitorPointService;
-import com.moral.service.OrganizationLayoutService;
-import com.moral.service.OrganizationService;
-import com.moral.service.QualityDailyService;
-import com.moral.service.SensorService;
-import com.moral.service.SensorUnitService;
-import com.moral.service.WeatherService;
-import com.moral.util.AQICalculation;
-import com.moral.util.TempAllocationUtils;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-
 import static com.moral.common.util.ResourceUtil.getValue;
 import static com.moral.common.util.WebUtils.getParametersStartingWith;
+import static java.util.Calendar.*;
 
 /**
  * The Class ScreenController.������������
@@ -121,6 +102,9 @@
     MonitorPointService monitorPointService;
     @Resource
     DeviceVersionService deviceVersionService;
+
+  /*  @Resource
+    HistorySpecialService historySpecialService;*/
 
     /**
      * The screen service.
@@ -180,6 +164,15 @@
 
     @Resource
     private QualityDailyService qualityDailyService;
+
+    @Resource
+    private DeviceRoadService deviceRoadService;
+
+    @Resource
+    private ScreenVersionService screenVersionService;
+
+    @Resource
+    private DeviceAdjustValueTimingService deviceAdjustValueTimingService;
 
     /**
      * Screen login. ������������
@@ -594,6 +587,12 @@
         return sensorsMapList;
     }
 
+    @GetMapping("/getSensorsAllMap")
+    public List<Map<String, String>> getSensorsAllMap(String mac) {
+        List<Map<String, String>> sensorsMapList = sensorService.getSensorsAllMap();
+        return sensorsMapList;
+    }
+
     @RequestMapping(value = "/get-monitorpoints", method = RequestMethod.GET)
     @ResponseBody
     public ResultBean getMonitorpointList(@RequestParam("orgId") String orgId, MapBounds mapBounds,
@@ -612,6 +611,15 @@
 
     @RequestMapping(value = "/get-devices", method = RequestMethod.GET)
     @ResponseBody
+    @ApiOperation(value = "������������", notes = "������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "orgId", defaultValue = "5", value = "������Id", required = true, paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "regionCode", defaultValue = "320583", value = "������������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "Fe", defaultValue = "31.485018", value = "���������������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "Ge", defaultValue = "121.378395", value = "���������������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "Ke", defaultValue = "31.296614", value = "���������������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "Le", defaultValue = "120.59651", value = "���������������", required = true, paramType = "query", dataType = "String")
+    })
     public ResultBean getDevices(@RequestParam("orgId") Integer orgId, MapBounds mapBounds,
                                  @RequestParam("regionCode") String regionCode) {
         ResultBean<List<Device>> resultBean = new ResultBean();
@@ -681,25 +689,73 @@
         return new ResultBean<List<MonitorPoint>>(monitorPoints);
     }
 
+
+    /*
+     * ���������monitorPoint=368&mac=p5dnd7a0392018&sensorKey=e92&time=2020-08-11
+     * ���������������������������
+     * */
     @GetMapping("report_avg_datas")
     public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request)
             throws Exception {
         Map<String, Object> parameters = getParametersStartingWith(request, null);
+        //������������������������������������������������
         ParameterUtils.getTimeType4Time(parameters);
-        parameters.put("monitorPointId", parameters.remove("monitorPoint"));
-        Object sensorKey = parameters.remove("sensorKey");
-        parameters.put("sensors", Arrays.asList(sensorKey));
-        // monitorPointService.isCompensateCalculation(parameters);
-        List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+        String time1 = (String) parameters.get("time");
+        time1 = time1.replaceAll(" ", "");
+        parameters.put("time",time1);
 
-        for (Map<String, Object> map : list) {
-            String time = map.get("time").toString();
-            time = time.substring(time.length() - 2);
-            map.put("time", Integer.valueOf(time));
-            map.put("value", map.remove(sensorKey));
+        String mac1 = (String) parameters.get("mac");
+        List<Map<String, Object>> list = null;
+        if (mac1 != null && mac1.equals("p5dnd7a0392018") && time1.substring(0, 4).equals("2019")) {
+            list = null;
+        } else {
+            parameters.put("monitorPointId", parameters.remove("monitorPoint"));
+            Object sensorKey = parameters.remove("sensorKey");
+            parameters.put("sensors", Arrays.asList(sensorKey));
+            // monitorPointService.isCompensateCalculation(parameters);
+            list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+
+
+            /* 0���������������������11������������0���������������������1-24������������������������0������������������������������������24������������
+                ������������������24���������������23-24���������24������������������������0���������������
+             */
+            /*������������start-------------------------------------------------------------------------*/
+            list.remove(0);
+            if (list.size() == 23) {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+                //���������������������yyyy-MM-dd HH:mm:ss
+                time1 = time1 + " 00:00:00";
+                Date date = sdf.parse(time1);
+                date = DateUtil.rollDay(date, 1);
+                //������������������������
+                String time2 = sdf2.format(date);
+                parameters.put("time", time2);
+                /*���������������0������������������24���������������������������*/
+                List<Map<String, Object>> nextDayList = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+                if(!ObjectUtils.isEmpty(nextDayList)){
+                    time1=time1.replaceAll(" 00:00:00"," 24");
+                    Map<String, Object> datas = nextDayList.get(0);
+                    datas.put("time",time1);
+                    list.add(datas);
+                }
+            }
+            /*������������end-------------------------------------------------------------------------*/
+
+
+            for (Map<String, Object> map : list) {
+                String time = map.get("time").toString();
+                time = time.substring(time.length() - 2);
+                map.put("time", Integer.valueOf(time));
+             /*   if (parameters.get("type").equals("day")) {
+                    map.put("time", Integer.valueOf(time) + 1);
+                }*/
+                map.put("value", map.remove(sensorKey));
+            }
         }
         return new ResultBean<List<Map<String, Object>>>(list);
     }
+
 
     @GetMapping("report_alarm_datas")
     public ResultBean<List<Map<String, Object>>> getAlarmData(HttpServletRequest request) throws Exception {
@@ -847,7 +903,6 @@
 
         List<Map<String, Object>> monitorList = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
         List<Map<String, Object>> areaList = hangzhouAqiService.getAreaAvgDataByAreaCode(parameters);
-
         if (areaList.isEmpty() && monitorList.isEmpty()) {
             return new ResultBean<List<Map<String, Object>>>(resultList);
         } else if (areaList.isEmpty()) {
@@ -921,12 +976,12 @@
             }
         }
 
-        for (int i = 0; i <resultList.size() ; i++) {
+        for (int i = 0; i < resultList.size(); i++) {
             if (resultList.get(i) == null) {
                 Map<String, Object> hashMap = new HashMap<>();
-                if(type.equals("day")){
+                if (type.equals("day")) {
                     hashMap.put("time", i);
-                }else {
+                } else {
                     hashMap.put("time", i + 1);
                 }
                 hashMap.put(s, "");
@@ -953,15 +1008,15 @@
                 ArrayList<String> values = new ArrayList<>();
                 values.add(map.remove(s).toString());
                 values.add("");
-                map.put("values",values);
+                map.put("values", values);
             }
         }
 
         Iterator<Map<String, Object>> it = resultList.iterator();
-        while(it.hasNext()){
+        while (it.hasNext()) {
             Map<String, Object> next = it.next();
-            ArrayList<String> values = (ArrayList<String>)next.get("values");
-            if(values.get(0).equals("")&&values.get(1).equals("")){
+            ArrayList<String> values = (ArrayList<String>) next.get("values");
+            if (values.get(0).equals("") && values.get(1).equals("")) {
                 it.remove();
             }
         }
@@ -1044,7 +1099,41 @@
     public ResultBean<List<MonitorPoint>> getMonitorPointsAndDevicesByRegion(HttpServletRequest request)
             throws Exception {
         Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        String regionCode = parameters.get("regionCode").toString();
         List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
+
+        //������������������������������
+        if (regionCode.startsWith("1309")) {
+            List<Integer> orgIds = new ArrayList<>();
+            Collections.addAll(orgIds, 60, 65, 159, 165, 166);
+            Iterator<MonitorPoint> iter = monitorPoints.iterator();
+            while (iter.hasNext()) {
+                MonitorPoint next = iter.next();
+                Integer mpId = next.getId();
+                Integer orgId = next.getOrganizationId();
+                if (!orgIds.contains(orgId)) {
+                    iter.remove();
+                } else {
+                    if (orgId == 60) {
+                        if (mpId != 56) {
+                            iter.remove();
+                        }
+                    } else if (orgId == 65) {
+                        if (mpId != 83 && mpId != 84) {
+                            iter.remove();
+                        }
+                    }
+                }
+            }
+        }
+
+        //������������monitorPoint������������������device.getName()������������
+        for (MonitorPoint monitorPoint : monitorPoints) {
+            List<Device> deviceList = monitorPoint.getDevices();
+            deviceList.sort((Device o1, Device o2) -> {
+                return o1.getName().compareTo(o2.getName());
+            });
+        }
         return new ResultBean<List<MonitorPoint>>(monitorPoints);
     }
 
@@ -1175,9 +1264,7 @@
 	public ResultBean<Map<String, Object>> getSensor(HttpServletRequest request) throws Exception {
 		Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
 		String mac = (String) parameters.get("mac");
-		//System.out.println("ScreenController-----getSensor-----mac:"+mac);
 		Map<String, Object> map = sensorUnitService.getSensorByMac(mac);
-		System.out.println("ScreenController-----getSensor-----map:"+map);
 		return new ResultBean<Map<String, Object>>(map);
 	}*/
 
@@ -1245,7 +1332,6 @@
     })
     public ResultBean<List<Map<String, Object>>> AIForecast(HttpServletRequest request) throws Exception {
         Map<String, Object> parameters = getParametersStartingWith(request, null);
-        //System.out.println(parameters);
         String monitorPoint = (String) parameters.get("monitorPoint");
         String intoTime = parameters.get("time").toString();
         Date date = new SimpleDateFormat("yy-MM-dd").parse(intoTime);
@@ -1401,12 +1487,13 @@
     public ModelAndView pollutionSource(ModelAndView model, HttpServletRequest request) throws Exception {
         Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
         String timeStr = parameters.get("time").toString();
-        String YearAndDay = timeStr.substring(0, timeStr.lastIndexOf("-"));
+        String yearAndDay = timeStr.substring(0, timeStr.lastIndexOf("-"));
         String Hour = timeStr.substring(timeStr.lastIndexOf("-") + 1);
-        String time = YearAndDay + " " + Hour + ":00:00";
+        String time = yearAndDay + " " + Hour + ":00:00";
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter);
         int month = timeLocalDateTime.getMonth().getValue();
+        parameters.put("yearAndDay",yearAndDay);
         Point dirPoint = historyHourlyService.getDirPoint(parameters);
         Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceDataByHour(parameters);
         if (MapUtils.isEmpty(getPollutionSourceData)) {
@@ -1490,13 +1577,15 @@
         String startHour = st.substring(st.lastIndexOf("-") + 1);
         String startTime = startYearAndDay + " " + startHour + ":00:00";
         String et = parameters.get("endTime").toString();
+        String endYearAndDay = et.substring(0, st.lastIndexOf("-"));
         String endHour = et.substring(et.lastIndexOf("-") + 1);
-        int endHourValue = Integer.valueOf(endHour);
+        String endTime = endYearAndDay + " " + endHour + ":00:00";
+       /* int endHourValue = Integer.valueOf(endHour);
         int startHourValue = Integer.valueOf(startHour);
         if (endHourValue <= startHourValue) {
             endHourValue = startHourValue + 1;
         }
-        String endTime = startYearAndDay + " " + endHourValue + ":00:00";
+        String endTime = startYearAndDay + " " + endHourValue + ":00:00";*/
         parameters.put("startTime", startTime);
         parameters.put("endTime", endTime);
         String mac = parameters.get("mac").toString();
@@ -1511,6 +1600,7 @@
             params.put("sensorInfo", sensorList);
             params.put("sensorsMap", sensorsMap);
             String paramsJson = params.toJSONString();
+            //System.out.println(paramsJson);
             model.addObject("carTrajectoryParams", paramsJson);
             model.setViewName("cartrajectory");
             return model;
@@ -1598,4 +1688,1036 @@
         }
         return new ResultBean<List<Map<String, Object>>>(list);
     }
+
+    @RequestMapping(value = "/newMap-page", method = RequestMethod.GET)
+    public ModelAndView newMap(ModelAndView model, @RequestParam("areaCode") long code,
+                               @RequestParam("accountId") int accountId) {
+
+        Account account = accountService.getAccountById(accountId);
+        List<MonitorPoint> monitorPointList = monitorPointService.getMonitorPointListByAccountId(accountId);
+        String regionName = areaService.queryFullNameByCode(code);
+
+        if (account != null && regionName != null) {
+            Object sensors = sensorService.queryAll();
+            JSONObject params = new JSONObject();
+            params.put("regionCode", code);
+            params.put("regionName", regionName);
+            params.put("accountId", accountId);
+            params.put("orgId", account.getOrganizationId());
+            params.put("sensors", sensors);
+            String paramsJson = params.toJSONString();
+            model.addObject("mapParams", paramsJson);
+            model.setViewName("newmap");
+            return model;
+        } else {
+            StringBuilder msg = new StringBuilder();
+            msg.append(" param[0] areaCode:");
+            msg.append(code);
+            msg.append(" param[0] accountId:");
+            msg.append(accountId);
+            log.warn(msg);
+            model.setViewName("403");
+            return model;
+        }
+    }
+
+    @GetMapping("/uavDroppoint")
+    @ApiOperation(value = "���������������������", notes = "���������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392068���", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "startTime", value = "������������(���������2019-07-17-17)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17-18)", required = true, paramType = "query", dataType = "String")
+    })
+    public ModelAndView uavDroppoint(ModelAndView model, HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        String st = parameters.get("startTime").toString();
+        String startYearAndDay = st.substring(0, st.lastIndexOf("-"));
+        String startHour = st.substring(st.lastIndexOf("-") + 1);
+        String startTime = startYearAndDay + " " + startHour + ":00:00";
+        String et = parameters.get("endTime").toString();
+        String endHour = et.substring(et.lastIndexOf("-") + 1);
+        int endHourValue = Integer.valueOf(endHour);
+        int startHourValue = Integer.valueOf(startHour);
+        if (endHourValue <= startHourValue) {
+            endHourValue = startHourValue + 1;
+        }
+        String endTime = startYearAndDay + " " + endHourValue + ":00:00";
+        parameters.put("startTime", startTime);
+        parameters.put("endTime", endTime);
+        String mac = parameters.get("mac").toString();
+        if (mac != null && mac.length() != 0) {
+            List<Map<String, Object>> sensorData = historyService.getUavSensorData(parameters);
+            Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);
+            JSONObject params = new JSONObject();
+            params.put("sensorInfo", sensorData);
+            params.put("sensorsMap", sensorsMap);
+            params.put("sensorKey", parameters.get("sensorKey"));
+            params.put("unit", parameters.get("unit"));
+            params.put("description", parameters.get("description"));
+            String paramsJson = params.toJSONString();
+            model.addObject("uavDroppointParams", paramsJson);
+            model.setViewName("uavdroppoint");
+            return model;
+        } else {
+            StringBuilder msg = new StringBuilder();
+            msg.append(" param[0] mac:");
+            msg.append(mac);
+            log.warn(msg);
+            model.setViewName("403");
+            return model;
+        }
+    }
+
+    @GetMapping("/uavChannel")
+    @ApiOperation(value = "������������������������������", notes = "������������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392068���", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "startTime", value = "������������(���������2019-07-17-17)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17-18)", required = true, paramType = "query", dataType = "String")
+    })
+    public ModelAndView uavChannel(ModelAndView model, HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        String st = parameters.get("startTime").toString();
+        String startYearAndDay = st.substring(0, st.lastIndexOf("-"));
+        String startHour = st.substring(st.lastIndexOf("-") + 1);
+        String startTime = startYearAndDay + " " + startHour + ":00:00";
+        String et = parameters.get("endTime").toString();
+        String endHour = et.substring(et.lastIndexOf("-") + 1);
+        int endHourValue = Integer.valueOf(endHour);
+        int startHourValue = Integer.valueOf(startHour);
+        if (endHourValue <= startHourValue) {
+            endHourValue = startHourValue + 1;
+        }
+        String endTime = startYearAndDay + " " + endHourValue + ":00:00";
+        parameters.put("startTime", startTime);
+        parameters.put("endTime", endTime);
+        String mac = parameters.get("mac").toString();
+        if (mac != null && mac.length() != 0) {
+            List<Map<String, Object>> sensorData = historyService.getUavSensorData(parameters);
+            Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);
+            JSONObject params = new JSONObject();
+            params.put("sensorInfo", sensorData);
+            params.put("sensorsMap", sensorsMap);
+            params.put("sensorKey", parameters.get("sensorKey"));
+            params.put("unit", parameters.get("unit"));
+            params.put("description", parameters.get("description"));
+            String paramsJson = params.toJSONString();
+            model.addObject("uavChannelParams", paramsJson);
+            model.setViewName("uavchannelnew");
+            return model;
+        } else {
+            StringBuilder msg = new StringBuilder();
+            msg.append(" param[0] mac:");
+            msg.append(mac);
+            log.warn(msg);
+            model.setViewName("403");
+            return model;
+        }
+    }
+
+    @GetMapping("/uavTracing")
+    @ApiOperation(value = "���������������������", notes = "���������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392068���", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "startTime", value = "������������(���������2019-07-17-17)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17-18)", required = true, paramType = "query", dataType = "String")
+    })
+    public ModelAndView uavTracing(ModelAndView model, HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        String st = parameters.get("startTime").toString();
+        String startYearAndDay = st.substring(0, st.lastIndexOf("-"));
+        String startHour = st.substring(st.lastIndexOf("-") + 1);
+        String startTime = startYearAndDay + " " + startHour + ":00:00";
+        String et = parameters.get("endTime").toString();
+        String endHour = et.substring(et.lastIndexOf("-") + 1);
+        int endHourValue = Integer.parseInt(endHour);
+        int startHourValue = Integer.parseInt(startHour);
+        if (endHourValue <= startHourValue) {
+            endHourValue = startHourValue + 1;
+        }
+        String endTime = startYearAndDay + " " + endHourValue + ":00:00";
+        parameters.put("startTime", startTime);
+        parameters.put("endTime", endTime);
+        String mac = parameters.get("mac").toString();
+        if (mac != null && mac.length() != 0) {
+            List<Map<String, Object>> sensorData = historyService.getUavSensorData(parameters);
+            Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);
+            JSONObject params = new JSONObject();
+            params.put("sensorInfo", sensorData);
+            params.put("sensorsMap", sensorsMap);
+            params.put("sensorKey", parameters.get("sensorKey"));
+            params.put("unit", parameters.get("unit"));
+            params.put("description", parameters.get("description"));
+            String paramsJson = params.toJSONString();
+            model.addObject("uavTracingParams", paramsJson);
+            model.setViewName("uavtracing");
+            return model;
+        } else {
+            StringBuilder msg = new StringBuilder();
+            msg.append(" param[0] mac:");
+            msg.append(mac);
+            log.warn(msg);
+            model.setViewName("403");
+            return model;
+        }
+    }
+
+    @GetMapping("/purify")
+    @ApiOperation(value = "���������������������", notes = "���������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "monitorPointId", value = "������Id", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensorKey", value = "������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������(���������2020-03-19-14)", required = true, paramType = "query", dataType = "String")})
+    public ModelAndView PurificationRate(HttpServletRequest request, ModelAndView model) {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        String monitPointIdS = (String) parameters.get("monitorPointId");
+        String sensor = (String) parameters.get("sensorKey");
+        String time = (String) parameters.get("time");
+        String YearAndDay = time.substring(0, time.lastIndexOf("-"));
+        String Hour = time.substring(time.lastIndexOf("-") + 1);
+        String Time = YearAndDay + " " + Hour + ":00:00";
+        int monitPointId = Integer.parseInt(monitPointIdS);
+        JSONObject params = monitorPointService.getMonitorPointById(monitPointId, Time, 1, sensor);
+        String paramsJson = params.toJSONString();
+        model.addObject("mapParams", paramsJson);
+        model.setViewName("purityMap");
+        return model;
+    }
+
+
+    @GetMapping("/collection")
+    @ApiOperation(value = "���������������������", notes = "���������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "monitorPointId", value = "������Id", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������(���������2020-03-19-14)", required = true, paramType = "query", dataType = "String")})
+    public ModelAndView collectionRate(HttpServletRequest request, ModelAndView model) {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        String monitPointIdS = (String) parameters.get("monitorPointId");
+        String sensor = "";
+        String time = (String) parameters.get("time");
+        String YearAndDay = time.substring(0, time.lastIndexOf("-"));
+        String Hour = time.substring(time.lastIndexOf("-") + 1);
+        String Time = YearAndDay + " " + Hour + ":00:00";
+        int monitPointId = Integer.parseInt(monitPointIdS);
+        //������������������
+        JSONObject params = monitorPointService.getMonitorPointById(monitPointId, Time, 2, sensor);
+        model.addObject("params", params);
+        model.setViewName("pressureMap");
+        return model;
+    }
+
+
+    @GetMapping("/unorganizedEmissions")
+    @ApiOperation(value = "���������������", notes = "���������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "monitorPointId", value = "������Id", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensorKey", value = "������", required = true, paramType = "query", dataType = "String"),
+            // @ApiImplicitParam(name = "sensorKey", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������(���������2020-03-19-14)", required = true, paramType = "query", dataType = "String")})
+    public ModelAndView unorganizedEmissions(HttpServletRequest request, ModelAndView model) {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        String monitPointIdS = (String) parameters.get("monitorPointId");
+        String sensor = (String) parameters.get("sensorKey");
+        String time = (String) parameters.get("time");
+        String YearAndDay = time.substring(0, time.lastIndexOf("-"));
+        String Hour = time.substring(time.lastIndexOf("-") + 1);
+        String Time = YearAndDay + " " + Hour + ":00:00";
+        int monitPointId = Integer.parseInt(monitPointIdS);
+        //������������������
+        JSONObject params = monitorPointService.getMonitorPointById(monitPointId, Time, 3, sensor);
+        model.addObject("params", params);
+        model.setViewName("unorganizedMap");
+        return model;
+    }
+
+
+    @GetMapping("/unorganizedEmissionsRealTime")
+    @ApiOperation(value = "���������������������", notes = "���������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "monitorPointId", value = "������Id", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensorKey", value = "������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "accountId", value = "������id", required = false, paramType = "query", dataType = "String")})
+    public ModelAndView unorganizedEmissionsBackups(HttpServletRequest request, ModelAndView model) {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        String monitPointIdS = (String) parameters.get("monitorPointId");
+        String sensor = (String) parameters.get("sensorKey");
+        String accountId = (String) parameters.get("accountId");
+        Account account = accountService.getAccountById(Integer.parseInt(accountId));
+        int monitPointId = Integer.parseInt(monitPointIdS);
+        JSONObject params = monitorPointService.getMacList(monitPointId);
+        params.put("accountId", accountId);
+        params.put("orgId", account.getOrganizationId());
+        params.put("sensor", sensor);
+        //������������������
+        //JSONObject params=monitorPointService.getMonitorPointById(monitPointId,Time,3,sensor);
+        // model.addObject("params",params);
+        model.addObject("params", params);
+        model.setViewName("newUnorganizedMap");
+        return model;
+    }
+
+    @GetMapping("/chooseDevice")
+    @ResponseBody
+    public Object unorganizedEmissionsBackups(String wind, String monitPointId) {
+        JSONObject params = new JSONObject();
+        Double windDir = Double.parseDouble(wind);
+        List<Device> deviceList = deviceService.getDeviceById2(Integer.parseInt(monitPointId));
+        Map<String, Object> longAndLatiMap;
+        List<Map> longAndLatiList = new ArrayList<>();//������������������������������������windList������������������������������������������������������������������
+        List<Device> preAngleDeviceList = new ArrayList<Device>(); //���������������������������������������
+        for (int f = 0; f < deviceList.size(); f++) {
+            for (int h = 0; h < deviceList.size(); h++) {
+                if (f != h) {
+                    longAndLatiMap = new HashMap<String, Object>();
+                    longAndLatiMap.put("h", h);
+                    longAndLatiMap.put("f", f);
+                    Double angle = mapUtils.getAngle(
+                            new MyLatLng((Double) deviceList.get(h).getLongitude(),
+                                    (Double) deviceList.get(h).getLatitude()),
+                            new MyLatLng((Double) deviceList.get(f).getLongitude(),
+                                    (Double) deviceList.get(f).getLatitude()));
+                    Double angleDiff = Math.abs(angle - windDir);
+                    longAndLatiMap.put("angle", angleDiff);
+                    longAndLatiList.add(longAndLatiMap);
+                }
+            }
+        }
+        Double minAngle = (Double) longAndLatiList.get(0).get("angle");
+        int indexAngle = 0;
+        for (int j = 1; j < longAndLatiList.size(); j++) {
+            if (minAngle > (Double) longAndLatiList.get(j).get("angle")) {
+                minAngle = (Double) longAndLatiList.get(j).get("angle");
+                indexAngle = j;
+            } else {
+                indexAngle = indexAngle;
+            }
+        }
+        preAngleDeviceList.add(deviceList.get((Integer) longAndLatiList.get(indexAngle).get("h")));
+        preAngleDeviceList.add(deviceList.get((Integer) longAndLatiList.get(indexAngle).get("f")));
+        Double length = mapUtils.getDistance((Double) preAngleDeviceList.get(0).getLongitude(), (Double) preAngleDeviceList.get(0).getLatitude(),
+                (Double) preAngleDeviceList.get(1).getLongitude(), (Double) preAngleDeviceList.get(1).getLatitude());
+        Double subLength = length / 5;
+        Double subLength1 = length / 6.1;
+        Double angle = mapUtils.getAngle(
+                new MyLatLng((Double) preAngleDeviceList.get(0).getLongitude(),
+                        (Double) preAngleDeviceList.get(0).getLatitude()),
+                new MyLatLng((Double) preAngleDeviceList.get(1).getLongitude(),
+                        (Double) preAngleDeviceList.get(1).getLatitude()));
+        List locationList = new ArrayList();
+        String[] firstLocation = mapUtils.calLocationByDistanceAndLocationAndDirection(angle, (Double) preAngleDeviceList.get(0).getLongitude(),
+                (Double) preAngleDeviceList.get(0).getLatitude(), subLength);
+        String[] secondLoction = mapUtils.calLocationByDistanceAndLocationAndDirection(angle, Double.parseDouble(firstLocation[0]),
+                Double.parseDouble(firstLocation[1]), subLength);
+        String[] thirdLocation = mapUtils.calLocationByDistanceAndLocationAndDirection(angle, Double.parseDouble(secondLoction[0]),
+                Double.parseDouble(secondLoction[1]), subLength);
+        String[] fourthLoction = mapUtils.calLocationByDistanceAndLocationAndDirection(angle, Double.parseDouble(thirdLocation[0]),
+                Double.parseDouble(thirdLocation[1]), subLength);
+        String[] fivethLoction = mapUtils.calLocationByDistanceAndLocationAndDirection(angle, Double.parseDouble(fourthLoction[0]),
+                Double.parseDouble(fourthLoction[1]), subLength1);
+        locationList.add(firstLocation);
+        locationList.add(secondLoction);
+        locationList.add(thirdLocation);
+        locationList.add(fourthLoction);
+        locationList.add(fivethLoction);
+        String preAngleDeviceString = JSON.toJSON(preAngleDeviceList).toString();
+        params.put("preAngleDeviceString", preAngleDeviceString);//���������������������������
+        params.put("locationList", locationList);
+        return params;
+    }
+
+    @GetMapping("/allDevice")
+    @ResponseBody
+    public Map<String, List> getAllDevice() {
+        List<String> macList = deviceService.getAllMac();
+        Map<String, List> latlngMap = new HashMap<String, List>();
+        Map devMap = null;
+        List list = new ArrayList();
+        for (String mac : macList) {
+            devMap = new HashMap();
+            if (mac != null) {
+                Device device = deviceService.byMacGetDevice(mac);
+                List list1 = LatLngTransformation.Convert_BD09_To_GCJ02(device.getLatitude(), device.getLongitude());
+                if (device.getState() != 4 + "") {
+                    devMap.put("state", device.getState());
+                }
+                devMap.put("lat", list1.get(1));
+                devMap.put("lng", list1.get(0));
+                devMap.put("monitorPointId", device.getMonitorPointId());
+                //System.out.println(device);
+                list.add(devMap);
+            } else {
+                continue;
+            }
+        }
+        latlngMap.put("latlng", list);
+        return latlngMap;
+    }
+
+
+    @GetMapping("/windAndDeviceData")
+    @ResponseBody
+    public List windAndDeviceData(String monitorPointId) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.MINUTE, (calendar.get(Calendar.MINUTE) - 2));
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        //String time = df.format(calendar.getTime()) + ":00";
+        int year = calendar.get(Calendar.YEAR);
+        int month = calendar.get(Calendar.MONTH) + 1;
+        String mon;
+        if (month < 10) {
+            mon = "0" + month;
+        } else {
+            mon = "" + month;
+        }
+        String table = "history_minutely_" + year + mon;
+        List list = deviceService.byMonitorIdGetDeviceAndWind(monitorPointId, table);
+        return list;
+    }
+
+    //������������
+    @GetMapping("/windAndDeviceDataByArea")
+    @ResponseBody
+    public List windAndDeviceDataByArea(String monitorPointId) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.MINUTE, (calendar.get(Calendar.MINUTE) - 2));
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        String time = df.format(calendar.getTime()) + ":00";
+        int year = calendar.get(Calendar.YEAR);
+        int month = calendar.get(Calendar.MONTH) + 1;
+        String mon;
+        if (month < 10) {
+            mon = "0" + month;
+        } else {
+            mon = "" + month;
+        }
+        String table = "history_minutely_" + year + mon;
+        List list = deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId, table);
+        return list;
+    }
+
+    @GetMapping("forecastO3")
+    @ApiOperation(value = "���������������������������", notes = "���������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "monitorPointId", defaultValue = "1", value = "���������id", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "���6���(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<List<Map<String, Object>>> getWeatherNextDayDataByRegion(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        List<Map<String, Object>> resultList = weatherService.getForecastAndReal(parameters);
+        return new ResultBean<List<Map<String, Object>>>(resultList);
+    }
+
+    @GetMapping("weatherData")
+    @ApiOperation(value = "������city���������������������������������", notes = "������city���������������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "city", value = "���������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<List<Map<String, Object>>> getWeatherData(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        List<Map<String, Object>> weatherList = weatherService.getWeatherData(parameters);
+        return new ResultBean<List<Map<String, Object>>>(weatherList);
+    }
+
+    @GetMapping("weatherDataDay")
+    @ApiOperation(value = "������city���������������������", notes = "������city���������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "city", value = "���������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<List<Map<String, Object>>> getWeatherDataByDay(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        List<Map<String, Object>> weatherList = weatherService.getWeatherDataByDay(parameters);
+        return new ResultBean<List<Map<String, Object>>>(weatherList);
+    }
+
+    @GetMapping("monitorDeviceData")
+    @ApiOperation(value = "���������������5������������������������", notes = "���������������5������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "city", value = "���������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������(���������2020-03-15)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "type", value = "������(5���������m,������������h)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "range", value = "������������������������(������������������m,���������a)", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<List<Map<String, Object>>> get5MinutesOrHalfHour(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        List<Map<String, Object>> deviceData = historyMinutelyService.get5MinutesOrHalfHour(parameters);
+        return new ResultBean<List<Map<String, Object>>>(deviceData);
+    }
+
+    @PostMapping("updateForecastWeather")
+    public void updateForecastWeather(HttpServletRequest request) {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        weatherService.updateForecastWeather(parameters);
+    }
+
+    @GetMapping("dataByTimeSlot")
+    @ApiOperation(value = "������������������������������������", notes = "������������������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "mac", value = "mac������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "startTime", value = "������������(���������2020-08-03/2020-08-03-13)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "������������(���������2020-08-04/2020-08-04-14)", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<List<Map<String, Object>>> getDataByTimeSlot(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        String mac = parameters.get("mac").toString();
+        String startTime = parameters.get("startTime").toString();
+        String endTime = parameters.get("endTime").toString();
+        //������������������������������
+        Calendar calendar = getInstance();
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        List<Map<String, Object>> list = new ArrayList();
+        Map device = deviceService.getAllFieldByMac(parameters);
+        Map monitorPointMap = monitorPointService.selectAllById(device.get("monitor_point_id").toString());
+        List<Map<String, Object>> device_sensorList = sensorService.getSensorByDeviceId(device.get("id").toString());
+        Map<String, Object> device_sensorUnit_map = new HashMap<>();
+        for (Map<String, Object> device_sensorMap : device_sensorList) {
+            device_sensorUnit_map.put(device_sensorMap.get("sensor_key").toString(), device_sensorMap.get("unit"));
+        }
+        Map<String, String> sensorMap = sensorService.getSensorsMap(parameters);
+        if (startTime.length() == 10 && endTime.length() == 10) {
+            //������������������
+            Date dd = new Date();
+            //���������
+            SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
+            //������������������������
+            String nowTime = sim.format(dd);
+            int days = endTime.compareTo(nowTime);
+            //System.out.println(days);
+            List<String> dayList = DatesUtil.findDaysStr(startTime, endTime);
+            //System.out.println("dayList:"+dayList);
+            /*if (days<0){
+                Date date=null;
+                try {
+                    date = new SimpleDateFormat("yy-MM-dd").parse(endTime);
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+                calendar.setTime(date);
+                int day=calendar.get(Calendar.DATE);
+                calendar.set(Calendar.DATE,day+1);
+
+                endTime=new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime());
+            }*/
+            List<Map<String, Object>> sameDayHourlyList = null;
+            if (days >= 0) {
+                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                //������������������������
+                String currentTime = df.format(dd);
+                sameDayHourlyList = historyHourlyService.getDataByTimeSlot(mac, nowTime, currentTime);
+            }
+            List<Map<String, Object>> dataList = historyDailyService.getDataByTimeSlot(mac, startTime, endTime);
+            if (dataList.isEmpty()) {
+                return null;
+            }
+            Set<String> keys = sensorMap.keySet();
+            for (String key : keys) {
+                Map<String, Object> oneSensorMap = new LinkedHashMap<>();
+                oneSensorMap.put("monitorPointName", monitorPointMap.get("name"));
+                oneSensorMap.put("deviceName", device.get("name"));
+                oneSensorMap.put("sersorKey", sensorMap.get(key) + "���" + device_sensorUnit_map.get(key) + "���");
+                for (String day : dayList) {
+                    for (Map<String, Object> dataMap : dataList) {
+                        JSONObject dataJson = JSONObject.parseObject(dataMap.get("json").toString());
+                        if (dataMap.get("time").toString().equals(day + " 00:00:00.0")) {
+                            oneSensorMap.put(dataMap.get("time").toString().substring(0, 10), dataJson.getJSONArray(key).get(0));
+                            break;
+                        } else {
+                            continue;
+                        }
+                    }
+                    if (!oneSensorMap.containsKey(day)) {
+                        oneSensorMap.put(day, "");
+                    }
+                }
+
+                Double avg = 0.0;
+                if (sameDayHourlyList != null) {
+                    for (Map sameDayHourlyMap : sameDayHourlyList) {
+                        List<Double> arr = new ArrayList<>();
+                        JSONObject hourlyJson = JSONObject.parseObject(sameDayHourlyMap.get("json").toString());
+                        arr.add(Double.parseDouble(hourlyJson.getJSONArray(key).get(0).toString()));
+                        Double sum = 0.0;
+                        for (int i = 0; i < arr.size(); i++) {
+                            sum += arr.get(i);
+                        }
+                        avg = sum / arr.size();
+                    }
+                    oneSensorMap.put(nowTime, avg);
+                }
+                list.add(oneSensorMap);
+            }
+        } else if (startTime.length() == 13 && endTime.length() == 13) {
+            StringBuilder startTime_sb = new StringBuilder(startTime);
+            startTime_sb.replace(10, 11, " ");
+            startTime = startTime_sb.toString() + ":00:00";
+            StringBuilder endTime_sb = new StringBuilder(endTime);
+            endTime_sb.replace(10, 11, " ");
+            endTime = endTime_sb.toString() + ":00:00";
+
+            List<String> hoursList = DatesUtil.findHoursStr(startTime, endTime);
+            //System.out.println("hoursList:"+hoursList);
+
+            List<Map<String, Object>> hourlyList = historyHourlyService.getDataByTimeSlot(mac, startTime, endTime);
+            if (hourlyList.isEmpty()) {
+                return null;
+            }
+            Set<String> keys = sensorMap.keySet();
+            for (String key : keys) {
+                Map<String, Object> oneSensorMap = new LinkedHashMap<>();
+                oneSensorMap.put("monitorPointName", monitorPointMap.get("name"));
+                oneSensorMap.put("deviceName", device.get("name"));
+                oneSensorMap.put("sersorKey", sensorMap.get(key) + "���" + device_sensorUnit_map.get(key) + "���");
+                for (String hour : hoursList) {
+                    for (Map<String, Object> hourlyMap : hourlyList) {
+                        JSONObject dataJson = JSONObject.parseObject(hourlyMap.get("json").toString());
+                        if (hourlyMap.get("time").toString().equals(hour + ".0")) {
+                            if (dataJson.getJSONArray(key) != null) {
+                                oneSensorMap.put(hourlyMap.get("time").toString().substring(0, 19), dataJson.getJSONArray(key).get(0));
+                                break;
+                            }
+                        } else {
+                            continue;
+                        }
+                    }
+                    if (!oneSensorMap.containsKey(hour)) {
+                        oneSensorMap.put(hour, "");
+                    }
+                }
+                /*for (Map<String, Object> hourlyMap: hourlyList) {
+                    JSONObject hourlyJson = JSONObject.parseObject(hourlyMap.get("json").toString());
+                    oneSensorMap.put(hourlyMap.get("time").toString().substring(0,19),hourlyJson.getJSONArray(key).get(2));
+
+                }*/
+                list.add(oneSensorMap);
+            }
+        } else {
+            return null;
+        }
+        return new ResultBean<List<Map<String, Object>>>(list);
+    }
+
+
+    @GetMapping("/contrastFactor")
+    @ApiOperation(value = "������������", notes = "������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensor", value = "������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������(���������2020-03-19���20���21)", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<List<Map<String, Object>>> contrastFactor(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        List list = historyHourlyService.getDataByMacAndTime(parameters);
+        //System.out.println(list);
+        return new ResultBean<List<Map<String, Object>>>(list);
+    }
+
+    @GetMapping("/getAlarm")
+    @ResponseBody
+    public List<DeviceRoad> getAlarm(@Param("windData") String windData, @Param("code") String code, @Param("mac") String mac, @Param("speedLevel") String speedLevel) {
+        List<DeviceRoad> alarmData = deviceRoadService.getAlarmData(windData, code, mac, speedLevel);
+        return alarmData;
+    }
+
+    @GetMapping("multiDeviceContrast")
+    @ApiOperation(value = "���������������������", notes = "���������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "macs", value = "������mac,���������������������������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������,������(���������2018-03-12)", required = true, paramType = "query", dataType = "String"),})
+    public ResultBean<List<Map<String, Object>>> multiDeviceSensor(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        ParameterUtils.getTimeType4Time(parameters);
+        List<Map<String, Object>> list = historyMinutelyService.getMultiDeviceSensorData(parameters);
+        return new ResultBean<List<Map<String, Object>>>(list);
+    }
+
+
+    @PostMapping("/tellAlarm")
+    @ResponseBody
+    public List<List> tellAlarm(String states, String orgId, String accountId, String states1, String regionCode) {
+        JSONArray stateList = JSONArray.parseArray(states);//���������������������
+        JSONArray stateList1 = JSONArray.parseArray(states1);//���10������������������
+        List<List> lookList = new ArrayList<>();
+        Map params = new HashMap();
+        String lookString = "";
+        //������������������������������������������������������������������������������
+        //���������������������������������������null
+        if (stateList1 != null && !states.equals(states1)) {
+            List<Map> listDevice = JSONObject.parseArray(stateList.toJSONString(), Map.class);
+            List<Map> listDevice1 = JSONObject.parseArray(stateList1.toJSONString(), Map.class);
+            //���������������������������������������
+            List<Map> deviceList = new ArrayList<Map>();
+            List<Map> deviceList1 = new ArrayList<Map>();
+            //���������������������id
+            List orgList = new ArrayList();
+            for (Map devices : listDevice) {
+                int monitorId = Integer.parseInt((String) devices.get("id"));
+                MonitorPoint monitorPoint = monitorPointService.byIdGetMonitorPoint(monitorId);
+                int org_id = monitorPoint.getOrganizationId();
+                orgList.add(org_id);
+                List<Map> devicesList = (List<Map>) devices.get("devices");
+                if (!devicesList.isEmpty()) {
+                    if (devicesList.size() > 1) {
+                        for (Map map : devicesList) {
+                            deviceList.add(map);
+                        }
+                    } else {
+                        deviceList.add((Map) ((List) devices.get("devices")).get(0));
+                    }
+                }
+            }
+            for (Map devices1 : listDevice1) {
+                int monitorId = Integer.parseInt((String) devices1.get("id"));
+                MonitorPoint monitorPoint = monitorPointService.byIdGetMonitorPoint(monitorId);
+                int org_id = monitorPoint.getOrganizationId();
+                List<Map> devicesList = (List<Map>) devices1.get("devices");
+                if (!devicesList.isEmpty()) {
+                    if (devicesList.size() > 1) {
+                        for (Map map : devicesList) {
+                            deviceList1.add(map);
+                        }
+                    } else {
+                        deviceList1.add((Map) ((List) devices1.get("devices")).get(0));
+                    }
+                }
+            }
+            List<String> macList = new ArrayList<String>();
+            //������������������������������������������mac���
+            for (Map map : deviceList) {
+                String state = (String) map.get("state");
+                String mac = (String) map.get("mac");
+                for (Map map1 : deviceList1) {
+                    String state1 = (String) map1.get("state");
+                    String mac1 = (String) map1.get("mac");
+                    if (mac.equals(mac1)) {
+                        if (Integer.parseInt(state) > Integer.parseInt(state1) && Integer.parseInt(state) != 4 /*&& Integer.parseInt(state1) == 0*/) {
+                            macList.add(mac + "-" + state + "-" + state1);
+                        }
+                    }
+                }
+            }
+            //������������������������
+            LinkedHashSet<Integer> orgS = new LinkedHashSet<Integer>(orgList);
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date date = new Date(System.currentTimeMillis());
+            Date date1 = new Date(System.currentTimeMillis() - 1000);
+            //������������������
+            String time = formatter.format(date);
+            //������������������������������
+            String time1 = formatter.format(date1);
+            List<Map> alarmList = new ArrayList<Map>();
+            for (Integer org : orgS) {
+                int orgNum = alarmConfigService.containOrgId(org);
+                Map<String, Object> eMap = new HashMap<String, Object>();
+                if (orgNum == 1) {
+                    String alarmConfig = alarmConfigService.getValueByOrganizationId(Integer.parseInt(String.valueOf(org)));
+                    Map hashMap = JSON.parseObject(alarmConfig, HashMap.class);
+                    Map alarmLevels = (Map) hashMap.get("alarmLevels");
+                    //������������������������106���������
+                    for (int i = 1; i < 106; i++) {
+                        if (alarmLevels.containsKey("e" + i)) {
+                            Map map = (Map) alarmLevels.get("e" + i);
+                            if (!map.isEmpty()) {
+                                Integer enable = (Integer) map.get("enable");
+                                List increment = (List) map.get("increment");
+                                if (enable == 1) {
+                                    if (!(increment.get(0).toString().equals("0") && increment.get(1).toString().equals("0"))) {
+                                        eMap.put("e" + i, increment);
+                                    } else {
+                                        continue;
+                                    }
+                                } else {
+                                    continue;
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    String defultAlarm = dictionaryDataService.getDefultAlarm();
+                    Map hashMap = JSON.parseObject(defultAlarm, HashMap.class);
+                    Map alarmLevels = (Map) hashMap.get("alarmLevels");
+                    //������������������������106���������
+                    for (int i = 1; i < 106; i++) {
+                        if (alarmLevels.containsKey("e" + i)) {
+                            Map map = (Map) alarmLevels.get("e" + i);
+                            if (!map.isEmpty()) {
+                                Integer enable = (Integer) map.get("enable");
+                                List increment = (List) map.get("increment");
+                                if (enable == 1) {
+                                    if (!(increment.get(0).toString().equals("0") && increment.get(1).toString().equals("0"))) {
+                                        eMap.put("e" + i, increment);
+                                    } else {
+                                        continue;
+                                    }
+                                } else {
+                                    continue;
+                                }
+                            }
+                        }
+                    }
+                }
+                Map map = new HashMap();
+                map.put("eMap", eMap);
+                map.put("org", org);
+                alarmList.add(map);
+            }
+            for (Map aEMap : alarmList) {
+                List<Map> values = new ArrayList<Map>();
+                if (macList.size() > 0) {
+                    for (String sMac : macList) {
+                        String[] aMac = sMac.split("-");
+                        String mac = aMac[0];
+                        //������������������������������������������������������������������������������������������������������������������������������������������������
+                        String value = historyService.getValueByMacAndTime(mac, time, time1);
+                        Map<String, String> map = new HashMap<String, String>();
+                        if (value == null) {
+                            Date date2 = new Date(System.currentTimeMillis() - 2000);
+                            //������������������������������
+                            String time2 = formatter.format(date1);
+                            value = historyService.getValueByMacAndTime(mac, time, time2);
+                            if (value == null) {
+                                Date date3 = new Date(System.currentTimeMillis() - 3000);
+                                //������������������������������
+                                String time3 = formatter.format(date1);
+                                value = historyService.getValueByMacAndTime(mac, time, time3);
+                            }
+                        }
+                        if (value != null) {
+                            map.put("mac", mac);
+                            map.put("value", value);
+                            map.put("state", aMac[1]);
+                            map.put("state1", aMac[2]);
+                            values.add(map);
+                        } else {
+                            continue;
+                        }
+                    }
+                }
+
+                if (values.size() > 0 && values.size() == macList.size()) {
+                    for (Map dataMap : values) {
+                        String oId = deviceService.byMacGetOrgId((String) dataMap.get("mac"));
+                        if (!(aEMap.get("org").toString()).equals(oId)) {
+                            continue;
+                        }
+                        List<String> list = new ArrayList<String>();
+                        Map sensorMap = JSONObject.parseObject((String) dataMap.get("value"));
+                        Iterator<String> iter = sensorMap.keySet().iterator();
+                        while (iter.hasNext()) {
+                            String key = iter.next();
+                            list.add(key);
+                        }
+                        String state = (String) dataMap.get("state");
+                        String state1 = (String) dataMap.get("state1");
+                        List<Map> mapList = new ArrayList();
+                        for (String key : list) {
+                            if (((Map) aEMap.get("eMap")).containsKey(key)) {
+                                Double val = Double.valueOf(sensorMap.get(key).toString());
+                                List valueList = (List) ((Map) aEMap.get("eMap")).get(key);
+                                Device device = deviceService.byMacGetDevice((String) dataMap.get("mac"));
+                                Map<String, Object> sensors = sensorService.getSensorBySensorKey(key);
+                                if (key.equals("e1") || key.equals("e2") || key.equals("e10") || key.equals("e11") || key.equals("e15") || key.equals("e16")) {
+                                    //������������������������
+                                    if ((state1.equals("0") || state1.equals("1")) && Integer.parseInt(state) > 1) {
+                                        if (val > Double.valueOf(String.valueOf(valueList.get(1)))) {
+                                            Map lookMap = new HashMap();
+                                            lookMap.put("time", time);
+                                            lookMap.put("name", device.getName());
+                                            lookMap.put("sensor", sensors.get("description"));
+                                            lookMap.put("value", val + "" + sensors.get("unit"));
+                                            mapList.add(lookMap);
+                                            //lookString = time+" "+device.getName()+sensors.get("description")+"="+val + sensors.get("unit")+"������";
+                                            //System.out.println(time + "====" + device.getName() + "=====" + sensors.get("description") + "======" + val + sensors.get("unit"));
+                                        }
+                                    }
+                                } else {//���������������������������
+                                    if (state1.equals("0")) {
+                                        if (val > Double.valueOf(String.valueOf(valueList.get(0)))) {
+                                            Map lookMap = new HashMap();
+                                            lookMap.put("time", time);
+                                            lookMap.put("name", device.getName());
+                                            lookMap.put("sensor", sensors.get("description"));
+                                            lookMap.put("value", val + "" + sensors.get("unit"));
+                                            mapList.add(lookMap);
+                                        }
+                                    }
+                                }
+
+                            }
+                        }
+                        if (mapList.size() > 0) {
+                            lookList.add(mapList);
+                        } else {
+                            continue;
+                        }
+                    }
+                }
+            }
+        }
+        return lookList;
+    }
+
+    /*  @GetMapping("/lianxian")
+      @ApiOperation(value = "������", notes = "������" )
+      @GetMapping("multiDeviceContrast")
+      @ApiOperation(value = "���������������������", notes = "���������������������")
+      @ApiImplicitParams(value = {
+              @ApiImplicitParam(name = "macs", value = "������mac,���������������������������", required = true, paramType = "query", dataType = "String"),
+              @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+              @ApiImplicitParam(name = "time", value = "������,������(���������2018-03-12)", required = true, paramType = "query", dataType = "String"),})
+      public ResultBean<List<Map<String, Object>>> multiDeviceSensor(HttpServletRequest request) throws Exception {
+          Map<String, Object> parameters = getParametersStartingWith(request, null);
+          ParameterUtils.getTimeType4Time(parameters);
+          List<Map<String, Object>> list = historyMinutelyService.getMultiDeviceSensorData(parameters);
+          return new ResultBean<List<Map<String, Object>>>(list);
+      }
+
+      /*
+      * ���������������������������������������������
+      */
+    @GetMapping("screenVersion")
+    public Map<String, Object> getScreenVersion(HttpServletRequest request) {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        String version = parameters.get("version").toString();
+        return screenVersionService.getScreenVersion(version);
+    }
+
+    @GetMapping("allDeviceExcel")
+    @ApiOperation(value = "���������������������������������", notes = "���������������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "monitorPoint", value = "������������id", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensorKey", value = "���������key,������������������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "startTime", value = "������������(���������2020-08-03)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "������������(���������2020-08-04)", required = false, paramType = "query", dataType = "String")})
+    public ResultBean<List<Map<String, Object>>> getAllDeviceDataToExcel(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        List<Map<String, Object>> list = historyMinutelyService.getAllDeviceDataToExcel(parameters);
+        return new ResultBean<List<Map<String, Object>>>(list);
+    }
+
+    /*@PostMapping("insertAdjustValue")
+    @ApiOperation(value = "���������������������������������", notes = "���������������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "id", value = "������id", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "���������������08:30:00���", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "dataArray", value = "������", required = false, paramType = "query", dataType = "String")})
+    public void insertAdjustValue(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        int device_id = Integer.parseInt(parameters.get("id").toString());
+        String hour_minute_second = parameters.get("time").toString();
+        String[] arr = hour_minute_second.split(":");
+        int seconds = Integer.parseInt(arr[0])*3600+Integer.parseInt(arr[1])*60+Integer.parseInt(arr[2]);
+        String value = parameters.get("dataArray").toString();
+        deviceAdjustValueTimingService.insertData(device_id,seconds,value);;
+    }*/
+
+    @PostMapping("insertAdjustValue")
+    public  int insertAdjustValue(@RequestBody HashMap map){
+        try{
+            int device_id = Integer.parseInt(map.get("id").toString());
+            String time = map.get("time").toString();
+            String[] arr = time.split(":");
+            int seconds = Integer.parseInt(arr[0])*3600+Integer.parseInt(arr[1])*60+Integer.parseInt(arr[2]);
+            //String t = URLEncoder.encode(������,"UTF-8")
+            List list = (List) map.get("dataArray");
+            String val="";
+            for (int i = 0; i <list.size() ; i++) {
+                if (i==0){
+                    val=val+list.get(i);
+                }else {
+                    val=val+","+list.get(i);
+                }
+            }
+            String value = "{"+val+"}";
+            deviceAdjustValueTimingService.insertData(device_id,seconds,value);
+            return 1;
+        }catch (Exception e){
+            log.warn(e);
+        }
+        return 0;
+    }
+
+    @RequestMapping("/biaozhun")
+    @ResponseBody
+    public List<Device> queryDevice(String macOrName){
+        List<Device> deviceList = new ArrayList<>();
+        if (!macOrName.equals("")){
+             deviceList= deviceService.getDevice(macOrName);
+        }
+        return deviceList;
+    }
+
+    @RequestMapping("/getBiaoZhun")
+    @ResponseBody
+    public List<DeviceAdjustValueTiming> getBiaoZhun(String id){
+        List<DeviceAdjustValueTiming> dataByDeviceid = deviceAdjustValueTimingService.getDataByDeviceid(Integer.parseInt(id));
+        for (DeviceAdjustValueTiming deviceAdjustValueTiming : dataByDeviceid) {
+            int seconds = Integer.parseInt(deviceAdjustValueTiming.getSeconds());
+            String hour = String.valueOf(seconds/3600);
+            int millAndSeconds = seconds%3600;
+            String mill = String.valueOf(millAndSeconds/60);
+            String second = String.valueOf(millAndSeconds%60);
+            if (hour.length()<2){
+                hour="0"+hour;
+            }
+            if (mill.length()<2){
+                mill="0"+mill;
+            }
+            if (second.length()<2){
+                second="0"+second;
+            }
+            String time = hour+":"+mill+":"+second;
+            Map<String, String> value = deviceAdjustValueTiming.getValue();
+            Collection<String> values = value.values();
+            deviceAdjustValueTiming.setSeconds(time);
+        }
+        return dataByDeviceid;
+    }
+
+
+    @RequestMapping("/getSensor")
+    @ResponseBody
+    public  List<Map<String, Object>> getSensor(String id){
+        List<Map<String, Object>> allSensors = sensorService.getSensorByDeviceId(id);
+        return allSensors;
+    }
+
+    @RequestMapping("/deleteBiaoZhun")
+    @ResponseBody
+    public int deleteBiaoZhun(String id){
+        int i= deviceAdjustValueTimingService.delete(id);
+        return i;
+    }
+
+
+    @GetMapping("/monitorAVGData")
+    @ApiOperation(value = "monitor������������������", notes = "monitor������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "monitorPointIds", value = "������monitorid", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
+    public  List<List<Map>> monitorAVGData(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        String monitorPointIds = (String) parameters.get("monitorPointIds");
+        String time = (String) parameters.get("time");
+        time = time+" 00:00:00";
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd mm:HH:ss");//���������������MM
+        Date date = simpleDateFormat.parse(time);
+        Calendar calendar = new GregorianCalendar();
+        calendar.setTime(date);
+        calendar.add(calendar.DATE,+1);
+        String date1= simpleDateFormat.format(date);
+        String date2= simpleDateFormat.format(calendar.getTime());
+        String[] mIds = monitorPointIds.split(",");
+        List<List<Map>> lists = new ArrayList<>();
+        if (mIds.length==1 && mIds.length!=0){
+            String mId = mIds[0];
+            List<Map> dataAvbByMIdAndTime = historyHourlyService.getDataAvbByMIdAndTime(mId, date1, date2);
+            lists.add(dataAvbByMIdAndTime);
+            //List<Device> devicesByMonitorPointId = deviceService.getDevicesByMonitorPointId(Integer.valueOf(mId));
+        }else {
+            for (int i = 0; i <mIds.length ; i++) {
+                List<Map> dataAvbByMIdAndTime = historyHourlyService.getDataAvbByMIdAndTime(mIds[i], date1, date2);
+                lists.add(dataAvbByMIdAndTime);
+            }
+        }
+        return lists;
+    }
 }

--
Gitblit v1.8.0