From cda3fcb63a6cebb154a3770c4c6c288cd660d762 Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:34:12 +0800
Subject: [PATCH] 国控因子与监测因子平均值对比

---
 src/main/java/com/moral/service/HistoryMinutelyService.java          |   64 
 src/main/java/com/moral/mapper/HistoryMinutelyMapper.java            |   66 
 src/main/resources/mapper/HistoryMinutelyMapper.xml                  |  423 ++--
 src/main/resources/mapper/HangzhouAqiMapper.xml                      |   54 
 src/main/java/com/moral/service/HangzhouAqiService.java              |    4 
 src/main/java/com/moral/controller/ScreenController.java             | 2942 ++++++++++++++++++----------------
 src/main/java/com/moral/service/impl/HangzhouAqiServiceImpl.java     |   93 
 src/main/java/com/moral/mapper/HangzhouAqiMapper.java                |   13 
 src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 1364 ++++++++--------
 9 files changed, 2,598 insertions(+), 2,425 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index e4bb92c..3920b26 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1,1408 +1,1534 @@
-package com.moral.controller;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.net.ftp.FTPClient;
-import org.apache.log4j.Logger;
-import org.dom4j.Document;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cglib.beans.BeanMap;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-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;
-
-/**
- * The Class ScreenController.������������
- */
-@RestController
-@RequestMapping("/screen")
-@CrossOrigin(origins = "*", maxAge = 3600)
-@SuppressWarnings({"rawtypes", "unchecked", "unused"})
-@Api(tags = "Screen", description = "������������")
-public class ScreenController {
-    public static Logger log = Logger.getLogger(ScreenController.class);
-    @Resource
-    AlarmConfigService alarmConfigService;
-    @Resource
-    AreaService areaService;
-
-    @Resource
-    SensorService sensorService;
-    @Resource
-    SensorUnitService sensorUnitService;
-    @Resource
-    MonitorPointService monitorPointService;
-    @Resource
-    DeviceVersionService deviceVersionService;
-
-    /**
-     * The screen service.
-     */
-    @Resource
-    private HistoryService historyService;
-
-    /**
-     * The account service.
-     */
-    @Resource
-    private AccountService accountService;
-
-    /**
-     * The device service.
-     */
-    @Resource
-    private DeviceService deviceService;
-
-    @Resource
-    private HistoryHourlyService historyHourlyService;
-
-    @Resource
-    private HistoryMinutelyService historyMinutelyService;
-
-    @Resource
-    private MachineActivateService machineActivateService;
-
-    /** The resource. */
-//	@Value(value = "classpath:system/alarmLevels.json")
-//	private org.springframework.core.io.Resource resource;
-
-    /**
-     * The redis template.
-     */
-    @Resource
-    private RedisTemplate<String, String> redisTemplate;
-
-    /**
-     * The level key.
-     */
-    private String levelKey = "alarm_";
-
-    @Resource
-    private AlarmDailyService alarmDailyService;
-    @Resource
-    private OrganizationLayoutService orgLayoutService;
-    @Resource
-    private DeviceVersionService dviceVersionService;
-    @Resource
-    private OrganizationService organizationService;
-    @Resource
-    private DictionaryDataService dictionaryDataService;
-
-    @Resource
-    private WeatherService weatherService;
-
-    @Resource
-    private QualityDailyService qualityDailyService;
-
-    /**
-     * Screen login. ������������
-     *
-     * @param request the request
-     * @return the map
-     */
-    @GetMapping("login")
-    public Map<String, Object> screenLogin(HttpServletRequest request) {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
-            resultMap.put("msg", "������������������������������������");
-            resultMap.put("accountId", -1);
-        } else {
-            resultMap = accountService.screenLogin(parameters);
-            // ������������������������������������������
-            Object orgId = resultMap.get("orgId");
-            if (resultMap.get("orgId") != null && resultMap.get("orgId") instanceof Integer) {
-                StringBuilder areaNamesBuilder = new StringBuilder("������");
-                if (!((Integer) orgId).equals(dictionaryDataService.querySupperOrgId())) {
-                    Organization organization = organizationService.getOrganizationById((Integer) orgId);
-                    if (organization.getAreaNames() != null) {
-                        Map<String, String> areaNameMap = BeanUtils.beanToMap(organization.getAreaNames());
-                        List<String> names = areaNameMap.entrySet().stream().filter(item -> {
-                            return item.getValue() != null;
-                        }).map(item -> {
-                            return item.getValue();
-                        }).collect(Collectors.toList());
-                        AreaNames areaNames = organization.getAreaNames();
-                        areaNamesBuilder.append("/");
-                        areaNamesBuilder.append(String.join("/", names));
-                    }
-                    // ������������
-                    if (organization.getRank() != null && organization.getRank() == 0) {
-                        resultMap.put("type", "enterprise");
-                    } else {
-                        resultMap.put("type", "government");
-                    }
-                    Number mapAreaCode = null;
-                    if (organization.getVillageCode() != null) {
-                        mapAreaCode = organization.getVillageCode();
-                    } else if (organization.getTownCode() != null) {
-                        mapAreaCode = organization.getTownCode();
-                    } else if (organization.getAreaCode() != null) {
-                        mapAreaCode = organization.getAreaCode();
-                    } else if (organization.getCityCode() != null) {
-                        mapAreaCode = organization.getCityCode();
-                    } else if (organization.getProvinceCode() != null) {
-                        mapAreaCode = organization.getProvinceCode();
-                    }
-                    resultMap.put("mapAreaCode", mapAreaCode.toString());
-                }
-                resultMap.put("mapPath", areaNamesBuilder.toString());
-            }
-        }
-        return resultMap;
-    }
-
-    @GetMapping("loginNew")
-    public Map<String, Object> screenLoginNew(HttpServletRequest request) {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
-            resultMap.put("msg", "������������������������������������");
-            resultMap.put("accountId", -1);
-        } else {
-            resultMap = accountService.screenLoginNew(parameters);
-            // ������������������������������������������
-            Object orgId = resultMap.get("orgId");
-            if (resultMap.get("orgId") != null && resultMap.get("orgId") instanceof Integer) {
-                StringBuilder areaNamesBuilder = new StringBuilder("������");
-                if (!((Integer) orgId).equals(dictionaryDataService.querySupperOrgId())) {
-                    Organization organization = organizationService.getOrganizationById((Integer) orgId);
-                    if (organization.getAreaNames() != null) {
-                        Map<String, String> areaNameMap = BeanUtils.beanToMap(organization.getAreaNames());
-                        List<String> names = areaNameMap.entrySet().stream().filter(item -> {
-                            return item.getValue() != null;
-                        }).map(item -> {
-                            return item.getValue();
-                        }).collect(Collectors.toList());
-                        AreaNames areaNames = organization.getAreaNames();
-                        areaNamesBuilder.append("/");
-                        areaNamesBuilder.append(String.join("/", names));
-                    }
-                    // ������������
-                    if (organization.getRank() != null && organization.getRank() == 0) {
-                        resultMap.put("type", "enterprise");
-                    } else {
-                        resultMap.put("type", "government");
-                    }
-                    Number mapAreaCode = null;
-                    if (organization.getVillageCode() != null) {
-                        mapAreaCode = organization.getVillageCode();
-                    } else if (organization.getTownCode() != null) {
-                        mapAreaCode = organization.getTownCode();
-                    } else if (organization.getAreaCode() != null) {
-                        mapAreaCode = organization.getAreaCode();
-                    } else if (organization.getCityCode() != null) {
-                        mapAreaCode = organization.getCityCode();
-                    } else if (organization.getProvinceCode() != null) {
-                        mapAreaCode = organization.getProvinceCode();
-                    }
-                    resultMap.put("mapAreaCode", mapAreaCode.toString());
-                }
-                resultMap.put("mapPath", areaNamesBuilder.toString());
-            }
-        }
-        return resultMap;
-    }
-
-    /**
-     * Gets the equipment states. ���������������������������������������
-     *
-     * @param request the request
-     * @return the equipment states
-     */
-    @GetMapping("/equipment-state")
-    @PreAuthorize("hasAnyRole('USER', 'ADMIN')")
-    public Map<String, Object> getDeviceStatesByAccount(HttpServletRequest request) {
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        return deviceService.getDeviceStatesByAccount(parameters);
-    }
-
-    /**
-     * Gets the alarm levels. ������������������
-     *
-     * @param request the request
-     * @return the alarm levels
-     */
-    @GetMapping("alarm-levels")
-    public Object getAlarmLevels(HttpServletRequest request, Optional<Integer> orgId, Optional<Integer> mpId,
-                                 Optional<String> mac) {
-        List<Map<String, Object>> sensorAlarmList = null;
-        try {
-            AlarmConfig alarmConfig = null;
-            if (orgId.isPresent()) {
-                alarmConfig = alarmConfigService.queryValueByOrganizationId(orgId.get()).get();
-            } else if (mpId.isPresent()) {
-                alarmConfig = alarmConfigService.queryByMonitorPointId(mpId.get()).get();
-            } else if (mac.isPresent()) {
-                alarmConfig = alarmConfigService.queryByDeviceMac(mac.get()).get();
-            }
-            // ���������������
-            if (alarmConfig.getValue() != null && alarmConfig.getValue().getAlarmLevels() != null) {
-                Map<String, AlarmSensorLevel> alarmLevelMap = alarmConfig.getValue().getAlarmLevels();
-                // ������������������������������������������������������
-                Map<String, AlarmSensorLevel> defaultSensorLevelMap = null;
-                if (alarmConfig.getId() != null) {
-                    AlarmConfigValue defaultAlarmValue = alarmConfigService.getDefaultAlarmConfigValue();
-                    defaultSensorLevelMap = defaultAlarmValue.getAlarmLevels();
-                }
-                Map<String, AlarmSensorLevel> finalDefaultSensorLevelMap = defaultSensorLevelMap;
-                alarmLevelMap.entrySet().stream().forEach(entry -> {
-                    // ��� increment������0������������������������
-                    AlarmSensorLevel alarmSensorLevel = entry.getValue();
-                    if (alarmSensorLevel.getIncrement() != null) {
-                        boolean isAllZero = alarmSensorLevel.getIncrement().stream().allMatch(item -> item == 0);
-                        if (isAllZero) {
-                            AlarmSensorLevel defaultAlarmSensorLevel = finalDefaultSensorLevelMap == null ? null
-                                    : finalDefaultSensorLevelMap.get(entry.getKey());
-                            if (defaultAlarmSensorLevel != null) {
-                                alarmSensorLevel.setIncrement(defaultAlarmSensorLevel.getIncrement());
-                            } else {
-                                List<Float> tempList = Arrays.asList(0.0f, 200.0f, 500.0f);
-                                alarmSensorLevel.setIncrement(tempList);
-                            }
-                        }
-                    }
-                });
-                // map to list
-                Map<String, AlarmSensorLevel> finalAlarmLevelMap = alarmLevelMap;
-                sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> {
-                    AlarmSensorLevel alarmSensorLevel = finalAlarmLevelMap.get(key);
-                    Map<String, Object> alarmSensorLevelMap = new HashMap<>(BeanMap.create(alarmSensorLevel));
-                    alarmSensorLevelMap.put("key", key);
-                    return alarmSensorLevelMap;
-                }).collect(Collectors.toList());
-            } else {
-                return new ResultBean<>("���������������������������������������������", ResultBean.FAIL);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            Map<String, Object> err = new LinkedHashMap<String, Object>();
-            err.put("msg", "���������������������������������������������������" + e.getMessage());
-            return err;
-        }
-        return sensorAlarmList;
-    }
-
-    /**
-     * Gets the standard by sensor.���������������������������
-     *
-     * @param macKey the request
-     * @return the standard by sensor
-     */
-    @GetMapping("sensor-standard")
-    public Map<String, Object> getStandardBySensor(@RequestParam("macKey") String macKey) {
-        ValidateUtil.notEmpty(macKey, "param.is.null");
-        Map<String, Object> result = new HashMap<String, Object>();
-        result.put("standard", getValue(macKey + "-standard"));
-        return result;
-    }
-
-    /**
-     * @param dataSortCondition ������������������������
-     * @return
-     */
-    public ResultBean<Map<String, Object>> getOrderData(DataSortCondition dataSortCondition) {
-        ResultBean resultBean = new ResultBean();
-        if (dataSortCondition.getCode() == null) {
-            resultBean.setCode(ResultBean.FAIL);
-            resultBean.setMessage("code can't be null");
-        } else if (dataSortCondition.getStyle() == null) {
-            resultBean.setCode(ResultBean.FAIL);
-            resultBean.setMessage("style can't be null");
-        }
-        String code = dataSortCondition.getCode().toString();
-        Region region = Region.create(code);
-        if (region == null) {
-            resultBean.setCode(ResultBean.FAIL);
-            resultBean.setMessage("code is not in the correct format");
-        }
-        // todo
-        return null;
-    }
-
-    /**
-     * Gets the day AQI by sensor.���������������AQI������
-     *
-     * @param request the request
-     * @return the day AQI by sensor
-     */
-    @GetMapping("day-aqi")
-    public Map<String, Object> getDayAQIByDevice(HttpServletRequest request) {
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        return historyMinutelyService.getDayAQIByDevice(parameters);
-    }
-
-    @GetMapping("hour-aqi")
-    @ApiOperation(value = "���������������AQI", notes = "���������������AQI")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "mac", value = "������mac������", required = true, paramType = "query", dataType = "String")
-    })
-    public Map<String, Object> getHourAQIByDevice(HttpServletRequest request) {
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        return historyService.gitHourlyAQIByMacAndTimeslot(parameters);
-    }
-
-    /**
-     * Gets the average by all. ������������������������10������������5������������������������������������������
-     *
-     * @param request the request
-     * @return the average by all
-     * @throws Exception
-     */
-    @GetMapping("all-average")
-    public Map<String, Object> getAllSensorAverageByDevice(HttpServletRequest request) throws Exception {
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        return historyService.getAllSensorAverageByDevice(parameters);
-    }
-
-    /**
-     * Gets the average by sensor.���������������������������������������������
-     *
-     * @param request the request
-     * @return the average by sensor
-     */
-    @GetMapping("sensor-average")
-    public Map<String, Object> getDeviceRankingBySensorAverage(HttpServletRequest request) {
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        return historyService.getDeviceRankingBySensorAverage(parameters);
-    }
-
-    /**
-     * Gets the month average by sensor.������������������������������
-     *
-     * @param request the request
-     * @return the month average by sensor
-     */
-    @GetMapping("month-sensor-average")
-    public Map<String, Object> getMonthAverageBySensor(HttpServletRequest request) {
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        return historyMinutelyService.getMonthAverageBySensor(parameters);
-    }
-
-    @GetMapping("check-activate")
-    public ResultBean<Integer> checkActivate(String macCpuCode) {
-        Integer result = machineActivateService.checkActivate(macCpuCode);
-        return new ResultBean<Integer>(result);
-    }
-
-    @PostMapping("activate-machine")
-    public ResultBean<Integer> activateMachine(HttpServletRequest request) {
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        Integer result = machineActivateService.activateMachine(parameters);
-        return new ResultBean<Integer>(result);
-    }
-
-    /*********************************************
-     * ������������������������������������
-     *********************************************/
-    private String fileName = "Version.xml";
-    private String ip = "47.96.19.115";
-    private String userName = "ftp_user";
-    private String userPwd = "qwer1234";
-    private int port = 21;
-    private String path = "/";
-
-    @RequestMapping(value = "/upgrade", method = RequestMethod.GET)
-    public Version index() {
-        Version version = new Version();
-        FTPClient ftpClient = new FTPClient();
-        try {
-            ftpClient.connect(ip, port);
-            ftpClient.login(userName, userPwd);
-            ftpClient.changeWorkingDirectory(path);
-            ftpClient.enterLocalPassiveMode();
-            // ftpClient.enterLocalActiveMode();
-
-            InputStream ins = ftpClient.retrieveFileStream(fileName);
-            BufferedReader reader = new BufferedReader(new InputStreamReader(ins, "utf-8"));
-            String line;
-            StringBuilder builder = new StringBuilder();
-            while ((line = reader.readLine()) != null) {
-                builder.append(line);
-            }
-            reader.close();
-            if (ins != null) {
-                ins.close();
-            }
-            ftpClient.getReply();
-            String content = builder.toString();
-            if (ftpClient.isConnected()) {
-                ftpClient.logout();
-                ftpClient.disconnect();
-            }
-
-//			String urlStr = "http://www.7drlb.com/apps/Version.xml";
-//			URL realUrl = new URL(urlStr);
-//			URLConnection connection = realUrl.openConnection();
-//			connection.connect();
-//			StringBuffer result = new StringBuffer();
-//			BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "utf-8"));
-//			String line;
-//			while ((line = in.readLine()) != null) {
-//				result.append(line);
-//			}
-//			String content = result.toString();
-
-            SAXReader saxReader = new SAXReader();
-            Document document = saxReader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8"))));
-            Element root = document.getRootElement();
-            version.setVer(root.element("Ver").getText());
-            version.setFileName(root.element("FileName").getText());
-            version.setFileMD5Hash(root.element("FileMD5Hash").getText());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return version;
-    }
-
-    public static void main(String[] args) {
-        ScreenController sc = new ScreenController();
-        Version a = sc.index();
-        System.out.println(a.getVer());
-    }
-
-    /**
-     * ������������ ������
-     */
-    /**
-     * ������������
-     *
-     * @param model
-     * @param code
-     * @param accountId
-     * @return
-     */
-    @RequestMapping(value = "/map-page", method = RequestMethod.GET)
-    public ModelAndView map(ModelAndView model, @RequestParam("areaCode") long code,
-                            @RequestParam("accountId") int accountId) {
-        Account account = accountService.getAccountById(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("map");
-            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("/getSensorsMap")
-    public List<Map<String, String>> getSensorsMapOnly(String mac) {
-        List<Map<String, String>> sensorsMapList = sensorService.getSensorsMaps(mac);
-        return sensorsMapList;
-    }
-
-    @RequestMapping(value = "/get-monitorpoints", method = RequestMethod.GET)
-    @ResponseBody
-    public ResultBean getMonitorpointList(@RequestParam("orgId") String orgId, MapBounds mapBounds,
-                                          @RequestParam("regionCode") String regionCode) {
-        ResultBean<List<MonitorPoint>> resultBean = new ResultBean();
-        Map<String, Object> paramMap = new HashMap<String, Object>();
-        paramMap.put("orgId", orgId);
-        paramMap.put("mapBounds", mapBounds);
-        paramMap.put("regionCode", regionCode);
-        ParameterUtils.getRegionType4RegionCode(paramMap);
-        List<MonitorPoint> list = monitorPointService.queryWithStateByMap(paramMap);
-        resultBean.setData(list);
-        resultBean.setCode(ResultBean.SUCCESS);
-        return resultBean;
-    }
-
-    @RequestMapping(value = "/get-devices", method = RequestMethod.GET)
-    @ResponseBody
-    public ResultBean getDevices(@RequestParam("orgId") Integer orgId, MapBounds mapBounds,
-                                 @RequestParam("regionCode") String regionCode) {
-        ResultBean<List<Device>> resultBean = new ResultBean();
-        Map<String, Object> paramMap = new HashMap<String, Object>();
-        paramMap.put("orgId", orgId);
-        paramMap.put("mapBounds", mapBounds);
-        paramMap.put("regionCode", regionCode);
-        ParameterUtils.getRegionType4RegionCode(paramMap);
-        List<Device> list = deviceService.query(paramMap);
-        resultBean.setData(list);
-        resultBean.setCode(ResultBean.SUCCESS);
-        return resultBean;
-    }
-
-    @RequestMapping(value = "get-devices-for-popup", method = RequestMethod.GET)
-    @ResponseBody
-    public PageResult getDevicesForPopup(@RequestParam("orgId") Integer orgId, String name, Integer pageSize,
-                                         Integer pageNo) {
-        return deviceService.query(orgId, name, pageSize, pageNo);
-    }
-
-    @RequestMapping(value = "get-devices-by-mid-oid", method = RequestMethod.GET)
-    @ResponseBody
-    public PageResult getDevicesByMidOid(@RequestParam("orgId") Integer orgId, @RequestParam("mpId") Integer mpId,
-                                         Integer pageSize, Integer pageNo) {
-        return deviceService.query(orgId, mpId, pageSize, pageNo);
-    }
-
-    @RequestMapping(value = "/get-real-state-data", method = RequestMethod.POST)
-    @ResponseBody
-    public JsonData getRealStateAndData(@RequestBody JSONObject paramMap) {
-        JsonData jsonData = new JsonData();
-        Map<String, Object> returnMap = new HashMap<String, Object>();
-        returnMap.put("layer", paramMap.getString("layer"));
-        // ���������������������������
-        if (!CollectionUtils.isEmpty(paramMap.getJSONArray("markerKeys"))) {
-            JSONArray markerKeys = paramMap.getJSONArray("markerKeys");
-            List<Map<String, String>> markers = null;
-            if ("equipments".equals(paramMap.getString("layer"))) {
-                markers = deviceService.queryDevicesState(markerKeys.toJavaList(String.class), true);
-            } else {// ���������������id���state
-                String orgId = paramMap.getString("orgId");
-                String areaCode = paramMap.getString("areaCode");
-                for (Object mPointId : markerKeys) {
-                    markers = monitorPointService.queryMonitroPointsState(markerKeys.toJavaList(Integer.class));
-                }
-            }
-            returnMap.put("markers", markers);
-        }
-        if (paramMap.getJSONArray("popupEquMacs") != null && paramMap.getJSONArray("popupEquMacs").size() > 0) {
-            JSONArray popupEquMacs = paramMap.getJSONArray("popupEquMacs");
-            List<Map<String, String>> popupEquWithStates = null;
-            for (Object mac : popupEquMacs) {
-                popupEquWithStates = deviceService.queryDevicesState(popupEquMacs.toJavaList(String.class), false);
-            }
-            // ���������������������������
-            returnMap.put("popupEquStates", popupEquWithStates);
-        }
-        jsonData.setExtData(returnMap);
-        return jsonData;
-    }
-
-    @GetMapping("monitor_points")
-    public ResultBean<List<MonitorPoint>> getMonitorPointsByOrganizationId(Integer orgId) {
-        // Map<String, Object> parameters = getParametersStartingWith(request, null);
-        List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByOrganizationId(orgId);
-        return new ResultBean<List<MonitorPoint>>(monitorPoints);
-    }
-
-    @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);
-
-        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));
-        }
-        return new ResultBean<List<Map<String, Object>>>(list);
-    }
-
-    @GetMapping("report_alarm_datas")
-    public ResultBean<List<Map<String, Object>>> getAlarmData(HttpServletRequest request) throws Exception {
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        ParameterUtils.getTimeType4Time(parameters);
-        // parameters.put("type", "month");
-        String sensorKey = "list";
-        if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {
-            parameters.put("description", "description");
-        } else {
-            sensorKey = parameters.remove("sensorKey").toString();
-            List<String> sensorKeys = new ArrayList<String>();
-            sensorKeys.add(sensorKey);
-            parameters.put("sensors", sensorKeys);
-        }
-        if (!ObjectUtils.isEmpty(parameters.get("organizationId"))) {
-            if (!Constants.isNotSpecialOrgId(Integer.valueOf(parameters.get("organizationId").toString()))) {
-                parameters.remove("organizationId");
-            }
-        }
-        Map pieData = alarmDailyService.getPieData(parameters);
-        List<Map<String, Object>> list = (List<Map<String, Object>>) pieData.get(sensorKey);
-        return new ResultBean<List<Map<String, Object>>>(list);
-    }
-
-    /**
-     * ���������������id������������������version���������
-     *
-     * @param mptid
-     * @return
-     */
-    @GetMapping("getvers")
-    public ResultBean<List<Integer>> getVersions(Integer mptid) {
-        return new ResultBean<>(monitorPointService.queryVersionsById(mptid));
-    }
-
-    @GetMapping("region_ranking_data")
-    @ApiOperation(value = "������������������", notes = "������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "regionCode", value = "���������", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "dimension", value = "������(profession���region���monitorPoint������)", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "accountId", value = "������id", required = true, paramType = "query", dataType = "int"),
-            @ApiImplicitParam(name = "timeType", value = "������������(month���day���hour������)", required = true, paramType = "query", dataType = "int"),})
-    public ResultBean<List<Map<String, Object>>> getRegionRankingData(HttpServletRequest request) {
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        List<Map<String, Object>> list = historyService.getRegionRankingData(parameters);
-        return new ResultBean<List<Map<String, Object>>>(list);
-    }
-
-    // todo
-    @Value(value = "classpath:system/realTimeMonitorLayout.json")
-    private org.springframework.core.io.Resource resource;
-
-    @ApiOperation(value = "������������������������������", notes = "")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "primaryKey", defaultValue = "898607b0101730391967", value = "���������������mac������������id", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "type", defaultValue = "device", value = "���������'monitorPoint'���'device'", required = true, paramType = "query", dataType = "String"),})
-    @GetMapping("rtm-layout")
-    public ResultBean realTimeMonitorLayout(String primaryKey, String type) {
-        RealTimeDeviceLayout rtdLayout = null;
-        if (type != null && type.equals("device")) {
-            Device device = deviceService.getDeviceByMac(primaryKey, false);
-            if (device != null && device.getOrganizationIds() != null && device.getOrganizationIds().size() > 0
-                    && device.getDeviceVersionId() != null) {
-                Integer orgId = device.getOrganizationIds().get(0);
-                DeviceVersion deviceVersion = deviceVersionService.queryVersionById(device.getDeviceVersionId());
-                rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(orgId, deviceVersion.getVersion());
-            } else {
-                String errMsg = "device ���������������" + JSON.toJSONString(device);
-                log.warn(errMsg);
-                return ResultBean.fail(errMsg);
-            }
-
-        } else {
-            MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(Integer.parseInt(primaryKey));
-            List<DeviceVersion> versionList = deviceVersionService.queryByMpointId(monitorPoint.getId());
-            if (versionList.size() > 0) {
-                List<Integer> versionNolist = versionList.stream().map(item -> {
-                    return item.getVersion();
-                }).collect(Collectors.toList());
-                rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(monitorPoint.getOrganizationId(), versionNolist);
-                if (rtdLayout == null) {
-                    return ResultBean.fail();
-                }
-            }
-        }
-        if (rtdLayout != null && rtdLayout.getDefaultMonitorItems().size() == 0) {
-            rtdLayout.getDefaultMonitorItems().addAll(rtdLayout.getCoreMonitorItems());
-        }
-        return new ResultBean(rtdLayout == null ? new RealTimeDeviceLayout() : rtdLayout);
-    }
-
-    @GetMapping("report_avg_data")
-    @ApiOperation(value = "������������������������������", notes = "������������������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "monitorPoint", value = "���������id", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "mac", value = "������mac", required = false, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "sensorKey", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "time", value = "������,������(���������2018-03)", required = true, paramType = "query", dataType = "String"),})
-    public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgDataBySensorKey(HttpServletRequest request)
-            throws Exception {
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        ParameterUtils.getTimeType4Time(parameters);
-        parameters.put("monitorPointId", parameters.remove("monitorPoint"));
-        String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
-        parameters.put("sensors", Arrays.asList(sensorKeys));
-        // monitorPointService.isCompensateCalculation(parameters);
-        List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
-
-        for (Map<String, Object> map : list) {
-            String time = map.get("time").toString();
-            time = time.substring(time.length() - 2);
-            map.put("time", Integer.valueOf(time));
-            List<Number> values = new ArrayList<Number>();
-            for (String string : sensorKeys) {
-                values.add((Number) map.remove(string));
-            }
-            map.put("values", values);
-        }
-        return new ResultBean<List<Map<String, Object>>>(list);
-    }
-
-    @GetMapping("getmpoint-byid")
-    @ApiOperation(value = "���������������������", notes = "���������������������,���������������������������������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "monitorPointId", defaultValue = "1", value = "���������id", required = true, paramType = "query", dataType = "Integer"),})
-    public ResultBean<MonitorPoint> getMonitorPointById(Integer monitorPointId) {
-        MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(monitorPointId);
-        return new ResultBean<>(monitorPoint);
-    }
-
-    @Resource
-    HangzhouAqiService hangzhouAqiService;
-
-    @GetMapping("aqi24hours")
-    @ApiOperation(value = "������24������aqi������", notes = "������24������������aqi������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "orgid", defaultValue = "5", value = "������id", required = true, paramType = "query", dataType = "Integer"),})
-    public ResultBean<List<Map<String, Object>>> getAqi24HoursNC(@RequestParam("orgid") Integer organizationId) {
-        return new ResultBean<>(hangzhouAqiService.queryAqi24Hours(organizationId));
-    }
-
-    @GetMapping("mpt-dev-summary")
-    @ApiOperation(value = "���������������������������������", notes = "���������������������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "orgid", defaultValue = "5", value = "������id", required = true, paramType = "query", dataType = "Integer"),})
-    public ResultBean<Map> getMptAndDevSummary(@RequestParam("orgid") Integer organizationId) {
-        Map<String, Map> result = new HashMap<>(2);
-        Integer mptCount = monitorPointService.countOfSubOrgs(organizationId);
-        Map monitorPointSummary = new HashMap();
-        monitorPointSummary.put("all", mptCount);
-        Map deviceSummary = deviceService.queryDeviceStateSummary(organizationId);
-        result.put("monitorPoint", monitorPointSummary);
-        result.put("device", deviceSummary);
-        return new ResultBean<>(result);
-    }
-
-    @GetMapping("weather")
-    @ApiOperation(value = "������������������������", notes = "������������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String")})
-    public ResultBean<Map<String, Object>> getWeatherDataByRegion(HttpServletRequest request) throws Exception {
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        Map<String, Object> map = weatherService.getWeatherDataByRegion(parameters);
-        return new ResultBean<Map<String, Object>>(map);
-    }
-
-    @GetMapping("actual")
-    @ApiOperation(value = "���������������������������������", notes = "���������������������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "accountId", defaultValue = "1", value = "���������������id", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "sensorKey", defaultValue = "e1,e2,e3", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "time", defaultValue = "", value = "������(long������������)", required = false, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "interval", defaultValue = "30", value = "���������������������", required = true, paramType = "query", dataType = "Integer"),})
-    public ResultBean<Map<String, Object>> getActualDataByRegion(HttpServletRequest request) throws Exception {
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        Map<String, Object> map = historyService.getActualDataByRegion(parameters);
-        return new ResultBean<Map<String, Object>>(map);
-    }
-
-    @GetMapping("quality")
-    @ApiOperation(value = "������������������", notes = "������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String")})
-    public ResultBean<Map<String, Object>> getQualityCountDayByRegion(HttpServletRequest request) throws Exception {
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        Map<String, Object> map = qualityDailyService.getQualityCountDayByRegion(parameters);
-        return new ResultBean<Map<String, Object>>(map);
-    }
-
-    @GetMapping("monitorpoints-devices")
-    @ApiOperation(value = "���������������������������", notes = "���������������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "organizationId", defaultValue = "8", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
-            @ApiImplicitParam(name = "regionCode", defaultValue = "320583", value = "���������", required = true, paramType = "query", dataType = "String")})
-    public ResultBean<List<MonitorPoint>> getMonitorPointsAndDevicesByRegion(HttpServletRequest request)
-            throws Exception {
-        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
-        List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
-        return new ResultBean<List<MonitorPoint>>(monitorPoints);
-    }
-
-    @GetMapping("devices-state")
-    @ApiOperation(value = "������������������", notes = "������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "organizationId", defaultValue = "8", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
-            @ApiImplicitParam(name = "regionCode", defaultValue = "320583", value = "���������", required = true, paramType = "query", dataType = "String")})
-    public ResultBean<Collection<Object>> getDevicesStateByRegion(HttpServletRequest request) throws Exception {
-        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
-        Collection<Object> monitorPoints = monitorPointService.getDevicesStateByRegion(parameters);
-        return new ResultBean<Collection<Object>>(monitorPoints);
-    }
-
-    @Resource
-    private HistoryDailyService historyDailyService;
-
-    @GetMapping("emissions")
-    @ApiOperation(value = "���������", notes = "���������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
-            @ApiImplicitParam(name = "time", defaultValue = "2019", value = "���������������", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "sensorKey", defaultValue = "e27", value = "������������������������key", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "regionCode", defaultValue = "130000", value = "���������", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "monitorPointId", value = "���������id(���������376)", required = false, paramType = "query", dataType = "int"),
-            @ApiImplicitParam(name = "mac", value = "������mac(���������vocscxwnm00001)", required = false, paramType = "query", dataType = "String")})
-    public ResultBean<List<Map<String, Object>>> getemissionsData(HttpServletRequest request) throws Exception {
-        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
-        List<Map<String, Object>> result = historyDailyService.getEmissionsData(parameters);
-        return new ResultBean<List<Map<String, Object>>>(result);
-    }
-
-    @GetMapping("overproof")
-    @ApiOperation(value = "������������", notes = "������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
-            @ApiImplicitParam(name = "time", defaultValue = "2019", value = "���������������", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "sensorKey", defaultValue = "e27", value = "������������������������key", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "overproofRatio", defaultValue = "0", value = "������������(0,1,2,3)(������,������100%,������200%,������300%)", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "regionCode", defaultValue = "130000", value = "���������", required = true, paramType = "query", dataType = "String")})
-    public ResultBean<Map> getOverproofData(HttpServletRequest request) throws Exception {
-        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
-        Map result = historyDailyService.getOverproofData(parameters);
-        return new ResultBean<Map>(result);
-    }
-
-    @GetMapping("limit-device")
-    @ApiOperation(value = "���������������������������", notes = "���������������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "mac", defaultValue = "p5dnd7a0391956", value = "������mac���", required = true, paramType = "query", dataType = "String")})
-    public ResultBean<List<Map<String, Object>>> getLimitDataByDevice(HttpServletRequest request) throws Exception {
-        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
-        String density = deviceService.getLimitDataByDevice(parameters);
-        JSONObject parseObject = JSONObject.parseObject(density);
-        List<Map<String, Object>> resuList = new ArrayList<Map<String, Object>>();
-        for (Map.Entry entry : parseObject.entrySet()) {
-            resuList.add(new HashMap<String, Object>() {
-                {
-                    put("key", entry.getKey());
-                    put("limit", entry.getValue());
-                }
-            });
-        }
-        return new ResultBean<List<Map<String, Object>>>(resuList);
-    }
-
-    /**
-     * @param model
-     * @param request
-     * @return
-     * @throws Exception
-     * @description ������������mac������������������������������������������
-     * @author ZhuDongming
-     * @date 2019-06-05 10:02:10
-     */
-    @GetMapping("/map-traceability")
-    @ApiOperation(value = "������������������", notes = "������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "monitorPointId", value = "���������id(���������319)", required = true, paramType = "query", dataType = "int"),
-            @ApiImplicitParam(name = "mac", value = "������mac������(���������p5dnd7a0391993)", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "sensorKey", value = "������������������������key(���������e1)", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "time", value = "������������(���������2019-09-08)", required = true, paramType = "query", dataType = "String")})
-    public ModelAndView traceability(ModelAndView model, HttpServletRequest request) throws Exception {
-        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
-        Integer monitorPointId = Integer.parseInt(parameters.get("monitorPointId").toString());
-        MonitorPoint monitorPoint = monitorPointService.queryWithRelationById(monitorPointId);
-        String mac = parameters.get("mac").toString();
-        String sensorKey = parameters.get("sensorKey").toString();
-        String time = parameters.get("time").toString();
-        if (monitorPoint != null && mac != null && sensorKey != null && time != null) {
-            Map<String, Double> resultMap = historyDailyService.getTraceabilityData(parameters);
-            JSONObject params = new JSONObject();
-            Long code = monitorPoint.getAreaCode().longValue();
-            String regionName = areaService.queryFullNameByCode(code);
-            Device device = deviceService.getDeviceByMac(mac, false);
-            Device deviceSecond = deviceService.getDeviceByLongitudeAsc(mac);
-            params.put("sensorInfo", resultMap);
-            params.put("regionCode", code);
-            params.put("regionName", regionName);
-            params.put("monitorPoint", monitorPoint);
-            params.put("device", device);
-            params.put("deviceSecond", deviceSecond);
-            String paramsJson = params.toJSONString();
-            model.addObject("traceabilityParams", paramsJson);
-            model.setViewName("traceability");
-            return model;
-        } else {
-            StringBuilder msg = new StringBuilder();
-            msg.append(" param[0] monitorPointId:");
-            msg.append(monitorPointId);
-            msg.append(" param[0] mac:");
-            msg.append(mac);
-            msg.append(" param[0] sensorKey:");
-            msg.append(sensorKey);
-            msg.append(" param[0] time:");
-            msg.append(time);
-            log.warn(msg);
-            model.setViewName("403");
-            return model;
-        }
-    }
-    
-    /*@GetMapping("getSensor")
-	@ApiOperation(value = "������������", notes = "������������")
-	@ApiImplicitParams(value = {
-			@ApiImplicitParam(name = "mac", value = "������MN���", required = true, paramType = "query", dataType = "String")
-	})
-	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);
-	}*/
-
-    @GetMapping("getSensorByMonitorPointId")
-    @ApiOperation(value = "������������", notes = "������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "monitor_point_id", value = "������������id", required = true, paramType = "query", dataType = "String")
-    })
-    public ResultBean<List<Map<String, Object>>> getSensorByMonitorPointId(HttpServletRequest request) throws Exception {
-        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
-        String monitor_point_id = (String) parameters.get("monitor_point_id");
-        List<Map<String, Object>> map = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
-        return new ResultBean<List<Map<String, Object>>>(map);
-    }
-
-    @GetMapping("getSensorByDeviceId")
-    @ApiOperation(value = "������������������������", notes = "������������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id", value = "������id", required = true, paramType = "query", dataType = "String")
-    })
-    public ResultBean<List<Map<String, Object>>> getSensorByDeviceId(HttpServletRequest request) throws Exception {
-        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
-        String id = (String) parameters.get("id");
-        List<Map<String, Object>> list = sensorService.getSensorByDeviceId(id);
-        Map<String, Object> map = list.get(0);
-        String monitor_point_id = map.get("monitor_point_id").toString();
-        List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
-        for (Map<String, Object> sensorMap : list) {
-            for (Map<String, Object> sensorUnitMap : sensorUnitList) {
-                if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {
-                    sensorMap.put("unit", sensorUnitMap.get("name"));
-                }
-            }
-        }
-        return new ResultBean<List<Map<String, Object>>>(list);
-    }
-
-    @GetMapping("getSensorWithUnitByMonitorPointId")
-    @ApiOperation(value = "������������������������", notes = "������������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "monitor_point_id", value = "������id", required = true, paramType = "query", dataType = "String")
-    })
-    public ResultBean<List<Map<String, Object>>> getSensorWithUnitByMonitorPointId(HttpServletRequest request) throws Exception {
-        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
-        String monitor_point_id = (String) parameters.get("monitor_point_id");
-        List<Map<String, Object>> list = sensorService.getSensorByMonitorPointId(monitor_point_id);
-        List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
-        for (Map<String, Object> sensorMap : list) {
-            for (Map<String, Object> sensorUnitMap : sensorUnitList) {
-                if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensorKey"))) {
-                    sensorMap.put("unit", sensorUnitMap.get("name"));
-                }
-            }
-        }
-        return new ResultBean<List<Map<String, Object>>>(list);
-    }
-
-    @GetMapping("AIForecast")
-    @ApiOperation(value = "AI������", notes = "AI������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "monitorPoint", value = "���������id", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "mac", value = "������mac", required = false, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "sensorKey", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "time", value = "������,���(���������2018-03-06)", required = true, paramType = "query", dataType = "String"),
-    })
-    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);
-        DateFormat df1 = new SimpleDateFormat("yyyy-MM-dd");
-        String alterTime = df1.format(date.getTime() - 15 * 24 * 60 * 60 * 1000);
-        parameters.put("time", alterTime);
-        ParameterUtils.getTimeType4Time(parameters);
-        String monitor_point_id = (String) parameters.get("monitorPoint");
-        parameters.put("monitorPointId", parameters.remove("monitorPoint"));
-        String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
-        parameters.put("sensors", Arrays.asList(sensorKeys));
-        List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
-
-        Map<String, Object> mpMap = new HashMap<>();
-        mpMap = monitorPointService.selectAllById(monitorPoint);
-        //������������map���������������������������������������������������
-        Map<String, Object> weatherParameters = new HashMap<>();
-        weatherParameters.put("organizationId", mpMap.get("organization_id"));
-        weatherParameters.put("time", intoTime);
-        //������������������
-        Map<String, Object> weatherMap = new HashMap<>();
-        Map<String, Object> tempMap = new HashMap<>();
-        Boolean tf = false;
-        for (int i = 0; i < sensorKeys.length; i++) {
-            if (sensorKeys[i].equals("e7")) {
-                tf = true;
-            }
-        }
-        if (tf) {
-            weatherMap = weatherService.get15DayWeatherDataByRegion(weatherParameters);
-            tempMap = TempAllocationUtils.tempAllocation(weatherMap);
-        }
-        //������������������
-        Map<String, Map<String, Object>> sensorUnitMap = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);
-
-        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 (tempMap != null) {
-                map.put("temp", tempMap.get(map.get("time").toString()));
-            }
-            List<Number> values = new ArrayList<Number>();
-            List<String> units = new ArrayList<String>();
-            for (String string : sensorKeys) {
-                if (sensorUnitMap != null && !sensorUnitMap.isEmpty()) {
-                    if (sensorUnitMap.get(string) != null) {
-                        units.add(sensorUnitMap.get(string).get("name").toString());
-                        String rules = sensorUnitMap.get(string).get("rules").toString();
-                        rules = rules.replace("{0}", "a");
-                        rules = rules.replace("d", "");
-                        Expression expression = AviatorEvaluator.compile(rules);
-                        Double value;
-                        Map<String, Object> ev = new HashMap<>();
-                        ev.put("a", map.get(string));
-                        value = (Double) expression.execute(ev);
-                        //������������������
-                        DecimalFormat df = new DecimalFormat("#.00");
-                        value = Double.parseDouble(df.format(value));
-                        values.add(value);
-                    } else {
-                        Map<String, Object> sensorMap = sensorService.getSensorBySensorKey(string);
-                        units.add(sensorMap.get("unit").toString());
-                        values.add((Number) map.remove(string));
-                    }
-                } else {
-                    Map<String, Object> sensorMap = sensorService.getSensorBySensorKey(string);
-                    units.add(sensorMap.get("unit").toString());
-                    values.add((Number) map.remove(string));
-                }
-                //values.add((Number) map.remove(string));
-            }
-            map.put("values", values);
-            map.put("units", units);
-        }
-        return new ResultBean<List<Map<String, Object>>>(list);
-    }
-
-    @GetMapping("getWeather")
-    @ApiOperation(value = "������������������", notes = "������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "time", value = "������,���(���������2018-03-06)", required = true, paramType = "query", dataType = "String"),
-    })
-    public ResultBean<Map<String, Object>> getWeather(HttpServletRequest request) throws Exception {
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        Map<String, Object> map = weatherService.get15DayWeatherDataByRegion(parameters);
-        Map<String, Object> tempMap = TempAllocationUtils.tempAllocation(map);
-        return new ResultBean<Map<String, Object>>(tempMap);
-    }
-
-    @GetMapping("/uavTrajectory")
-    @ApiOperation(value = "���������������������������", notes = "���������������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392068���", 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 uavTrajectory(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 endYearAndDay = et.substring(0, et.lastIndexOf("-"));
-        String endHour = et.substring(et.lastIndexOf("-") + 1);
-        String endTime = endYearAndDay + " " + endHour + ":00:00";
-        parameters.put("startTime", startTime);
-        parameters.put("endTime", endTime);
-        String mac = parameters.get("mac").toString();
-        if (mac != null && mac.length() != 0) {
-            List<List<Map<String, Object>>> sensorData = historyMinutelyService.getSensorData(parameters);
-            Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);
-            List<Map<String, Object>> sensorList = new ArrayList<>();
-            List<Map<String, Object>> sensorListMin = new ArrayList<>();
-            List<Map<String, Object>> sensorListMax = new ArrayList<>();
-            if (sensorData.size() == 3) {
-                sensorList = sensorData.get(0);
-                sensorListMin = sensorData.get(1);
-                sensorListMax = sensorData.get(2);
-            }
-            JSONObject params = new JSONObject();
-            params.put("sensorInfo", sensorList);
-            params.put("sensorInfoMin", sensorListMin);
-            params.put("sensorInfoMax", sensorListMax);
-            params.put("sensorsMap", sensorsMap);
-            String paramsJson = params.toJSONString();
-            model.addObject("uavTrajectoryParams", paramsJson);
-            model.setViewName("uavtrajectory");
-            return model;
-        } else {
-            StringBuilder msg = new StringBuilder();
-            msg.append(" param[0] mac:");
-            msg.append(mac);
-            log.warn(msg);
-            model.setViewName("403");
-            return model;
-        }
-    }
-
-    @GetMapping("/pollutionSource")
-    @ApiOperation(value = "������������������", notes = "������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "mac", value = "������mac������(������898607b0101730392251)", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "sensorKey", value = "������������������������key(���������e1)", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "time", value = "������������(���������2019-09-01-10)", required = true, paramType = "query", dataType = "String")})
-    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 Hour = timeStr.substring(timeStr.lastIndexOf("-") + 1);
-        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();
-        Point dirPoint = historyHourlyService.getDirPoint(parameters);
-        Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceDataByHour(parameters);
-        if (MapUtils.isEmpty(getPollutionSourceData)) {
-            getPollutionSourceData = historyHourlyService.getPollutionSourceDataAll(parameters);
-        }
-        if (MapUtils.isEmpty(getPollutionSourceData)) {
-            getPollutionSourceData = new HashMap<>();
-        }
-        String mac = parameters.get("mac").toString();
-        Device device = deviceService.getDeviceByMac(mac, false);
-        JSONObject params = new JSONObject();
-        params.put("device", device);
-        params.put("month", month);
-        params.put("dirPoint", dirPoint);
-        params.put("getPollutionSourceData", getPollutionSourceData);
-        String paramsJson = params.toJSONString();
-        model.addObject("pollutionSourceParams", paramsJson);
-        model.setViewName("pollutionsource");
-        return model;
-    }
-
-    @GetMapping("getAirQualityComparison")
-    @ApiOperation(value = "������������������", notes = "������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "monitor_point_id", defaultValue = "5", value = "������������id", required = true, paramType = "query", dataType = "String")})
-    public ResultBean<Map<String, Object>> getAirQualityComparison(HttpServletRequest request) throws Exception {
-        Map<String, Object> parameters = getParametersStartingWith(request, null);
-        Map<String, Object> map = weatherService.getWeatherDataByRegion(parameters);
-        Map<String, Double> sensorMap = new HashMap<>();
-        sensorMap.put("e1", Double.parseDouble(map.get("pm25").toString()));
-        sensorMap.put("e2", Double.parseDouble(map.get("pm10").toString()));
-        sensorMap.put("e11", Double.parseDouble(map.get("so2").toString()));
-        sensorMap.put("e16", Double.parseDouble(map.get("no2").toString()));
-        sensorMap.put("e10", Double.parseDouble(map.get("co").toString()));
-        sensorMap.put("e15", Double.parseDouble(map.get("o3").toString()));
-        Map<String, Object> StateControl = AQICalculation.hourlyAQI(sensorMap);
-        Map<String, Object> hourAqi = historyService.gitHourlyAQIByMonitorPointIdAndTimeslot(parameters);
-        Map<String, Object> returnMap = new HashMap<>();
-        returnMap.put("MonitorPointAQI", hourAqi.get("AQI"));
-        returnMap.put("StateControlAQI", StateControl.get("AQI"));
-        return new ResultBean<Map<String, Object>>(returnMap);
-    }
-
-
-    @GetMapping("mointorPointRank")
-    @ApiOperation(value = "������������������", notes = "������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "accountId", value = "������id", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "sensor", value = "������", required = true, paramType = "query", dataType = "String")
-    })
-    public ResultBean<List<Map<String, Object>>> getMointorPointRank(HttpServletRequest request) {
-        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
-        String id = parameters.get("accountId").toString();
-        String sensor = parameters.get("sensor").toString();
-        Map<String, Object> account = accountService.getOrganizationIdByAccountId(id);
-        //������������id������������������������������
-        account.put("sensor", sensor);
-        List<Map<String, Object>> rankList = historyService.getMointorPointRankByOrganizationId(account);
-        List<Map<String, Object>> returnList = new ArrayList<>();
-        for (Map<String, Object> map : rankList) {
-            boolean contains = map.containsKey("sensor");
-            if (contains) {
-                returnList.add(map);
-            }
-        }
-        return new ResultBean<List<Map<String, Object>>>(returnList);
-    }
-
-    @GetMapping("/carTrajectory")
-    @ApiOperation(value = "���������������������", notes = "���������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392082���", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "startTime", value = "������������(���������2020-03-19-14)", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "endTime", value = "������������(���������2020-03-19-17)", required = true, paramType = "query", dataType = "String")
-    })
-    public ModelAndView carTrajectory(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 endYearAndDay = et.substring(0, et.lastIndexOf("-"));
-        String endHour = et.substring(et.lastIndexOf("-") + 1);
-        String endTime = endYearAndDay + " " + endHour + ":00:00";
-        parameters.put("startTime", startTime);
-        parameters.put("endTime", endTime);
-        String mac = parameters.get("mac").toString();
-        if (mac != null && mac.length() != 0) {
-            List<List<Map<String, Object>>> sensorData = historyService.getCarSensorData(parameters);
-            Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);
-            List<Map<String, Object>> sensorList = new ArrayList<>();
-            if (sensorData.size() == 3) {
-                sensorList = sensorData.get(0);
-            }
-            JSONObject params = new JSONObject();
-            params.put("sensorInfo", sensorList);
-            params.put("sensorsMap", sensorsMap);
-            String paramsJson = params.toJSONString();
-            model.addObject("carTrajectoryParams", paramsJson);
-            model.setViewName("cartrajectory");
-            return model;
-        } else {
-            StringBuilder msg = new StringBuilder();
-            msg.append(" param[0] mac:");
-            msg.append(mac);
-            log.warn(msg);
-            model.setViewName("403");
-            return model;
-        }
-    }
-
-    @GetMapping("device-excel")
-    @ApiOperation(value = "������������������������", notes = "������������������������")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "organizationId", defaultValue = "8", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
-            @ApiImplicitParam(name = "regionCode", defaultValue = "320583", value = "���������", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "time", value = "������(���������2020-04-09���2019-04)", required = true, paramType = "query", dataType = "String")})
-    public ResultBean<List<Map<String, Object>>> getDevicesDataToExcel(HttpServletRequest request) throws Exception {
-        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
-        ParameterUtils.getTimeType4Time(parameters);
-        Object sensorKey = parameters.get("sensorKey");
-        parameters.put("sensorKeys", Arrays.asList(sensorKey));
-        List<String> macList = new ArrayList<>();
-        List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
-        for (MonitorPoint m : monitorPoints) {
-            for (Device d : m.getDevices()) {
-                macList.add(d.getMac());
-            }
-        }
-        parameters.put("macs", macList);
-        List<Map<String, Object>> list = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(macList)) {
-            list = historyMinutelyService.getDevicesAvgDataToExcel(parameters);
-        }
-        return new ResultBean<List<Map<String, Object>>>(list);
-    }
-
-}
+package com.moral.controller;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.log4j.Logger;
+import org.dom4j.Document;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cglib.beans.BeanMap;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+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;
+
+/**
+ * The Class ScreenController.������������
+ */
+@RestController
+@RequestMapping("/screen")
+@CrossOrigin(origins = "*", maxAge = 3600)
+@SuppressWarnings({"rawtypes", "unchecked", "unused"})
+@Api(tags = "Screen", description = "������������")
+public class ScreenController {
+    public static Logger log = Logger.getLogger(ScreenController.class);
+    @Resource
+    AlarmConfigService alarmConfigService;
+    @Resource
+    AreaService areaService;
+
+    @Resource
+    SensorService sensorService;
+    @Resource
+    SensorUnitService sensorUnitService;
+    @Resource
+    MonitorPointService monitorPointService;
+    @Resource
+    DeviceVersionService deviceVersionService;
+
+    /**
+     * The screen service.
+     */
+    @Resource
+    private HistoryService historyService;
+
+    /**
+     * The account service.
+     */
+    @Resource
+    private AccountService accountService;
+
+    /**
+     * The device service.
+     */
+    @Resource
+    private DeviceService deviceService;
+
+    @Resource
+    private HistoryHourlyService historyHourlyService;
+
+    @Resource
+    private HistoryMinutelyService historyMinutelyService;
+
+    @Resource
+    private MachineActivateService machineActivateService;
+
+    /** The resource. */
+//	@Value(value = "classpath:system/alarmLevels.json")
+//	private org.springframework.core.io.Resource resource;
+
+    /**
+     * The redis template.
+     */
+    @Resource
+    private RedisTemplate<String, String> redisTemplate;
+
+    /**
+     * The level key.
+     */
+    private String levelKey = "alarm_";
+
+    @Resource
+    private AlarmDailyService alarmDailyService;
+    @Resource
+    private OrganizationLayoutService orgLayoutService;
+    @Resource
+    private DeviceVersionService dviceVersionService;
+    @Resource
+    private OrganizationService organizationService;
+    @Resource
+    private DictionaryDataService dictionaryDataService;
+
+    @Resource
+    private WeatherService weatherService;
+
+    @Resource
+    private QualityDailyService qualityDailyService;
+
+    /**
+     * Screen login. ������������
+     *
+     * @param request the request
+     * @return the map
+     */
+    @GetMapping("login")
+    public Map<String, Object> screenLogin(HttpServletRequest request) {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
+            resultMap.put("msg", "������������������������������������");
+            resultMap.put("accountId", -1);
+        } else {
+            resultMap = accountService.screenLogin(parameters);
+            // ������������������������������������������
+            Object orgId = resultMap.get("orgId");
+            if (resultMap.get("orgId") != null && resultMap.get("orgId") instanceof Integer) {
+                StringBuilder areaNamesBuilder = new StringBuilder("������");
+                if (!((Integer) orgId).equals(dictionaryDataService.querySupperOrgId())) {
+                    Organization organization = organizationService.getOrganizationById((Integer) orgId);
+                    if (organization.getAreaNames() != null) {
+                        Map<String, String> areaNameMap = BeanUtils.beanToMap(organization.getAreaNames());
+                        List<String> names = areaNameMap.entrySet().stream().filter(item -> {
+                            return item.getValue() != null;
+                        }).map(item -> {
+                            return item.getValue();
+                        }).collect(Collectors.toList());
+                        AreaNames areaNames = organization.getAreaNames();
+                        areaNamesBuilder.append("/");
+                        areaNamesBuilder.append(String.join("/", names));
+                    }
+                    // ������������
+                    if (organization.getRank() != null && organization.getRank() == 0) {
+                        resultMap.put("type", "enterprise");
+                    } else {
+                        resultMap.put("type", "government");
+                    }
+                    Number mapAreaCode = null;
+                    if (organization.getVillageCode() != null) {
+                        mapAreaCode = organization.getVillageCode();
+                    } else if (organization.getTownCode() != null) {
+                        mapAreaCode = organization.getTownCode();
+                    } else if (organization.getAreaCode() != null) {
+                        mapAreaCode = organization.getAreaCode();
+                    } else if (organization.getCityCode() != null) {
+                        mapAreaCode = organization.getCityCode();
+                    } else if (organization.getProvinceCode() != null) {
+                        mapAreaCode = organization.getProvinceCode();
+                    }
+                    resultMap.put("mapAreaCode", mapAreaCode.toString());
+                }
+                resultMap.put("mapPath", areaNamesBuilder.toString());
+            }
+        }
+        return resultMap;
+    }
+
+    @GetMapping("loginNew")
+    public Map<String, Object> screenLoginNew(HttpServletRequest request) {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
+            resultMap.put("msg", "������������������������������������");
+            resultMap.put("accountId", -1);
+        } else {
+            resultMap = accountService.screenLoginNew(parameters);
+            // ������������������������������������������
+            Object orgId = resultMap.get("orgId");
+            if (resultMap.get("orgId") != null && resultMap.get("orgId") instanceof Integer) {
+                StringBuilder areaNamesBuilder = new StringBuilder("������");
+                if (!((Integer) orgId).equals(dictionaryDataService.querySupperOrgId())) {
+                    Organization organization = organizationService.getOrganizationById((Integer) orgId);
+                    if (organization.getAreaNames() != null) {
+                        Map<String, String> areaNameMap = BeanUtils.beanToMap(organization.getAreaNames());
+                        List<String> names = areaNameMap.entrySet().stream().filter(item -> {
+                            return item.getValue() != null;
+                        }).map(item -> {
+                            return item.getValue();
+                        }).collect(Collectors.toList());
+                        AreaNames areaNames = organization.getAreaNames();
+                        areaNamesBuilder.append("/");
+                        areaNamesBuilder.append(String.join("/", names));
+                    }
+                    // ������������
+                    if (organization.getRank() != null && organization.getRank() == 0) {
+                        resultMap.put("type", "enterprise");
+                    } else {
+                        resultMap.put("type", "government");
+                    }
+                    Number mapAreaCode = null;
+                    if (organization.getVillageCode() != null) {
+                        mapAreaCode = organization.getVillageCode();
+                    } else if (organization.getTownCode() != null) {
+                        mapAreaCode = organization.getTownCode();
+                    } else if (organization.getAreaCode() != null) {
+                        mapAreaCode = organization.getAreaCode();
+                    } else if (organization.getCityCode() != null) {
+                        mapAreaCode = organization.getCityCode();
+                    } else if (organization.getProvinceCode() != null) {
+                        mapAreaCode = organization.getProvinceCode();
+                    }
+                    resultMap.put("mapAreaCode", mapAreaCode.toString());
+                }
+                resultMap.put("mapPath", areaNamesBuilder.toString());
+            }
+        }
+        return resultMap;
+    }
+
+    /**
+     * Gets the equipment states. ���������������������������������������
+     *
+     * @param request the request
+     * @return the equipment states
+     */
+    @GetMapping("/equipment-state")
+    @PreAuthorize("hasAnyRole('USER', 'ADMIN')")
+    public Map<String, Object> getDeviceStatesByAccount(HttpServletRequest request) {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        return deviceService.getDeviceStatesByAccount(parameters);
+    }
+
+    /**
+     * Gets the alarm levels. ������������������
+     *
+     * @param request the request
+     * @return the alarm levels
+     */
+    @GetMapping("alarm-levels")
+    public Object getAlarmLevels(HttpServletRequest request, Optional<Integer> orgId, Optional<Integer> mpId,
+                                 Optional<String> mac) {
+        List<Map<String, Object>> sensorAlarmList = null;
+        try {
+            AlarmConfig alarmConfig = null;
+            if (orgId.isPresent()) {
+                alarmConfig = alarmConfigService.queryValueByOrganizationId(orgId.get()).get();
+            } else if (mpId.isPresent()) {
+                alarmConfig = alarmConfigService.queryByMonitorPointId(mpId.get()).get();
+            } else if (mac.isPresent()) {
+                alarmConfig = alarmConfigService.queryByDeviceMac(mac.get()).get();
+            }
+            // ���������������
+            if (alarmConfig.getValue() != null && alarmConfig.getValue().getAlarmLevels() != null) {
+                Map<String, AlarmSensorLevel> alarmLevelMap = alarmConfig.getValue().getAlarmLevels();
+                // ������������������������������������������������������
+                Map<String, AlarmSensorLevel> defaultSensorLevelMap = null;
+                if (alarmConfig.getId() != null) {
+                    AlarmConfigValue defaultAlarmValue = alarmConfigService.getDefaultAlarmConfigValue();
+                    defaultSensorLevelMap = defaultAlarmValue.getAlarmLevels();
+                }
+                Map<String, AlarmSensorLevel> finalDefaultSensorLevelMap = defaultSensorLevelMap;
+                alarmLevelMap.entrySet().stream().forEach(entry -> {
+                    // ��� increment������0������������������������
+                    AlarmSensorLevel alarmSensorLevel = entry.getValue();
+                    if (alarmSensorLevel.getIncrement() != null) {
+                        boolean isAllZero = alarmSensorLevel.getIncrement().stream().allMatch(item -> item == 0);
+                        if (isAllZero) {
+                            AlarmSensorLevel defaultAlarmSensorLevel = finalDefaultSensorLevelMap == null ? null
+                                    : finalDefaultSensorLevelMap.get(entry.getKey());
+                            if (defaultAlarmSensorLevel != null) {
+                                alarmSensorLevel.setIncrement(defaultAlarmSensorLevel.getIncrement());
+                            } else {
+                                List<Float> tempList = Arrays.asList(0.0f, 200.0f, 500.0f);
+                                alarmSensorLevel.setIncrement(tempList);
+                            }
+                        }
+                    }
+                });
+                // map to list
+                Map<String, AlarmSensorLevel> finalAlarmLevelMap = alarmLevelMap;
+                sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> {
+                    AlarmSensorLevel alarmSensorLevel = finalAlarmLevelMap.get(key);
+                    Map<String, Object> alarmSensorLevelMap = new HashMap<>(BeanMap.create(alarmSensorLevel));
+                    alarmSensorLevelMap.put("key", key);
+                    return alarmSensorLevelMap;
+                }).collect(Collectors.toList());
+            } else {
+                return new ResultBean<>("���������������������������������������������", ResultBean.FAIL);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            Map<String, Object> err = new LinkedHashMap<String, Object>();
+            err.put("msg", "���������������������������������������������������" + e.getMessage());
+            return err;
+        }
+        return sensorAlarmList;
+    }
+
+    /**
+     * Gets the standard by sensor.���������������������������
+     *
+     * @param macKey the request
+     * @return the standard by sensor
+     */
+    @GetMapping("sensor-standard")
+    public Map<String, Object> getStandardBySensor(@RequestParam("macKey") String macKey) {
+        ValidateUtil.notEmpty(macKey, "param.is.null");
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("standard", getValue(macKey + "-standard"));
+        return result;
+    }
+
+    /**
+     * @param dataSortCondition ������������������������
+     * @return
+     */
+    public ResultBean<Map<String, Object>> getOrderData(DataSortCondition dataSortCondition) {
+        ResultBean resultBean = new ResultBean();
+        if (dataSortCondition.getCode() == null) {
+            resultBean.setCode(ResultBean.FAIL);
+            resultBean.setMessage("code can't be null");
+        } else if (dataSortCondition.getStyle() == null) {
+            resultBean.setCode(ResultBean.FAIL);
+            resultBean.setMessage("style can't be null");
+        }
+        String code = dataSortCondition.getCode().toString();
+        Region region = Region.create(code);
+        if (region == null) {
+            resultBean.setCode(ResultBean.FAIL);
+            resultBean.setMessage("code is not in the correct format");
+        }
+        // todo
+        return null;
+    }
+
+    /**
+     * Gets the day AQI by sensor.���������������AQI������
+     *
+     * @param request the request
+     * @return the day AQI by sensor
+     */
+    @GetMapping("day-aqi")
+    public Map<String, Object> getDayAQIByDevice(HttpServletRequest request) {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        return historyMinutelyService.getDayAQIByDevice(parameters);
+    }
+
+    @GetMapping("hour-aqi")
+    @ApiOperation(value = "���������������AQI", notes = "���������������AQI")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "mac", value = "������mac������", required = true, paramType = "query", dataType = "String")
+    })
+    public Map<String, Object> getHourAQIByDevice(HttpServletRequest request) {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        return historyService.gitHourlyAQIByMacAndTimeslot(parameters);
+    }
+
+    /**
+     * Gets the average by all. ������������������������10������������5������������������������������������������
+     *
+     * @param request the request
+     * @return the average by all
+     * @throws Exception
+     */
+    @GetMapping("all-average")
+    public Map<String, Object> getAllSensorAverageByDevice(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        return historyService.getAllSensorAverageByDevice(parameters);
+    }
+
+    /**
+     * Gets the average by sensor.���������������������������������������������
+     *
+     * @param request the request
+     * @return the average by sensor
+     */
+    @GetMapping("sensor-average")
+    public Map<String, Object> getDeviceRankingBySensorAverage(HttpServletRequest request) {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        return historyService.getDeviceRankingBySensorAverage(parameters);
+    }
+
+    /**
+     * Gets the month average by sensor.������������������������������
+     *
+     * @param request the request
+     * @return the month average by sensor
+     */
+    @GetMapping("month-sensor-average")
+    public Map<String, Object> getMonthAverageBySensor(HttpServletRequest request) {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        return historyMinutelyService.getMonthAverageBySensor(parameters);
+    }
+
+    @GetMapping("check-activate")
+    public ResultBean<Integer> checkActivate(String macCpuCode) {
+        Integer result = machineActivateService.checkActivate(macCpuCode);
+        return new ResultBean<Integer>(result);
+    }
+
+    @PostMapping("activate-machine")
+    public ResultBean<Integer> activateMachine(HttpServletRequest request) {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        Integer result = machineActivateService.activateMachine(parameters);
+        return new ResultBean<Integer>(result);
+    }
+
+    /*********************************************
+     * ������������������������������������
+     *********************************************/
+    private String fileName = "Version.xml";
+    private String ip = "47.96.19.115";
+    private String userName = "ftp_user";
+    private String userPwd = "qwer1234";
+    private int port = 21;
+    private String path = "/";
+
+    @RequestMapping(value = "/upgrade", method = RequestMethod.GET)
+    public Version index() {
+        Version version = new Version();
+        FTPClient ftpClient = new FTPClient();
+        try {
+            ftpClient.connect(ip, port);
+            ftpClient.login(userName, userPwd);
+            ftpClient.changeWorkingDirectory(path);
+            ftpClient.enterLocalPassiveMode();
+            // ftpClient.enterLocalActiveMode();
+
+            InputStream ins = ftpClient.retrieveFileStream(fileName);
+            BufferedReader reader = new BufferedReader(new InputStreamReader(ins, "utf-8"));
+            String line;
+            StringBuilder builder = new StringBuilder();
+            while ((line = reader.readLine()) != null) {
+                builder.append(line);
+            }
+            reader.close();
+            if (ins != null) {
+                ins.close();
+            }
+            ftpClient.getReply();
+            String content = builder.toString();
+            if (ftpClient.isConnected()) {
+                ftpClient.logout();
+                ftpClient.disconnect();
+            }
+
+//			String urlStr = "http://www.7drlb.com/apps/Version.xml";
+//			URL realUrl = new URL(urlStr);
+//			URLConnection connection = realUrl.openConnection();
+//			connection.connect();
+//			StringBuffer result = new StringBuffer();
+//			BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "utf-8"));
+//			String line;
+//			while ((line = in.readLine()) != null) {
+//				result.append(line);
+//			}
+//			String content = result.toString();
+
+            SAXReader saxReader = new SAXReader();
+            Document document = saxReader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8"))));
+            Element root = document.getRootElement();
+            version.setVer(root.element("Ver").getText());
+            version.setFileName(root.element("FileName").getText());
+            version.setFileMD5Hash(root.element("FileMD5Hash").getText());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return version;
+    }
+
+    public static void main(String[] args) {
+        ScreenController sc = new ScreenController();
+        Version a = sc.index();
+        System.out.println(a.getVer());
+    }
+
+    /**
+     * ������������ ������
+     */
+    /**
+     * ������������
+     *
+     * @param model
+     * @param code
+     * @param accountId
+     * @return
+     */
+    @RequestMapping(value = "/map-page", method = RequestMethod.GET)
+    public ModelAndView map(ModelAndView model, @RequestParam("areaCode") long code,
+                            @RequestParam("accountId") int accountId) {
+        Account account = accountService.getAccountById(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("map");
+            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("/getSensorsMap")
+    public List<Map<String, String>> getSensorsMapOnly(String mac) {
+        List<Map<String, String>> sensorsMapList = sensorService.getSensorsMaps(mac);
+        return sensorsMapList;
+    }
+
+    @RequestMapping(value = "/get-monitorpoints", method = RequestMethod.GET)
+    @ResponseBody
+    public ResultBean getMonitorpointList(@RequestParam("orgId") String orgId, MapBounds mapBounds,
+                                          @RequestParam("regionCode") String regionCode) {
+        ResultBean<List<MonitorPoint>> resultBean = new ResultBean();
+        Map<String, Object> paramMap = new HashMap<String, Object>();
+        paramMap.put("orgId", orgId);
+        paramMap.put("mapBounds", mapBounds);
+        paramMap.put("regionCode", regionCode);
+        ParameterUtils.getRegionType4RegionCode(paramMap);
+        List<MonitorPoint> list = monitorPointService.queryWithStateByMap(paramMap);
+        resultBean.setData(list);
+        resultBean.setCode(ResultBean.SUCCESS);
+        return resultBean;
+    }
+
+    @RequestMapping(value = "/get-devices", method = RequestMethod.GET)
+    @ResponseBody
+    public ResultBean getDevices(@RequestParam("orgId") Integer orgId, MapBounds mapBounds,
+                                 @RequestParam("regionCode") String regionCode) {
+        ResultBean<List<Device>> resultBean = new ResultBean();
+        Map<String, Object> paramMap = new HashMap<String, Object>();
+        paramMap.put("orgId", orgId);
+        paramMap.put("mapBounds", mapBounds);
+        paramMap.put("regionCode", regionCode);
+        ParameterUtils.getRegionType4RegionCode(paramMap);
+        List<Device> list = deviceService.query(paramMap);
+        resultBean.setData(list);
+        resultBean.setCode(ResultBean.SUCCESS);
+        return resultBean;
+    }
+
+    @RequestMapping(value = "get-devices-for-popup", method = RequestMethod.GET)
+    @ResponseBody
+    public PageResult getDevicesForPopup(@RequestParam("orgId") Integer orgId, String name, Integer pageSize,
+                                         Integer pageNo) {
+        return deviceService.query(orgId, name, pageSize, pageNo);
+    }
+
+    @RequestMapping(value = "get-devices-by-mid-oid", method = RequestMethod.GET)
+    @ResponseBody
+    public PageResult getDevicesByMidOid(@RequestParam("orgId") Integer orgId, @RequestParam("mpId") Integer mpId,
+                                         Integer pageSize, Integer pageNo) {
+        return deviceService.query(orgId, mpId, pageSize, pageNo);
+    }
+
+    @RequestMapping(value = "/get-real-state-data", method = RequestMethod.POST)
+    @ResponseBody
+    public JsonData getRealStateAndData(@RequestBody JSONObject paramMap) {
+        JsonData jsonData = new JsonData();
+        Map<String, Object> returnMap = new HashMap<String, Object>();
+        returnMap.put("layer", paramMap.getString("layer"));
+        // ���������������������������
+        if (!CollectionUtils.isEmpty(paramMap.getJSONArray("markerKeys"))) {
+            JSONArray markerKeys = paramMap.getJSONArray("markerKeys");
+            List<Map<String, String>> markers = null;
+            if ("equipments".equals(paramMap.getString("layer"))) {
+                markers = deviceService.queryDevicesState(markerKeys.toJavaList(String.class), true);
+            } else {// ���������������id���state
+                String orgId = paramMap.getString("orgId");
+                String areaCode = paramMap.getString("areaCode");
+                for (Object mPointId : markerKeys) {
+                    markers = monitorPointService.queryMonitroPointsState(markerKeys.toJavaList(Integer.class));
+                }
+            }
+            returnMap.put("markers", markers);
+        }
+        if (paramMap.getJSONArray("popupEquMacs") != null && paramMap.getJSONArray("popupEquMacs").size() > 0) {
+            JSONArray popupEquMacs = paramMap.getJSONArray("popupEquMacs");
+            List<Map<String, String>> popupEquWithStates = null;
+            for (Object mac : popupEquMacs) {
+                popupEquWithStates = deviceService.queryDevicesState(popupEquMacs.toJavaList(String.class), false);
+            }
+            // ���������������������������
+            returnMap.put("popupEquStates", popupEquWithStates);
+        }
+        jsonData.setExtData(returnMap);
+        return jsonData;
+    }
+
+    @GetMapping("monitor_points")
+    public ResultBean<List<MonitorPoint>> getMonitorPointsByOrganizationId(Integer orgId) {
+        // Map<String, Object> parameters = getParametersStartingWith(request, null);
+        List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByOrganizationId(orgId);
+        return new ResultBean<List<MonitorPoint>>(monitorPoints);
+    }
+
+    @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);
+
+        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));
+        }
+        return new ResultBean<List<Map<String, Object>>>(list);
+    }
+
+    @GetMapping("report_alarm_datas")
+    public ResultBean<List<Map<String, Object>>> getAlarmData(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        ParameterUtils.getTimeType4Time(parameters);
+        // parameters.put("type", "month");
+        String sensorKey = "list";
+        if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {
+            parameters.put("description", "description");
+        } else {
+            sensorKey = parameters.remove("sensorKey").toString();
+            List<String> sensorKeys = new ArrayList<String>();
+            sensorKeys.add(sensorKey);
+            parameters.put("sensors", sensorKeys);
+        }
+        if (!ObjectUtils.isEmpty(parameters.get("organizationId"))) {
+            if (!Constants.isNotSpecialOrgId(Integer.valueOf(parameters.get("organizationId").toString()))) {
+                parameters.remove("organizationId");
+            }
+        }
+        Map pieData = alarmDailyService.getPieData(parameters);
+        List<Map<String, Object>> list = (List<Map<String, Object>>) pieData.get(sensorKey);
+        return new ResultBean<List<Map<String, Object>>>(list);
+    }
+
+    /**
+     * ���������������id������������������version���������
+     *
+     * @param mptid
+     * @return
+     */
+    @GetMapping("getvers")
+    public ResultBean<List<Integer>> getVersions(Integer mptid) {
+        return new ResultBean<>(monitorPointService.queryVersionsById(mptid));
+    }
+
+    @GetMapping("region_ranking_data")
+    @ApiOperation(value = "������������������", notes = "������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "regionCode", value = "���������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "dimension", value = "������(profession���region���monitorPoint������)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "accountId", value = "������id", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = "timeType", value = "������������(month���day���hour������)", required = true, paramType = "query", dataType = "int"),})
+    public ResultBean<List<Map<String, Object>>> getRegionRankingData(HttpServletRequest request) {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        List<Map<String, Object>> list = historyService.getRegionRankingData(parameters);
+        return new ResultBean<List<Map<String, Object>>>(list);
+    }
+
+    // todo
+    @Value(value = "classpath:system/realTimeMonitorLayout.json")
+    private org.springframework.core.io.Resource resource;
+
+    @ApiOperation(value = "������������������������������", notes = "")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "primaryKey", defaultValue = "898607b0101730391967", value = "���������������mac������������id", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "type", defaultValue = "device", value = "���������'monitorPoint'���'device'", required = true, paramType = "query", dataType = "String"),})
+    @GetMapping("rtm-layout")
+    public ResultBean realTimeMonitorLayout(String primaryKey, String type) {
+        RealTimeDeviceLayout rtdLayout = null;
+        if (type != null && type.equals("device")) {
+            Device device = deviceService.getDeviceByMac(primaryKey, false);
+            if (device != null && device.getOrganizationIds() != null && device.getOrganizationIds().size() > 0
+                    && device.getDeviceVersionId() != null) {
+                Integer orgId = device.getOrganizationIds().get(0);
+                DeviceVersion deviceVersion = deviceVersionService.queryVersionById(device.getDeviceVersionId());
+                rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(orgId, deviceVersion.getVersion());
+            } else {
+                String errMsg = "device ���������������" + JSON.toJSONString(device);
+                log.warn(errMsg);
+                return ResultBean.fail(errMsg);
+            }
+
+        } else {
+            MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(Integer.parseInt(primaryKey));
+            List<DeviceVersion> versionList = deviceVersionService.queryByMpointId(monitorPoint.getId());
+            if (versionList.size() > 0) {
+                List<Integer> versionNolist = versionList.stream().map(item -> {
+                    return item.getVersion();
+                }).collect(Collectors.toList());
+                rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(monitorPoint.getOrganizationId(), versionNolist);
+                if (rtdLayout == null) {
+                    return ResultBean.fail();
+                }
+            }
+        }
+        if (rtdLayout != null && rtdLayout.getDefaultMonitorItems().size() == 0) {
+            rtdLayout.getDefaultMonitorItems().addAll(rtdLayout.getCoreMonitorItems());
+        }
+        return new ResultBean(rtdLayout == null ? new RealTimeDeviceLayout() : rtdLayout);
+    }
+
+    @GetMapping("report_avg_data")
+    @ApiOperation(value = "������������������������������", notes = "������������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "monitorPoint", value = "���������id", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "mac", value = "������mac", required = false, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensorKey", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������,������(���������2018-03)", required = true, paramType = "query", dataType = "String"),})
+    public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgDataBySensorKey(HttpServletRequest request)
+            throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        ParameterUtils.getTimeType4Time(parameters);
+        parameters.put("monitorPointId", parameters.remove("monitorPoint"));
+        String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
+        parameters.put("sensors", Arrays.asList(sensorKeys));
+        // monitorPointService.isCompensateCalculation(parameters);
+        List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+
+        for (Map<String, Object> map : list) {
+            String time = map.get("time").toString();
+            time = time.substring(time.length() - 2);
+            map.put("time", Integer.valueOf(time));
+            List<Number> values = new ArrayList<Number>();
+            for (String string : sensorKeys) {
+                values.add((Number) map.remove(string));
+            }
+            map.put("values", values);
+        }
+        return new ResultBean<List<Map<String, Object>>>(list);
+    }
+
+  @GetMapping("report_avg_AreaData")
+  @ApiOperation(value = "������������������������������������������", notes = "������������������������������������������")
+  @ApiImplicitParams(value = {
+    @ApiImplicitParam(name = "monitorPoint", value = "���������id", required = true, paramType = "query", dataType = "String"),
+    @ApiImplicitParam(name = "mac", value = "������mac", required = false, paramType = "query", dataType = "String"),
+    @ApiImplicitParam(name = "areaCode", value = "������������", required = true, paramType = "query", dataType = "String"),
+    @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+    @ApiImplicitParam(name = "time", value = "������,������(���������2018-03)", required = true, paramType = "query", dataType = "String"),})
+  public ResultBean<List<Map<String, Object>>> getAreaAvgDataByAreaCode(HttpServletRequest request)
+    throws Exception {
+    Map<String, Object> parameters = getParametersStartingWith(request, null);
+    ParameterUtils.getTimeType4Time(parameters);
+    parameters.put("monitorPointId", parameters.remove("monitorPoint"));
+    parameters.put("areaCode", parameters.remove("areaCode"));
+    String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
+    String s=sensorKeys[0];
+    parameters.put("sensors", Arrays.asList(sensorKeys));
+    parameters.put("sensors2", s);
+    List<Map<String, Object>> monitorList = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+    for (Map<String, Object> monitorMap : monitorList) {
+      String time = monitorMap.get("time").toString();
+      time = time.substring(time.length() - 2);
+      monitorMap.put("time", Integer.valueOf(time));
+    }
+    Integer maxTime = 0;
+    Integer max1 = 0;
+    if (monitorList.size() != 0) {
+      Map<String, Object> monitorMap = monitorList.get(monitorList.size() - 1);
+      max1 = Integer.valueOf(monitorMap.get("time").toString());
+    } else {
+      max1 = 0;
+    }
+    String sensorKey1 = s;
+    switch (s) {
+      case "e1":
+        sensorKey1 = "PM2_5";
+        break;
+      case "e2":
+        sensorKey1 = "PM10";
+        break;
+      case "e10":
+        sensorKey1 = "CO";
+        break;
+      case "e11":
+        sensorKey1 = "SO2";
+        break;
+      case "e15":
+        sensorKey1 = "O3";
+        break;
+      case "e16":
+        sensorKey1 = "NO2";
+        break;
+      default:
+        break;
+    }
+
+    parameters.put("sensors1", sensorKey1);
+
+    List<Map<String, Object>> areaList = historyMinutelyService.getAreaAvgDataByAreaCode(parameters);
+    if (areaList.isEmpty()) {
+      Integer areaCode = Integer.valueOf(request.getParameter("areaCode"));
+      areaCode = hangzhouAqiService.queryCityCode(areaCode);
+      parameters.remove("areaCode");
+      parameters.put("areaCode", String.valueOf(areaCode));
+      areaList = historyMinutelyService.getAreaAvgDataByAreaCode(parameters);
+    }
+
+    for (Map<String, Object> areaMap : areaList) {
+      String time = areaMap.get("time").toString();
+      time = time.substring(time.length() - 2);
+      areaMap.put("time", Integer.valueOf(time));
+    }
+
+    Integer max = 0;
+    if (areaList.size() != 0) {
+      Map<String, Object> areaMap = areaList.get(areaList.size() - 1);
+      max = Integer.valueOf(areaMap.get("time").toString());
+    } else {
+      max = 0;
+    }
+
+    if (max1 >= max) {
+      maxTime = max1;
+    } else {
+      maxTime = max;
+    }
+
+    ArrayList<Map<String, Object>> resultList = new ArrayList<>();
+
+    for (int i = 0; i <= maxTime; i++) {
+      resultList.add(null);
+    }
+
+    for (Map<String, Object> areaMap : areaList) {
+      Integer time = Integer.valueOf(areaMap.get("time").toString());
+      resultList.set(time, areaMap);
+    }
+
+    for (Map<String, Object> resultMap : resultList) {
+      for (Map<String, Object> monitorMap : monitorList) {
+        ArrayList<String> values = new ArrayList<>();
+        String monitorTime = monitorMap.get("time").toString();
+        if (resultMap != null) {
+          String resultTime = resultMap.get("time").toString();
+          if (resultTime.equals(monitorTime)) {
+            String value = resultMap.remove(s).toString();
+            String value1 = monitorMap.remove(s).toString();
+            values.add(value);
+            values.add(value1);
+            resultMap.put("values", values);
+          }
+        } else {
+          String value1 = monitorMap.get(s).toString();
+          values.add(null);
+          values.add(value1);
+        }
+      }
+    }
+
+    resultList.removeAll(Collections.singleton(null));
+
+    for (Map<String, Object> resultMap : resultList) {
+      if (resultMap.containsKey(s)) {
+        ArrayList<String> values = new ArrayList<>();
+        values.add(resultMap.remove(s).toString());
+        values.add(null);
+        resultMap.put("values", values);
+      }
+    }
+
+    return new ResultBean<List<Map<String, Object>>>(resultList);
+
+  }
+
+    @GetMapping("getmpoint-byid")
+    @ApiOperation(value = "���������������������", notes = "���������������������,���������������������������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "monitorPointId", defaultValue = "1", value = "���������id", required = true, paramType = "query", dataType = "Integer"),})
+    public ResultBean<MonitorPoint> getMonitorPointById(Integer monitorPointId) {
+        MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(monitorPointId);
+        return new ResultBean<>(monitorPoint);
+    }
+
+    @Resource
+    HangzhouAqiService hangzhouAqiService;
+
+    @GetMapping("aqi24hours")
+    @ApiOperation(value = "������24������aqi������", notes = "������24������������aqi������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "orgid", defaultValue = "5", value = "������id", required = true, paramType = "query", dataType = "Integer"),})
+    public ResultBean<List<Map<String, Object>>> getAqi24HoursNC(@RequestParam("orgid") Integer organizationId) {
+        return new ResultBean<>(hangzhouAqiService.queryAqi24Hours(organizationId));
+    }
+
+    @GetMapping("mpt-dev-summary")
+    @ApiOperation(value = "���������������������������������", notes = "���������������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "orgid", defaultValue = "5", value = "������id", required = true, paramType = "query", dataType = "Integer"),})
+    public ResultBean<Map> getMptAndDevSummary(@RequestParam("orgid") Integer organizationId) {
+        Map<String, Map> result = new HashMap<>(2);
+        Integer mptCount = monitorPointService.countOfSubOrgs(organizationId);
+        Map monitorPointSummary = new HashMap();
+        monitorPointSummary.put("all", mptCount);
+        Map deviceSummary = deviceService.queryDeviceStateSummary(organizationId);
+        result.put("monitorPoint", monitorPointSummary);
+        result.put("device", deviceSummary);
+        return new ResultBean<>(result);
+    }
+
+    @GetMapping("weather")
+    @ApiOperation(value = "������������������������", notes = "������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<Map<String, Object>> getWeatherDataByRegion(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        Map<String, Object> map = weatherService.getWeatherDataByRegion(parameters);
+        return new ResultBean<Map<String, Object>>(map);
+    }
+
+    @GetMapping("actual")
+    @ApiOperation(value = "���������������������������������", notes = "���������������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "accountId", defaultValue = "1", value = "���������������id", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensorKey", defaultValue = "e1,e2,e3", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", defaultValue = "", value = "������(long������������)", required = false, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "interval", defaultValue = "30", value = "���������������������", required = true, paramType = "query", dataType = "Integer"),})
+    public ResultBean<Map<String, Object>> getActualDataByRegion(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        Map<String, Object> map = historyService.getActualDataByRegion(parameters);
+        return new ResultBean<Map<String, Object>>(map);
+    }
+
+    @GetMapping("quality")
+    @ApiOperation(value = "������������������", notes = "������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<Map<String, Object>> getQualityCountDayByRegion(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        Map<String, Object> map = qualityDailyService.getQualityCountDayByRegion(parameters);
+        return new ResultBean<Map<String, Object>>(map);
+    }
+
+    @GetMapping("monitorpoints-devices")
+    @ApiOperation(value = "���������������������������", notes = "���������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "organizationId", defaultValue = "8", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "regionCode", defaultValue = "320583", value = "���������", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<List<MonitorPoint>> getMonitorPointsAndDevicesByRegion(HttpServletRequest request)
+            throws Exception {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
+        return new ResultBean<List<MonitorPoint>>(monitorPoints);
+    }
+
+    @GetMapping("devices-state")
+    @ApiOperation(value = "������������������", notes = "������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "organizationId", defaultValue = "8", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "regionCode", defaultValue = "320583", value = "���������", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<Collection<Object>> getDevicesStateByRegion(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        Collection<Object> monitorPoints = monitorPointService.getDevicesStateByRegion(parameters);
+        return new ResultBean<Collection<Object>>(monitorPoints);
+    }
+
+    @Resource
+    private HistoryDailyService historyDailyService;
+
+    @GetMapping("emissions")
+    @ApiOperation(value = "���������", notes = "���������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "time", defaultValue = "2019", value = "���������������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensorKey", defaultValue = "e27", value = "������������������������key", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "regionCode", defaultValue = "130000", value = "���������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "monitorPointId", value = "���������id(���������376)", required = false, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = "mac", value = "������mac(���������vocscxwnm00001)", required = false, paramType = "query", dataType = "String")})
+    public ResultBean<List<Map<String, Object>>> getemissionsData(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        List<Map<String, Object>> result = historyDailyService.getEmissionsData(parameters);
+        return new ResultBean<List<Map<String, Object>>>(result);
+    }
+
+    @GetMapping("overproof")
+    @ApiOperation(value = "������������", notes = "������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "time", defaultValue = "2019", value = "���������������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensorKey", defaultValue = "e27", value = "������������������������key", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "overproofRatio", defaultValue = "0", value = "������������(0,1,2,3)(������,������100%,������200%,������300%)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "regionCode", defaultValue = "130000", value = "���������", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<Map> getOverproofData(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        Map result = historyDailyService.getOverproofData(parameters);
+        return new ResultBean<Map>(result);
+    }
+
+    @GetMapping("limit-device")
+    @ApiOperation(value = "���������������������������", notes = "���������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "mac", defaultValue = "p5dnd7a0391956", value = "������mac���", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<List<Map<String, Object>>> getLimitDataByDevice(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        String density = deviceService.getLimitDataByDevice(parameters);
+        JSONObject parseObject = JSONObject.parseObject(density);
+        List<Map<String, Object>> resuList = new ArrayList<Map<String, Object>>();
+        for (Map.Entry entry : parseObject.entrySet()) {
+            resuList.add(new HashMap<String, Object>() {
+                {
+                    put("key", entry.getKey());
+                    put("limit", entry.getValue());
+                }
+            });
+        }
+        return new ResultBean<List<Map<String, Object>>>(resuList);
+    }
+
+    /**
+     * @param model
+     * @param request
+     * @return
+     * @throws Exception
+     * @description ������������mac������������������������������������������
+     * @author ZhuDongming
+     * @date 2019-06-05 10:02:10
+     */
+    @GetMapping("/map-traceability")
+    @ApiOperation(value = "������������������", notes = "������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "monitorPointId", value = "���������id(���������319)", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = "mac", value = "������mac������(���������p5dnd7a0391993)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensorKey", value = "������������������������key(���������e1)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������������(���������2019-09-08)", required = true, paramType = "query", dataType = "String")})
+    public ModelAndView traceability(ModelAndView model, HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        Integer monitorPointId = Integer.parseInt(parameters.get("monitorPointId").toString());
+        MonitorPoint monitorPoint = monitorPointService.queryWithRelationById(monitorPointId);
+        String mac = parameters.get("mac").toString();
+        String sensorKey = parameters.get("sensorKey").toString();
+        String time = parameters.get("time").toString();
+        if (monitorPoint != null && mac != null && sensorKey != null && time != null) {
+            Map<String, Double> resultMap = historyDailyService.getTraceabilityData(parameters);
+            JSONObject params = new JSONObject();
+            Long code = monitorPoint.getAreaCode().longValue();
+            String regionName = areaService.queryFullNameByCode(code);
+            Device device = deviceService.getDeviceByMac(mac, false);
+            Device deviceSecond = deviceService.getDeviceByLongitudeAsc(mac);
+            params.put("sensorInfo", resultMap);
+            params.put("regionCode", code);
+            params.put("regionName", regionName);
+            params.put("monitorPoint", monitorPoint);
+            params.put("device", device);
+            params.put("deviceSecond", deviceSecond);
+            String paramsJson = params.toJSONString();
+            model.addObject("traceabilityParams", paramsJson);
+            model.setViewName("traceability");
+            return model;
+        } else {
+            StringBuilder msg = new StringBuilder();
+            msg.append(" param[0] monitorPointId:");
+            msg.append(monitorPointId);
+            msg.append(" param[0] mac:");
+            msg.append(mac);
+            msg.append(" param[0] sensorKey:");
+            msg.append(sensorKey);
+            msg.append(" param[0] time:");
+            msg.append(time);
+            log.warn(msg);
+            model.setViewName("403");
+            return model;
+        }
+    }
+
+    /*@GetMapping("getSensor")
+	@ApiOperation(value = "������������", notes = "������������")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "mac", value = "������MN���", required = true, paramType = "query", dataType = "String")
+	})
+	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);
+	}*/
+
+    @GetMapping("getSensorByMonitorPointId")
+    @ApiOperation(value = "������������", notes = "������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "monitor_point_id", value = "������������id", required = true, paramType = "query", dataType = "String")
+    })
+    public ResultBean<List<Map<String, Object>>> getSensorByMonitorPointId(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        String monitor_point_id = (String) parameters.get("monitor_point_id");
+        List<Map<String, Object>> map = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
+        return new ResultBean<List<Map<String, Object>>>(map);
+    }
+
+    @GetMapping("getSensorByDeviceId")
+    @ApiOperation(value = "������������������������", notes = "������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "id", value = "������id", required = true, paramType = "query", dataType = "String")
+    })
+    public ResultBean<List<Map<String, Object>>> getSensorByDeviceId(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        String id = (String) parameters.get("id");
+        List<Map<String, Object>> list = sensorService.getSensorByDeviceId(id);
+        Map<String, Object> map = list.get(0);
+        String monitor_point_id = map.get("monitor_point_id").toString();
+        List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
+        for (Map<String, Object> sensorMap : list) {
+            for (Map<String, Object> sensorUnitMap : sensorUnitList) {
+                if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {
+                    sensorMap.put("unit", sensorUnitMap.get("name"));
+                }
+            }
+        }
+        return new ResultBean<List<Map<String, Object>>>(list);
+    }
+
+    @GetMapping("getSensorWithUnitByMonitorPointId")
+    @ApiOperation(value = "������������������������", notes = "������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "monitor_point_id", value = "������id", required = true, paramType = "query", dataType = "String")
+    })
+    public ResultBean<List<Map<String, Object>>> getSensorWithUnitByMonitorPointId(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        String monitor_point_id = (String) parameters.get("monitor_point_id");
+        List<Map<String, Object>> list = sensorService.getSensorByMonitorPointId(monitor_point_id);
+        List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
+        for (Map<String, Object> sensorMap : list) {
+            for (Map<String, Object> sensorUnitMap : sensorUnitList) {
+                if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensorKey"))) {
+                    sensorMap.put("unit", sensorUnitMap.get("name"));
+                }
+            }
+        }
+        return new ResultBean<List<Map<String, Object>>>(list);
+    }
+
+    @GetMapping("AIForecast")
+    @ApiOperation(value = "AI������", notes = "AI������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "monitorPoint", value = "���������id", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "mac", value = "������mac", required = false, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensorKey", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������,���(���������2018-03-06)", required = true, paramType = "query", dataType = "String"),
+    })
+    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);
+        DateFormat df1 = new SimpleDateFormat("yyyy-MM-dd");
+        String alterTime = df1.format(date.getTime() - 15 * 24 * 60 * 60 * 1000);
+        parameters.put("time", alterTime);
+        ParameterUtils.getTimeType4Time(parameters);
+        String monitor_point_id = (String) parameters.get("monitorPoint");
+        parameters.put("monitorPointId", parameters.remove("monitorPoint"));
+        String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
+        parameters.put("sensors", Arrays.asList(sensorKeys));
+        List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+
+        Map<String, Object> mpMap = new HashMap<>();
+        mpMap = monitorPointService.selectAllById(monitorPoint);
+        //������������map���������������������������������������������������
+        Map<String, Object> weatherParameters = new HashMap<>();
+        weatherParameters.put("organizationId", mpMap.get("organization_id"));
+        weatherParameters.put("time", intoTime);
+        //������������������
+        Map<String, Object> weatherMap = new HashMap<>();
+        Map<String, Object> tempMap = new HashMap<>();
+        Boolean tf = false;
+        for (int i = 0; i < sensorKeys.length; i++) {
+            if (sensorKeys[i].equals("e7")) {
+                tf = true;
+            }
+        }
+        if (tf) {
+            weatherMap = weatherService.get15DayWeatherDataByRegion(weatherParameters);
+            tempMap = TempAllocationUtils.tempAllocation(weatherMap);
+        }
+        //������������������
+        Map<String, Map<String, Object>> sensorUnitMap = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);
+
+        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 (tempMap != null) {
+                map.put("temp", tempMap.get(map.get("time").toString()));
+            }
+            List<Number> values = new ArrayList<Number>();
+            List<String> units = new ArrayList<String>();
+            for (String string : sensorKeys) {
+                if (sensorUnitMap != null && !sensorUnitMap.isEmpty()) {
+                    if (sensorUnitMap.get(string) != null) {
+                        units.add(sensorUnitMap.get(string).get("name").toString());
+                        String rules = sensorUnitMap.get(string).get("rules").toString();
+                        rules = rules.replace("{0}", "a");
+                        rules = rules.replace("d", "");
+                        Expression expression = AviatorEvaluator.compile(rules);
+                        Double value;
+                        Map<String, Object> ev = new HashMap<>();
+                        ev.put("a", map.get(string));
+                        value = (Double) expression.execute(ev);
+                        //������������������
+                        DecimalFormat df = new DecimalFormat("#.00");
+                        value = Double.parseDouble(df.format(value));
+                        values.add(value);
+                    } else {
+                        Map<String, Object> sensorMap = sensorService.getSensorBySensorKey(string);
+                        units.add(sensorMap.get("unit").toString());
+                        values.add((Number) map.remove(string));
+                    }
+                } else {
+                    Map<String, Object> sensorMap = sensorService.getSensorBySensorKey(string);
+                    units.add(sensorMap.get("unit").toString());
+                    values.add((Number) map.remove(string));
+                }
+                //values.add((Number) map.remove(string));
+            }
+            map.put("values", values);
+            map.put("units", units);
+        }
+        return new ResultBean<List<Map<String, Object>>>(list);
+    }
+
+    @GetMapping("getWeather")
+    @ApiOperation(value = "������������������", notes = "������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������,���(���������2018-03-06)", required = true, paramType = "query", dataType = "String"),
+    })
+    public ResultBean<Map<String, Object>> getWeather(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        Map<String, Object> map = weatherService.get15DayWeatherDataByRegion(parameters);
+        Map<String, Object> tempMap = TempAllocationUtils.tempAllocation(map);
+        return new ResultBean<Map<String, Object>>(tempMap);
+    }
+
+    @GetMapping("/uavTrajectory")
+    @ApiOperation(value = "���������������������������", notes = "���������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392068���", 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 uavTrajectory(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 endYearAndDay = et.substring(0, et.lastIndexOf("-"));
+        String endHour = et.substring(et.lastIndexOf("-") + 1);
+        String endTime = endYearAndDay + " " + endHour + ":00:00";
+        parameters.put("startTime", startTime);
+        parameters.put("endTime", endTime);
+        String mac = parameters.get("mac").toString();
+        if (mac != null && mac.length() != 0) {
+            List<List<Map<String, Object>>> sensorData = historyMinutelyService.getSensorData(parameters);
+            Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);
+            List<Map<String, Object>> sensorList = new ArrayList<>();
+            List<Map<String, Object>> sensorListMin = new ArrayList<>();
+            List<Map<String, Object>> sensorListMax = new ArrayList<>();
+            if (sensorData.size() == 3) {
+                sensorList = sensorData.get(0);
+                sensorListMin = sensorData.get(1);
+                sensorListMax = sensorData.get(2);
+            }
+            JSONObject params = new JSONObject();
+            params.put("sensorInfo", sensorList);
+            params.put("sensorInfoMin", sensorListMin);
+            params.put("sensorInfoMax", sensorListMax);
+            params.put("sensorsMap", sensorsMap);
+            String paramsJson = params.toJSONString();
+            model.addObject("uavTrajectoryParams", paramsJson);
+            model.setViewName("uavtrajectory");
+            return model;
+        } else {
+            StringBuilder msg = new StringBuilder();
+            msg.append(" param[0] mac:");
+            msg.append(mac);
+            log.warn(msg);
+            model.setViewName("403");
+            return model;
+        }
+    }
+
+    @GetMapping("/pollutionSource")
+    @ApiOperation(value = "������������������", notes = "������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "mac", value = "������mac������(������898607b0101730392251)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensorKey", value = "������������������������key(���������e1)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������������(���������2019-09-01-10)", required = true, paramType = "query", dataType = "String")})
+    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 Hour = timeStr.substring(timeStr.lastIndexOf("-") + 1);
+        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();
+        Point dirPoint = historyHourlyService.getDirPoint(parameters);
+        Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceDataByHour(parameters);
+        if (MapUtils.isEmpty(getPollutionSourceData)) {
+            getPollutionSourceData = historyHourlyService.getPollutionSourceDataAll(parameters);
+        }
+        if (MapUtils.isEmpty(getPollutionSourceData)) {
+            getPollutionSourceData = new HashMap<>();
+        }
+        String mac = parameters.get("mac").toString();
+        Device device = deviceService.getDeviceByMac(mac, false);
+        JSONObject params = new JSONObject();
+        params.put("device", device);
+        params.put("month", month);
+        params.put("dirPoint", dirPoint);
+        params.put("getPollutionSourceData", getPollutionSourceData);
+        String paramsJson = params.toJSONString();
+        model.addObject("pollutionSourceParams", paramsJson);
+        model.setViewName("pollutionsource");
+        return model;
+    }
+
+    @GetMapping("getAirQualityComparison")
+    @ApiOperation(value = "������������������", notes = "������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "monitor_point_id", defaultValue = "5", value = "������������id", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<Map<String, Object>> getAirQualityComparison(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        Map<String, Object> map = weatherService.getWeatherDataByRegion(parameters);
+        Map<String, Double> sensorMap = new HashMap<>();
+        sensorMap.put("e1", Double.parseDouble(map.get("pm25").toString()));
+        sensorMap.put("e2", Double.parseDouble(map.get("pm10").toString()));
+        sensorMap.put("e11", Double.parseDouble(map.get("so2").toString()));
+        sensorMap.put("e16", Double.parseDouble(map.get("no2").toString()));
+        sensorMap.put("e10", Double.parseDouble(map.get("co").toString()));
+        sensorMap.put("e15", Double.parseDouble(map.get("o3").toString()));
+        Map<String, Object> StateControl = AQICalculation.hourlyAQI(sensorMap);
+        Map<String, Object> hourAqi = historyService.gitHourlyAQIByMonitorPointIdAndTimeslot(parameters);
+        Map<String, Object> returnMap = new HashMap<>();
+        returnMap.put("MonitorPointAQI", hourAqi.get("AQI"));
+        returnMap.put("StateControlAQI", StateControl.get("AQI"));
+        return new ResultBean<Map<String, Object>>(returnMap);
+    }
+
+
+    @GetMapping("mointorPointRank")
+    @ApiOperation(value = "������������������", notes = "������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "accountId", value = "������id", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensor", value = "������", required = true, paramType = "query", dataType = "String")
+    })
+    public ResultBean<List<Map<String, Object>>> getMointorPointRank(HttpServletRequest request) {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        String id = parameters.get("accountId").toString();
+        String sensor = parameters.get("sensor").toString();
+        Map<String, Object> account = accountService.getOrganizationIdByAccountId(id);
+        //������������id������������������������������
+        account.put("sensor", sensor);
+        List<Map<String, Object>> rankList = historyService.getMointorPointRankByOrganizationId(account);
+        List<Map<String, Object>> returnList = new ArrayList<>();
+        for (Map<String, Object> map : rankList) {
+            boolean contains = map.containsKey("sensor");
+            if (contains) {
+                returnList.add(map);
+            }
+        }
+        return new ResultBean<List<Map<String, Object>>>(returnList);
+    }
+
+    @GetMapping("/carTrajectory")
+    @ApiOperation(value = "���������������������", notes = "���������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392082���", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "startTime", value = "������������(���������2020-03-19-14)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "������������(���������2020-03-19-17)", required = true, paramType = "query", dataType = "String")
+    })
+    public ModelAndView carTrajectory(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 endYearAndDay = et.substring(0, et.lastIndexOf("-"));
+        String endHour = et.substring(et.lastIndexOf("-") + 1);
+        String endTime = endYearAndDay + " " + endHour + ":00:00";
+        parameters.put("startTime", startTime);
+        parameters.put("endTime", endTime);
+        String mac = parameters.get("mac").toString();
+        if (mac != null && mac.length() != 0) {
+            List<List<Map<String, Object>>> sensorData = historyService.getCarSensorData(parameters);
+            Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);
+            List<Map<String, Object>> sensorList = new ArrayList<>();
+            if (sensorData.size() == 3) {
+                sensorList = sensorData.get(0);
+            }
+            JSONObject params = new JSONObject();
+            params.put("sensorInfo", sensorList);
+            params.put("sensorsMap", sensorsMap);
+            String paramsJson = params.toJSONString();
+            model.addObject("carTrajectoryParams", paramsJson);
+            model.setViewName("cartrajectory");
+            return model;
+        } else {
+            StringBuilder msg = new StringBuilder();
+            msg.append(" param[0] mac:");
+            msg.append(mac);
+            log.warn(msg);
+            model.setViewName("403");
+            return model;
+        }
+    }
+
+    @GetMapping("device-excel")
+    @ApiOperation(value = "������������������������", notes = "������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "organizationId", defaultValue = "8", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "regionCode", defaultValue = "320583", value = "���������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������(���������2020-04-09���2019-04)", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<List<Map<String, Object>>> getDevicesDataToExcel(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        ParameterUtils.getTimeType4Time(parameters);
+        Object sensorKey = parameters.get("sensorKey");
+        parameters.put("sensorKeys", Arrays.asList(sensorKey));
+        List<String> macList = new ArrayList<>();
+        List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
+        for (MonitorPoint m : monitorPoints) {
+            for (Device d : m.getDevices()) {
+                macList.add(d.getMac());
+            }
+        }
+        parameters.put("macs", macList);
+        List<Map<String, Object>> list = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(macList)) {
+            list = historyMinutelyService.getDevicesAvgDataToExcel(parameters);
+        }
+        return new ResultBean<List<Map<String, Object>>>(list);
+    }
+
+}
diff --git a/src/main/java/com/moral/mapper/HangzhouAqiMapper.java b/src/main/java/com/moral/mapper/HangzhouAqiMapper.java
index d10a233..76cdbcf 100644
--- a/src/main/java/com/moral/mapper/HangzhouAqiMapper.java
+++ b/src/main/java/com/moral/mapper/HangzhouAqiMapper.java
@@ -10,8 +10,11 @@
 import java.util.Map;
 
 public interface HangzhouAqiMapper extends BaseMapper<HangzhouAqi> {
-    public List<Map> selectAqisByCodeAndTimePeriod(@Param("code")String code,@Param("timePeriod") TimePeriod timePeriod);
-    
-    List<Map<String, Object>> getAqisByOrganizationId(Map<String, Object> parameters);
-    
-}
\ No newline at end of file
+  public List<Map> selectAqisByCodeAndTimePeriod(@Param("code") String code, @Param("timePeriod") TimePeriod timePeriod);
+
+  List<Map<String, Object>> getAqisByOrganizationId(Map<String, Object> parameters);
+
+  Integer queryCityCode(@Param("areaCode") Integer areaCode);
+
+
+}
diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
index 0b09df2..4e1b68f 100644
--- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
@@ -1,32 +1,34 @@
-package com.moral.mapper;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.moral.entity.charts.DataCondition;
-import com.moral.entity.charts.TimePeriod;
-
-public interface HistoryMinutelyMapper {
-
-    Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters);
-
-    List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters);
-
-    /**
-     * @param sensorKeys
-     * @param timePeriod
-     * @param dataCondition
-     * @return {format_time:string,e1:double,e2...............}
-     */
-    List<Map<String, Object>> selectLineChartDateByCrieria(@Param("sensorKeys") List<String> sensorKeys, @Param("timePeriod") TimePeriod timePeriod, @Param("dataCondition") DataCondition dataCondition);
-
-    List<Map<String, Object>> getSensorData(Map<String, Object> parameters);
-
-    List<Map<String, Object>> getSensorData2020(Map<String, Object> parameters);
-
-    List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters);
-
-    List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters);
-}
\ No newline at end of file
+package com.moral.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.moral.entity.charts.DataCondition;
+import com.moral.entity.charts.TimePeriod;
+
+public interface HistoryMinutelyMapper {
+
+  Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters);
+
+  List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters);
+
+  List<Map<String, Object>> getAreaAvgDataByAreaCode(Map<String, Object> parameters);
+
+  /**
+   * @param sensorKeys
+   * @param timePeriod
+   * @param dataCondition
+   * @return {format_time:string,e1:double,e2...............}
+   */
+  List<Map<String, Object>> selectLineChartDateByCrieria(@Param("sensorKeys") List<String> sensorKeys, @Param("timePeriod") TimePeriod timePeriod, @Param("dataCondition") DataCondition dataCondition);
+
+  List<Map<String, Object>> getSensorData(Map<String, Object> parameters);
+
+  List<Map<String, Object>> getSensorData2020(Map<String, Object> parameters);
+
+  List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters);
+
+  List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters);
+}
diff --git a/src/main/java/com/moral/service/HangzhouAqiService.java b/src/main/java/com/moral/service/HangzhouAqiService.java
index 145b54e..041bdc6 100644
--- a/src/main/java/com/moral/service/HangzhouAqiService.java
+++ b/src/main/java/com/moral/service/HangzhouAqiService.java
@@ -10,5 +10,7 @@
  * @Description: ������api������������
  */
 public interface HangzhouAqiService {
-    public List<Map<String, Object>> queryAqi24Hours(@NotNull Integer orgId);
+  public List<Map<String, Object>> queryAqi24Hours(@NotNull Integer orgId);
+
+  public Integer queryCityCode(@NotNull Integer areaCode);
 }
diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index ae7b1d4..2408384 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -1,31 +1,33 @@
-package com.moral.service;
-
-import java.text.ParseException;
-import java.util.List;
-import java.util.Map;
-
-import com.moral.entity.charts.LineChartCriteria;
-
-@SuppressWarnings("rawtypes")
-public interface HistoryMinutelyService {
-
-    Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters);
-
-    Map<String, Object> getHourAQIByDevice(Map<String, Object> parameters);
-
-    Map<String, List> getCompareReport(Map<String, Object> parameters) throws Exception;
-
-    List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception;
-
-    Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
-
-    Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);
-
-    void convertQueryParam(Map<String, Object> parameters) throws ParseException;
-
-    List<List<Map<String, Object>>> getSensorData(Map<String, Object> parameters) throws Exception;
-
-    List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters) throws Exception;
-
-    List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters) throws Exception;
-}
+package com.moral.service;
+
+import java.text.ParseException;
+import java.util.List;
+import java.util.Map;
+
+import com.moral.entity.charts.LineChartCriteria;
+
+@SuppressWarnings("rawtypes")
+public interface HistoryMinutelyService {
+
+    Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters);
+
+    Map<String, Object> getHourAQIByDevice(Map<String, Object> parameters);
+
+    Map<String, List> getCompareReport(Map<String, Object> parameters) throws Exception;
+
+    List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception;
+
+    Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
+
+    List<Map<String, Object>> getAreaAvgDataByAreaCode(Map<String, Object> parameters) throws Exception;
+
+    Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);
+
+    void convertQueryParam(Map<String, Object> parameters) throws ParseException;
+
+    List<List<Map<String, Object>>> getSensorData(Map<String, Object> parameters) throws Exception;
+
+    List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters) throws Exception;
+
+    List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters) throws Exception;
+}
diff --git a/src/main/java/com/moral/service/impl/HangzhouAqiServiceImpl.java b/src/main/java/com/moral/service/impl/HangzhouAqiServiceImpl.java
index 4ae4086..f3feac4 100644
--- a/src/main/java/com/moral/service/impl/HangzhouAqiServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HangzhouAqiServiceImpl.java
@@ -25,24 +25,26 @@
  * @Description:������api���������������
  */
 @Service
-public class HangzhouAqiServiceImpl implements HangzhouAqiService{
-    @Resource
-    private OrganizationMapper organizationMapper;
-    @Resource
-    private HangzhouAqiMapper hangzhouAqiMapper;
+public class HangzhouAqiServiceImpl implements HangzhouAqiService {
+  @Resource
+  private OrganizationMapper organizationMapper;
+  @Resource
+  private HangzhouAqiMapper hangzhouAqiMapper;
 
-    public List<Map> queryAqiOfTimePeriod(String code,TimePeriod timePeriod) {
-        return  hangzhouAqiMapper.selectAqisByCodeAndTimePeriod(code,timePeriod);
-    }
-    /**
-     * ������������id������������24������������aqi������
-     * @param orgId
-     * @return ���������������24���������������������������������������0
-     */
-    @SuppressWarnings("serial")
-	@Override
-    public List<Map<String, Object>> queryAqi24Hours(Integer orgId) {
-        List<Map<String, Object>> aqi24HoursValues = new ArrayList<>(24);
+  public List<Map> queryAqiOfTimePeriod(String code, TimePeriod timePeriod) {
+    return hangzhouAqiMapper.selectAqisByCodeAndTimePeriod(code, timePeriod);
+  }
+
+  /**
+   * ������������id������������24������������aqi������
+   *
+   * @param orgId
+   * @return ���������������24���������������������������������������0
+   */
+  @SuppressWarnings("serial")
+  @Override
+  public List<Map<String, Object>> queryAqi24Hours(Integer orgId) {
+    List<Map<String, Object>> aqi24HoursValues = new ArrayList<>(24);
 /*
         Date now = ReportTimeFormat.getFormatDate(ReportTimeFormat.HOUR_FORMAT);
         Date start = ReportTimeFormat.dateCalc(now, TimeUnits.HOUR,-24);
@@ -73,33 +75,38 @@
             aqiItem.put("aqi",aqiValue);
             aqi24HoursValues.add(aqiItem);
         }
-*/      
-        Organization organization = organizationMapper.selectByPrimaryKey(orgId);
+*/
+    Organization organization = organizationMapper.selectByPrimaryKey(orgId);
 
-        Map<String, Object> parameters = new HashMap<String, Object>(){{
-        	put("end", LocalDateTime.now());
-        	put("cityCode", organization.getAreaCode());
-        }};
-        aqi24HoursValues = hangzhouAqiMapper.getAqisByOrganizationId(parameters);
-        if (ObjectUtils.isEmpty(aqi24HoursValues)) {
-        	parameters.put("cityCode", organization.getCityCode());
-        	aqi24HoursValues = hangzhouAqiMapper.getAqisByOrganizationId(parameters);
-		}
-        Collections.reverse(aqi24HoursValues);
-        return aqi24HoursValues;
+    Map<String, Object> parameters = new HashMap<String, Object>() {{
+      put("end", LocalDateTime.now());
+      put("cityCode", organization.getAreaCode());
+    }};
+    aqi24HoursValues = hangzhouAqiMapper.getAqisByOrganizationId(parameters);
+    if (ObjectUtils.isEmpty(aqi24HoursValues)) {
+      parameters.put("cityCode", organization.getCityCode());
+      aqi24HoursValues = hangzhouAqiMapper.getAqisByOrganizationId(parameters);
     }
-    private Integer getCode(Integer orgId,boolean isGetCityCode)
-    {
-        Organization org = organizationMapper.selectByPrimaryKey(orgId);
-        Integer code  = null;
-        if(isGetCityCode) {
-            code  =  org.getCityCode();
-        }else{
-            code  =  org.getAreaCode();
-        }
-        if(code == null) {
-            throw new BusinessException("citeCode or areaCode is null;");
-        }
-        return  code;
+    Collections.reverse(aqi24HoursValues);
+    return aqi24HoursValues;
+  }
+
+  private Integer getCode(Integer orgId, boolean isGetCityCode) {
+    Organization org = organizationMapper.selectByPrimaryKey(orgId);
+    Integer code = null;
+    if (isGetCityCode) {
+      code = org.getCityCode();
+    } else {
+      code = org.getAreaCode();
     }
+    if (code == null) {
+      throw new BusinessException("citeCode or areaCode is null;");
+    }
+    return code;
+  }
+
+  @Override
+  public Integer queryCityCode(Integer areaCode) {
+    return  hangzhouAqiMapper.queryCityCode(areaCode);
+  }
 }
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 0b9267e..f7b8b50 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -1,677 +1,687 @@
-package com.moral.service.impl;
-
-import java.math.BigDecimal;
-import java.text.ParseException;
-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;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
-
-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;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
-import com.moral.common.util.CalculateUtils;
-import com.moral.common.util.ParameterUtils;
-import com.moral.common.util.ReportTimeFormat;
-import com.moral.common.util.ResourceUtil;
-import com.moral.common.util.ValidateUtil;
-import com.moral.entity.Sensor;
-import com.moral.entity.charts.DataCondition;
-import com.moral.entity.charts.LineChartCriteria;
-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 static com.moral.common.bean.Constants.NULL_VALUE;
-import static org.springframework.util.ObjectUtils.isEmpty;
-
-@Service
-@SuppressWarnings({"unchecked", "unused", "rawtypes"})
-public class HistoryMinutelyServiceImpl implements HistoryMinutelyService {
-
-    @Resource
-    private HistoryMinutelyMapper historyMinutelyMapper;
-
-    @Resource
-    private HistoryMapper historyMapper;
-
-    @Resource
-    private DeviceMapper deviceMapper;
-
-    @Resource
-    private SensorMapper sensorMapper;
-
-    @Resource
-    private AlarmDailyMapper alarmDailyMapper;
-
-    @Override
-    public Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters) {
-        //ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
-        LocalDate time = LocalDate.now();
-        int year = time.getYear();
-        int month = time.getMonthValue();
-        int day = time.getDayOfMonth();
-        if (day == 1) {
-            if (month == 1) {
-                month = 12;
-                year = year - 1;
-            } else {
-                month = month - 1;
-            }
-        }
-        String monthStr = month < 10 ? ("0" + month) : month + "";
-        String yearAndMonth = year + monthStr;
-        // ������00:00:00
-        parameters.put("start", time.minusDays(1));
-
-        // ������00:00:00
-        parameters.put("end", time);
-        parameters.put("yearAndMonth", yearAndMonth);
-        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();
-        // ������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);
-        int hour = calendar.get(Calendar.HOUR) - 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);
-    }
-
-    private Map<String, Object> getAQIByDataMap(Map<String, Double> average) {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        if (isEmpty(average)) {
-            resultMap.put("AQI", "N/V");
-        } else {
-            String[] IAQIValues = ResourceUtil.getArrValue("IAQI");
-            Set<Double> IAQIs = new HashSet<Double>();
-            for (Map.Entry<String, Double> entry : average.entrySet()) {
-                double minMacKey = 0, maxMacKey = 0, minIAQI = 0, maxIAQI = 0;
-                String[] macKeyValues = ResourceUtil.getArrValue(entry.getKey());
-                Double avg = entry.getValue();
-                if (isEmpty(avg)) {
-                    IAQIs.add(null);
-                } else {
-                    int index = -1;
-                    for (int i = 0; i < macKeyValues.length; i++) {
-                        if (avg <= Double.valueOf(macKeyValues[i])) {
-                            if (i == 0) {
-                                index = i;
-                            } else {
-                                index = i - 1;
-                            }
-                            break;
-                        }
-                    }
-                    if (index == -1) {
-                        IAQIs.add(Double.MAX_VALUE);
-                    } else {
-                        minMacKey = Double.valueOf(macKeyValues[index]);
-                        maxMacKey = Double.valueOf(macKeyValues[index + 1]);
-                        minIAQI = Double.valueOf(IAQIValues[index]);
-                        maxIAQI = Double.valueOf(IAQIValues[index + 1]);
-                        Double result = CalculateUtils.calculateIAQI(maxIAQI, minIAQI, maxMacKey, minMacKey, avg);
-                        IAQIs.add(result);
-                    }
-                }
-            }
-            IAQIs.remove(null);
-            if (isEmpty(IAQIs)) {
-                resultMap.put("AQI", "N/V");
-            } else {
-                Double AQI = Collections.max(IAQIs);
-                if (AQI == Double.MAX_VALUE) {
-                    resultMap.put("AQI", IAQIValues[IAQIValues.length - 1]);
-                } else {
-                    resultMap.put("AQI", String.format("%.0f", AQI));
-                }
-            }
-        }
-        return resultMap;
-    }
-
-    @Override
-    public Map<String, List> getCompareReport(Map<String, Object> parameters) throws Exception {
-        Map<String, List> resultMap = new HashMap<String, List>();
-        List<Map<String, Object>> list = JSON.parseObject((String) parameters.remove("items"), new TypeReference<List<Map<String, Object>>>() {
-        });
-
-        String type = (String) parameters.get("type");
-        // parameters.putAll(getElementByType(type));
-        ParameterUtils.getElementByType(parameters);
-        Integer timeLength = Integer.valueOf(parameters.remove("timeLength").toString());
-        if ("month".equals(type)) {
-            for (Map<String, Object> map : list) {
-                String[] formatTime = map.get("formatTime").toString().split("-");
-                LocalDate localDate = LocalDate.of(Integer.valueOf(formatTime[0]), Integer.valueOf(formatTime[1]), 1);
-                int lengthOfMonth = localDate.lengthOfMonth();
-                if (lengthOfMonth > timeLength) {
-                    timeLength = lengthOfMonth;
-                }
-            }
-        }
-
-        List<Object> timeList = new ArrayList<Object>();
-        for (int i = 0; i < timeLength; i++) {
-            timeList.add(String.format("%02d", "day".equals(type) || "hour".equals(type) ? i : i + 1));
-        }
-        parameters.put("timeList", timeList);
-
-        ExecutorService threadPool = Executors.newCachedThreadPool();
-        CompletionService<Map<String, Object>> cs = new ExecutorCompletionService<Map<String, Object>>(threadPool);
-        for (int i = 0; i < list.size(); i++) {
-            Map<String, Object> map = list.get(i);
-            map.put("part", i);
-            if (ObjectUtils.isEmpty(map.get("mac"))) {
-                map.remove("mac");
-            }
-            map.put("time", map.remove("formatTime"));
-            map.putAll(parameters);
-            cs.submit(new Callable<Map<String, Object>>() {
-                @Override
-                public Map<String, Object> call() throws Exception {
-                    return getMonitorPointOrDeviceAvgData4Compare(map);
-                }
-            });
-        }
-
-        List<Object> dataList = new ArrayList<Object>();
-        for (Map<String, Object> map : list) {
-            dataList.add(cs.take().get());
-        }
-        Object[] datas = new Object[list.size()];
-        Object[] deviceCounts = new Object[list.size()];
-        Object[] alarmDatas = new Object[list.size()];
-        Set<String> sensors = new TreeSet<String>(new Comparator<String>() {
-            @Override
-            public int compare(String o1, String o2) {
-                return o1.split("-")[0].compareTo(o2.split("-")[0]);
-                //return Integer.compare(Integer.valueOf(o1.split("-")[0].replace("e", "")), Integer.valueOf(o2.split("-")[0].replace("e", "")));
-            }
-        });
-        Map<String, Double> sortMap = new HashMap<String, Double>();
-        for (Object object : dataList) {
-            Map<String, Object> map = (Map<String, Object>) object;
-            for (String key : map.keySet()) {
-                int index = Integer.valueOf(key.substring(key.length() - 1));
-                String actual = key.substring(0, key.length() - 1);
-                Object obj = map.get(key);
-                switch (actual) {
-                    case "data":
-                        datas[index] = obj;
-                        break;
-                    case "deviceCount":
-                        deviceCounts[index] = obj;
-                        break;
-                    case "alarmData":
-                        alarmDatas[index] = obj;
-                        if (!ObjectUtils.isEmpty(obj)) {
-                            Map<String, BigDecimal> mapData = (Map<String, BigDecimal>) obj;
-                            BigDecimal sum = mapData.remove("sum");
-                            for (Entry<String, BigDecimal> entry : mapData.entrySet()) {
-                                if (!"name".equals(entry.getKey())) {
-                                    sortMap.put(entry.getKey() + "-" + index, new BigDecimal(100).multiply(entry.getValue())
-                                            .divide(sum, 2, BigDecimal.ROUND_HALF_UP).doubleValue());
-
-                                }
-                            }
-                        }
-                        break;
-                    case "sensors":
-                        sensors.addAll((List<String>) obj);
-                        break;
-                }
-            }
-        }
-        List<Map.Entry<String, Double>> sortList = new ArrayList<Map.Entry<String, Double>>(sortMap.entrySet());
-        Collections.sort(sortList, new Comparator<Map.Entry<String, Double>>() {
-            @Override
-            public int compare(Entry<String, Double> o1, Entry<String, Double> o2) {
-                if (o2.getValue().compareTo(o1.getValue()) == 0) {
-                    String[] key1 = o1.getKey().split("-");
-                    String[] key2 = o2.getKey().split("-");
-//					String sensor1  = key1[0].replace("e", "");
-//					String sensor2  = key2[0].replace("e", "");
-//					if (Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2)) == 0) {
-//						return Integer.compare(Integer.valueOf(key1[1]), Integer.valueOf(key2[1]));
-//					}
-//					return Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2));
-                    if (key1[0].compareTo(key2[0]) == 0) {
-                        return Integer.compare(Integer.valueOf(key1[1]), Integer.valueOf(key2[1]));
-                    } else {
-                        return key1[0].compareTo(key2[0]);
-                    }
-                } else {
-                    return o2.getValue().compareTo(o1.getValue());
-                }
-            }
-
-        });
-        resultMap.put("times", timeList);
-        resultMap.put("datas", Arrays.asList(datas));
-        resultMap.put("deviceCounts", Arrays.asList(deviceCounts));
-        resultMap.put("alarmDatas", Arrays.asList(alarmDatas));
-        resultMap.put("sensors", new ArrayList<Object>(sensors));
-        resultMap.put("sortList", sortList);
-        return resultMap;
-    }
-
-
-    public Map<String, Object> getMonitorPointOrDeviceAvgData4Compare(Map<String, Object> parameters) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        List<Map<String, Object>> resultList = getMonitorPointOrDeviceAvgData(parameters);
-        List<Object> timeList = (List<Object>) parameters.get("timeList");
-        List<String> sensors = (List<String>) parameters.get("sensors");
-        String part = parameters.get("part").toString();
-        Map<String, Double[]> doubleMap = new LinkedHashMap<String, Double[]>();
-        for (Map<String, Object> map : resultList) {
-            String time = map.get("time").toString();
-            time = time.substring(time.length() - 2);
-            int index = timeList.indexOf(time);
-            for (String sensor : sensors) {
-                String[] split = sensor.split("-");
-                String sensorKey = split[0];
-                if (map.containsKey(sensorKey)) {
-                    Double[] doubles;
-                    if (doubleMap.containsKey(sensor)) {
-                        doubles = doubleMap.get(sensor);
-                    } else {
-                        doubles = new Double[timeList.size()];
-                    }
-                    doubles[index] = (Double) map.get(sensorKey);
-                    doubleMap.put(sensor, doubles);
-                }
-            }
-        }
-
-        Object deviceCount;
-        if (parameters.containsKey("deviceCount")) {
-            deviceCount = parameters.remove("deviceCount");
-        } else {
-            deviceCount = deviceMapper.getDeviceCountByRegion(parameters);
-        }
-
-        resultMap.put("deviceCount" + part, deviceCount);
-        resultMap.put("data" + part, doubleMap);
-        resultMap.put("sensors" + part, sensors);
-        Object type = parameters.get("type");
-        if ("year".equals(type) || "month".equals(type)) {
-            parameters.put("sensorKeys", Arrays.asList("e1", "e2", "e10", "e11", "e15", "e16"));
-            List<Map<String, Object>> alarmData = alarmDailyMapper.getAlarmData(parameters);
-            if (!ObjectUtils.isEmpty(alarmData)) {
-                resultMap.put("alarmData" + part, alarmDailyMapper.getAlarmData(parameters).get(0));
-            }
-        }
-        return resultMap;
-    }
-
-    @Override
-    public List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception {
-        convertQueryParam(parameters);
-        if (!ObjectUtils.isEmpty(parameters.get("compensate"))) {
-            parameters.put("timeUnits", "10min");
-        }
-        return historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);
-    }
-
-    @Override
-    public void convertQueryParam(Map<String, Object> parameters) throws ParseException {
-        if (!parameters.containsKey("field")) {
-            // String type = (String) parameters.get("type");
-            // parameters.putAll(getElementByType(type));
-            ParameterUtils.getElementByType(parameters);
-        }
-        String time = (String) parameters.get("time");
-        String format = (String) parameters.get("format");
-        Integer field = Integer.valueOf(parameters.get("field").toString());
-        Date start = DateUtils.parseDate(time, format), end = null;
-        if (parameters.containsKey("timeb")) {
-            end = DateUtils.parseDate((String) parameters.get("timeb"), format);
-        } else {
-            Calendar instance = Calendar.getInstance();
-            instance.setTime(start);
-            instance.add(field, 1);
-            end = instance.getTime();
-        }
-        parameters.put("start", start);
-        parameters.put("end", end);
-
-        List<String> sensorKeys = new ArrayList<String>();
-        List<String> sensors = new ArrayList<String>();
-        if (parameters.containsKey("sensors")) {
-            try {
-                sensors = JSON.parseObject((String) parameters.get("sensors"), new TypeReference<List<String>>() {
-                });
-                for (String sensor : sensors) {
-                    sensorKeys.add(sensor.split("-")[0]);
-                }
-            } catch (Exception e) {
-                sensorKeys = sensors = (List<String>) parameters.remove("sensors");
-            }
-        } else {
-            List<Sensor> sensorList = sensorMapper.getSensorsByCriteria(parameters);
-            for (Sensor sensor : sensorList) {
-                sensorKeys.add(sensor.getSensorKey());
-                String string = sensor.getSensorKey() + "-" + sensor.getName() + "-" + sensor.getUnit();
-                if (parameters.containsKey("description")) {
-                    string += "-" + sensor.getDescription();
-                }
-                sensors.add(string);
-            }
-        }
-        parameters.put("sensorKeys", sensorKeys);
-        parameters.put("sensors", sensors);
-    }
-
-    @Override
-    public Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters) {
-        //ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
-        Object sensorKey = parameters.remove("macKey");
-        ValidateUtil.notNull(sensorKey, "param.is.null");
-        Map<String, Object> result = new HashMap<String, Object>();
-        LocalDate end = LocalDate.now(), start;
-        // ���������������������������������������
-        if (1 == end.getDayOfMonth()) {
-            // ���������1���00:00:00
-            start = end.plusDays(-1).with(TemporalAdjusters.firstDayOfMonth());
-        } else {
-            // ���������1���00:00:00
-            start = end.with(TemporalAdjusters.firstDayOfMonth());
-        }
-        parameters.put("start", start);
-        parameters.put("end", end);
-        parameters.put("sensorKeys", Arrays.asList(sensorKey));
-
-        Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);
-        if (isEmpty(average)) {
-            result.put("average", NULL_VALUE);
-        } else {
-            result.put("average", String.format("%.2f", average.get(sensorKey)));
-        }
-        return result;
-    }
-
-    /**
-     * ������������������������������������������������������������������
-     *
-     * @param lineChartCriteria
-     * @return
-     */
-    @Override
-    public Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria) {
-        Map<String, List<List<Double>>> listMap = new HashMap<>();
-        List<String> sensorKeys = lineChartCriteria.getSensorKeys();
-        List<DataCondition> dataConditionList = lineChartCriteria.getDataConditions();
-        TimePeriod timePeriod = lineChartCriteria.getTimePeriod();
-        sensorKeys.forEach(sensorKey -> {
-            listMap.put(sensorKey, new ArrayList<List<Double>>(dataConditionList.size()));
-        });
-        dataConditionList.forEach(dataCondition -> {
-            Map<String, List<Double>> dataMap = queryOneLineChartDateByCrieria(sensorKeys, timePeriod, dataCondition);
-            // ������������
-            listMap.forEach((sensorKey, list) -> {
-                List<Double> rowData = dataMap.get(sensorKey);
-                list.add(rowData);
-            });
-        });
-        return listMap;
-    }
-
-    /**
-     * ������������������������������������������������������������������,������ ������������������
-     *
-     * @param sensorKeys
-     * @param timePeriod
-     * @param dataCondition
-     * @return
-     */
-    public Map<String, List<Double>> queryOneLineChartDateByCrieria(List<String> sensorKeys, TimePeriod timePeriod, DataCondition dataCondition) {
-        List<String> timeList = ReportTimeFormat.makeTimeList(timePeriod);
-        List<Map<String, Object>> lineChartDatas = historyMinutelyMapper.selectLineChartDateByCrieria(sensorKeys, timePeriod, dataCondition);
-        Map<String, List<Double>> lineChartDatasWithEmpty = new HashMap<>();
-        // lineChartDatasWithEmpty ���������
-        sensorKeys.forEach(sensorKey -> {
-            lineChartDatasWithEmpty.put(sensorKey, timeList.stream().map(time -> {
-                Double data = null;
-                return data;
-            }).collect(Collectors.toList()));
-        });
-        // m ���������data���index������������������m������
-        int m = 0;
-        int dataLength = lineChartDatas.size() - 1;
-        m = dataLength > -1 ? 0 : -1;
-        if (m > -1) {
-            for (int n = 0; n < timeList.size(); n++) {
-                if (m > -1) {
-                    String time = timeList.get(n);
-                    Map<String, Object> rowData = lineChartDatas.get(m);
-                    String keyTime = rowData.get("format_time").toString();
-                    if (time.equals(keyTime)) {
-                        // list to map
-                        int finalN = n;
-                        sensorKeys.forEach(sensorKey -> {
-                            Object value = rowData.get(sensorKey);
-                            List<Double> lineChartDatasWithEmptyTemp = lineChartDatasWithEmpty.get(sensorKey);
-                            if (finalN < lineChartDatasWithEmptyTemp.size()) {
-                                Double sensorValue = value != null ? new Double(value.toString()) : null;
-                                lineChartDatasWithEmptyTemp.set(finalN, sensorValue);
-                            }
-                        });
-                        // ������ -1���������������
-                        m = m < dataLength ? m + 1 : -1;
-                    }
-                }
-            }
-        }
-        return lineChartDatasWithEmpty;
-    }
-
-    private Map<String, Object> getElementByType(Object type) {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        switch (type.toString()) {
-            case "year":
-                resultMap.put("format", "yyyy");
-                resultMap.put("typeFormat", "%Y-%m");
-                resultMap.put("timeLength", 12);
-                resultMap.put("field", Calendar.YEAR);
-                break;
-            case "month":
-                resultMap.put("format", "yyyy-MM");
-                resultMap.put("typeFormat", "%Y-%m-%d");
-                resultMap.put("timeLength", 28);
-                resultMap.put("field", Calendar.MONTH);
-                break;
-            case "day":
-                resultMap.put("format", "yyyy-MM-dd");
-                resultMap.put("typeFormat", "%Y-%m-%d %H");
-                resultMap.put("timeLength", 24);
-                resultMap.put("field", Calendar.DATE);
-                break;
-            case "hour":
-                resultMap.put("format", "yyyy-MM-dd HH");
-                resultMap.put("typeFormat", "%Y-%m-%d %H:%i");
-                resultMap.put("timeLength", 60);
-                resultMap.put("field", Calendar.HOUR);
-                break;
-        }
-        return resultMap;
-    }
-
-    /*
-     * @description ���������������������������������sensor���
-     * @author ZhuDongming
-     * @date 2019-07-25 09:21:45
-     * @param parameters
-     * @return
-     */
-    @Override
-    public List<List<Map<String, Object>>> getSensorData(Map<String, Object> parameters) {
-        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;
-        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 (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()).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;
-    }
-
-    @Override
-    public List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters) throws Exception {
-        if ("month".equals(parameters.get("type"))) {
-            parameters.put("timeUnits", "daily");
-            parameters.put("typeFormat", "%Y-%m-%d");
-            String time = parameters.get("time") + "-01T00:00:00";
-            LocalDateTime value = LocalDateTime.parse(time);
-            LocalDateTime start = value.with(TemporalAdjusters.firstDayOfMonth());
-            LocalDateTime end = value.with(TemporalAdjusters.lastDayOfMonth());
-            parameters.put("start", start);
-            parameters.put("end", end);
-            int day = end.getDayOfMonth();
-            List<String> timeList = new ArrayList<>();
-            for (int i = 0; i <= day - 1; i++) {
-                timeList.add(start.plusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-            }
-            parameters.put("timeList", timeList);
-        } else if ("day".equals(parameters.get("type"))) {
-            String time = parameters.get("time") + "T00:00:00";
-            LocalDateTime value = LocalDateTime.parse(time);
-            LocalDateTime end = value.plusHours(23);
-            parameters.put("timeUnits", "hourly");
-            parameters.put("typeFormat", "%Y-%m-%d %H:%i");
-            parameters.put("start", time);
-            parameters.put("end", end);
-            List<String> timeList = new ArrayList<>();
-            for (int i = 0; i <= 23; i++) {
-                timeList.add(value.plusHours(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")));
-            }
-            parameters.put("timeList", timeList);
-        }
-        return historyMinutelyMapper.getDevicesAvgDataToExcel(parameters);
-    }
-
-    @Override
-    public List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters) throws Exception {
-        if ("month".equals(parameters.get("type"))) {
-            parameters.put("timeUnits", "daily");
-            parameters.put("typeFormat", "%Y-%m-%d");
-            String time = parameters.get("time") + "-01T00:00:00";
-            LocalDateTime value = LocalDateTime.parse(time);
-            LocalDateTime start = value.with(TemporalAdjusters.firstDayOfMonth());
-            LocalDateTime end = value.with(TemporalAdjusters.lastDayOfMonth());
-            parameters.put("start", start);
-            parameters.put("end", end);
-            int day = end.getDayOfMonth();
-            List<String> timeList = new ArrayList<>();
-            for (int i = 0; i <= day - 1; i++) {
-                timeList.add(start.plusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-            }
-            parameters.put("timeList", timeList);
-        } else if ("day".equals(parameters.get("type"))) {
-            String time = parameters.get("time") + "T00:00:00";
-            LocalDateTime value = LocalDateTime.parse(time);
-            LocalDateTime end = value.plusHours(23);
-            parameters.put("timeUnits", "hourly");
-            parameters.put("typeFormat", "%Y-%m-%d %H:%i");
-            parameters.put("start", time);
-            parameters.put("end", end);
-            List<String> timeList = new ArrayList<>();
-            for (int i = 0; i <= 23; i++) {
-                timeList.add(value.plusHours(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")));
-            }
-            parameters.put("timeList", timeList);
-        }
-        return historyMinutelyMapper.getDevicesSensorsAvgDataToExcel(parameters);
-    }
-
-}
+package com.moral.service.impl;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+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;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionService;
+import java.util.concurrent.ExecutorCompletionService;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
+
+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;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.moral.common.util.CalculateUtils;
+import com.moral.common.util.ParameterUtils;
+import com.moral.common.util.ReportTimeFormat;
+import com.moral.common.util.ResourceUtil;
+import com.moral.common.util.ValidateUtil;
+import com.moral.entity.Sensor;
+import com.moral.entity.charts.DataCondition;
+import com.moral.entity.charts.LineChartCriteria;
+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 static com.moral.common.bean.Constants.NULL_VALUE;
+import static org.springframework.util.ObjectUtils.isEmpty;
+
+@Service
+@SuppressWarnings({"unchecked", "unused", "rawtypes"})
+public class HistoryMinutelyServiceImpl implements HistoryMinutelyService {
+
+  @Resource
+  private HistoryMinutelyMapper historyMinutelyMapper;
+
+  @Resource
+  private HistoryMapper historyMapper;
+
+  @Resource
+  private DeviceMapper deviceMapper;
+
+  @Resource
+  private SensorMapper sensorMapper;
+
+  @Resource
+  private AlarmDailyMapper alarmDailyMapper;
+
+  @Override
+  public Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters) {
+    //ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
+    LocalDate time = LocalDate.now();
+    int year = time.getYear();
+    int month = time.getMonthValue();
+    int day = time.getDayOfMonth();
+    if (day == 1) {
+      if (month == 1) {
+        month = 12;
+        year = year - 1;
+      } else {
+        month = month - 1;
+      }
+    }
+    String monthStr = month < 10 ? ("0" + month) : month + "";
+    String yearAndMonth = year + monthStr;
+    // ������00:00:00
+    parameters.put("start", time.minusDays(1));
+
+    // ������00:00:00
+    parameters.put("end", time);
+    parameters.put("yearAndMonth", yearAndMonth);
+    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();
+    // ������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);
+    int hour = calendar.get(Calendar.HOUR) - 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);
+  }
+
+  private Map<String, Object> getAQIByDataMap(Map<String, Double> average) {
+    Map<String, Object> resultMap = new HashMap<String, Object>();
+    if (isEmpty(average)) {
+      resultMap.put("AQI", "N/V");
+    } else {
+      String[] IAQIValues = ResourceUtil.getArrValue("IAQI");
+      Set<Double> IAQIs = new HashSet<Double>();
+      for (Map.Entry<String, Double> entry : average.entrySet()) {
+        double minMacKey = 0, maxMacKey = 0, minIAQI = 0, maxIAQI = 0;
+        String[] macKeyValues = ResourceUtil.getArrValue(entry.getKey());
+        Double avg = entry.getValue();
+        if (isEmpty(avg)) {
+          IAQIs.add(null);
+        } else {
+          int index = -1;
+          for (int i = 0; i < macKeyValues.length; i++) {
+            if (avg <= Double.valueOf(macKeyValues[i])) {
+              if (i == 0) {
+                index = i;
+              } else {
+                index = i - 1;
+              }
+              break;
+            }
+          }
+          if (index == -1) {
+            IAQIs.add(Double.MAX_VALUE);
+          } else {
+            minMacKey = Double.valueOf(macKeyValues[index]);
+            maxMacKey = Double.valueOf(macKeyValues[index + 1]);
+            minIAQI = Double.valueOf(IAQIValues[index]);
+            maxIAQI = Double.valueOf(IAQIValues[index + 1]);
+            Double result = CalculateUtils.calculateIAQI(maxIAQI, minIAQI, maxMacKey, minMacKey, avg);
+            IAQIs.add(result);
+          }
+        }
+      }
+      IAQIs.remove(null);
+      if (isEmpty(IAQIs)) {
+        resultMap.put("AQI", "N/V");
+      } else {
+        Double AQI = Collections.max(IAQIs);
+        if (AQI == Double.MAX_VALUE) {
+          resultMap.put("AQI", IAQIValues[IAQIValues.length - 1]);
+        } else {
+          resultMap.put("AQI", String.format("%.0f", AQI));
+        }
+      }
+    }
+    return resultMap;
+  }
+
+  @Override
+  public Map<String, List> getCompareReport(Map<String, Object> parameters) throws Exception {
+    Map<String, List> resultMap = new HashMap<String, List>();
+    List<Map<String, Object>> list = JSON.parseObject((String) parameters.remove("items"), new TypeReference<List<Map<String, Object>>>() {
+    });
+
+    String type = (String) parameters.get("type");
+    // parameters.putAll(getElementByType(type));
+    ParameterUtils.getElementByType(parameters);
+    Integer timeLength = Integer.valueOf(parameters.remove("timeLength").toString());
+    if ("month".equals(type)) {
+      for (Map<String, Object> map : list) {
+        String[] formatTime = map.get("formatTime").toString().split("-");
+        LocalDate localDate = LocalDate.of(Integer.valueOf(formatTime[0]), Integer.valueOf(formatTime[1]), 1);
+        int lengthOfMonth = localDate.lengthOfMonth();
+        if (lengthOfMonth > timeLength) {
+          timeLength = lengthOfMonth;
+        }
+      }
+    }
+
+    List<Object> timeList = new ArrayList<Object>();
+    for (int i = 0; i < timeLength; i++) {
+      timeList.add(String.format("%02d", "day".equals(type) || "hour".equals(type) ? i : i + 1));
+    }
+    parameters.put("timeList", timeList);
+
+    ExecutorService threadPool = Executors.newCachedThreadPool();
+    CompletionService<Map<String, Object>> cs = new ExecutorCompletionService<Map<String, Object>>(threadPool);
+    for (int i = 0; i < list.size(); i++) {
+      Map<String, Object> map = list.get(i);
+      map.put("part", i);
+      if (ObjectUtils.isEmpty(map.get("mac"))) {
+        map.remove("mac");
+      }
+      map.put("time", map.remove("formatTime"));
+      map.putAll(parameters);
+      cs.submit(new Callable<Map<String, Object>>() {
+        @Override
+        public Map<String, Object> call() throws Exception {
+          return getMonitorPointOrDeviceAvgData4Compare(map);
+        }
+      });
+    }
+
+    List<Object> dataList = new ArrayList<Object>();
+    for (Map<String, Object> map : list) {
+      dataList.add(cs.take().get());
+    }
+    Object[] datas = new Object[list.size()];
+    Object[] deviceCounts = new Object[list.size()];
+    Object[] alarmDatas = new Object[list.size()];
+    Set<String> sensors = new TreeSet<String>(new Comparator<String>() {
+      @Override
+      public int compare(String o1, String o2) {
+        return o1.split("-")[0].compareTo(o2.split("-")[0]);
+        //return Integer.compare(Integer.valueOf(o1.split("-")[0].replace("e", "")), Integer.valueOf(o2.split("-")[0].replace("e", "")));
+      }
+    });
+    Map<String, Double> sortMap = new HashMap<String, Double>();
+    for (Object object : dataList) {
+      Map<String, Object> map = (Map<String, Object>) object;
+      for (String key : map.keySet()) {
+        int index = Integer.valueOf(key.substring(key.length() - 1));
+        String actual = key.substring(0, key.length() - 1);
+        Object obj = map.get(key);
+        switch (actual) {
+          case "data":
+            datas[index] = obj;
+            break;
+          case "deviceCount":
+            deviceCounts[index] = obj;
+            break;
+          case "alarmData":
+            alarmDatas[index] = obj;
+            if (!ObjectUtils.isEmpty(obj)) {
+              Map<String, BigDecimal> mapData = (Map<String, BigDecimal>) obj;
+              BigDecimal sum = mapData.remove("sum");
+              for (Entry<String, BigDecimal> entry : mapData.entrySet()) {
+                if (!"name".equals(entry.getKey())) {
+                  sortMap.put(entry.getKey() + "-" + index, new BigDecimal(100).multiply(entry.getValue())
+                    .divide(sum, 2, BigDecimal.ROUND_HALF_UP).doubleValue());
+
+                }
+              }
+            }
+            break;
+          case "sensors":
+            sensors.addAll((List<String>) obj);
+            break;
+        }
+      }
+    }
+    List<Map.Entry<String, Double>> sortList = new ArrayList<Map.Entry<String, Double>>(sortMap.entrySet());
+    Collections.sort(sortList, new Comparator<Map.Entry<String, Double>>() {
+      @Override
+      public int compare(Entry<String, Double> o1, Entry<String, Double> o2) {
+        if (o2.getValue().compareTo(o1.getValue()) == 0) {
+          String[] key1 = o1.getKey().split("-");
+          String[] key2 = o2.getKey().split("-");
+//					String sensor1  = key1[0].replace("e", "");
+//					String sensor2  = key2[0].replace("e", "");
+//					if (Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2)) == 0) {
+//						return Integer.compare(Integer.valueOf(key1[1]), Integer.valueOf(key2[1]));
+//					}
+//					return Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2));
+          if (key1[0].compareTo(key2[0]) == 0) {
+            return Integer.compare(Integer.valueOf(key1[1]), Integer.valueOf(key2[1]));
+          } else {
+            return key1[0].compareTo(key2[0]);
+          }
+        } else {
+          return o2.getValue().compareTo(o1.getValue());
+        }
+      }
+
+    });
+    resultMap.put("times", timeList);
+    resultMap.put("datas", Arrays.asList(datas));
+    resultMap.put("deviceCounts", Arrays.asList(deviceCounts));
+    resultMap.put("alarmDatas", Arrays.asList(alarmDatas));
+    resultMap.put("sensors", new ArrayList<Object>(sensors));
+    resultMap.put("sortList", sortList);
+    return resultMap;
+  }
+
+
+  public Map<String, Object> getMonitorPointOrDeviceAvgData4Compare(Map<String, Object> parameters) throws Exception {
+    Map<String, Object> resultMap = new HashMap<String, Object>();
+    List<Map<String, Object>> resultList = getMonitorPointOrDeviceAvgData(parameters);
+    List<Object> timeList = (List<Object>) parameters.get("timeList");
+    List<String> sensors = (List<String>) parameters.get("sensors");
+    String part = parameters.get("part").toString();
+    Map<String, Double[]> doubleMap = new LinkedHashMap<String, Double[]>();
+    for (Map<String, Object> map : resultList) {
+      String time = map.get("time").toString();
+      time = time.substring(time.length() - 2);
+      int index = timeList.indexOf(time);
+      for (String sensor : sensors) {
+        String[] split = sensor.split("-");
+        String sensorKey = split[0];
+        if (map.containsKey(sensorKey)) {
+          Double[] doubles;
+          if (doubleMap.containsKey(sensor)) {
+            doubles = doubleMap.get(sensor);
+          } else {
+            doubles = new Double[timeList.size()];
+          }
+          doubles[index] = (Double) map.get(sensorKey);
+          doubleMap.put(sensor, doubles);
+        }
+      }
+    }
+
+    Object deviceCount;
+    if (parameters.containsKey("deviceCount")) {
+      deviceCount = parameters.remove("deviceCount");
+    } else {
+      deviceCount = deviceMapper.getDeviceCountByRegion(parameters);
+    }
+
+    resultMap.put("deviceCount" + part, deviceCount);
+    resultMap.put("data" + part, doubleMap);
+    resultMap.put("sensors" + part, sensors);
+    Object type = parameters.get("type");
+    if ("year".equals(type) || "month".equals(type)) {
+      parameters.put("sensorKeys", Arrays.asList("e1", "e2", "e10", "e11", "e15", "e16"));
+      List<Map<String, Object>> alarmData = alarmDailyMapper.getAlarmData(parameters);
+      if (!ObjectUtils.isEmpty(alarmData)) {
+        resultMap.put("alarmData" + part, alarmDailyMapper.getAlarmData(parameters).get(0));
+      }
+    }
+    return resultMap;
+  }
+
+  @Override
+  public List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception {
+    convertQueryParam(parameters);
+    if (!ObjectUtils.isEmpty(parameters.get("compensate"))) {
+      parameters.put("timeUnits", "10min");
+    }
+    return historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);
+  }
+
+  @Override
+  public List<Map<String, Object>> getAreaAvgDataByAreaCode(Map<String, Object> parameters) throws Exception {
+    convertQueryParam(parameters);
+    if (!ObjectUtils.isEmpty(parameters.get("compensate"))) {
+      parameters.put("timeUnits", "10min");
+    }
+    return historyMinutelyMapper.getAreaAvgDataByAreaCode(parameters);
+
+  }
+
+  @Override
+  public void convertQueryParam(Map<String, Object> parameters) throws ParseException {
+    if (!parameters.containsKey("field")) {
+      // String type = (String) parameters.get("type");
+      // parameters.putAll(getElementByType(type));
+      ParameterUtils.getElementByType(parameters);
+    }
+    String time = (String) parameters.get("time");
+    String format = (String) parameters.get("format");
+    Integer field = Integer.valueOf(parameters.get("field").toString());
+    Date start = DateUtils.parseDate(time, format), end = null;
+    if (parameters.containsKey("timeb")) {
+      end = DateUtils.parseDate((String) parameters.get("timeb"), format);
+    } else {
+      Calendar instance = Calendar.getInstance();
+      instance.setTime(start);
+      instance.add(field, 1);
+      end = instance.getTime();
+    }
+    parameters.put("start", start);
+    parameters.put("end", end);
+
+    List<String> sensorKeys = new ArrayList<String>();
+    List<String> sensors = new ArrayList<String>();
+    if (parameters.containsKey("sensors")) {
+      try {
+        sensors = JSON.parseObject((String) parameters.get("sensors"), new TypeReference<List<String>>() {
+        });
+        for (String sensor : sensors) {
+          sensorKeys.add(sensor.split("-")[0]);
+        }
+      } catch (Exception e) {
+        sensorKeys = sensors = (List<String>) parameters.remove("sensors");
+      }
+    } else {
+      List<Sensor> sensorList = sensorMapper.getSensorsByCriteria(parameters);
+      for (Sensor sensor : sensorList) {
+        sensorKeys.add(sensor.getSensorKey());
+        String string = sensor.getSensorKey() + "-" + sensor.getName() + "-" + sensor.getUnit();
+        if (parameters.containsKey("description")) {
+          string += "-" + sensor.getDescription();
+        }
+        sensors.add(string);
+      }
+    }
+    parameters.put("sensorKeys", sensorKeys);
+    parameters.put("sensors", sensors);
+  }
+
+  @Override
+  public Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters) {
+    //ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
+    Object sensorKey = parameters.remove("macKey");
+    ValidateUtil.notNull(sensorKey, "param.is.null");
+    Map<String, Object> result = new HashMap<String, Object>();
+    LocalDate end = LocalDate.now(), start;
+    // ���������������������������������������
+    if (1 == end.getDayOfMonth()) {
+      // ���������1���00:00:00
+      start = end.plusDays(-1).with(TemporalAdjusters.firstDayOfMonth());
+    } else {
+      // ���������1���00:00:00
+      start = end.with(TemporalAdjusters.firstDayOfMonth());
+    }
+    parameters.put("start", start);
+    parameters.put("end", end);
+    parameters.put("sensorKeys", Arrays.asList(sensorKey));
+
+    Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);
+    if (isEmpty(average)) {
+      result.put("average", NULL_VALUE);
+    } else {
+      result.put("average", String.format("%.2f", average.get(sensorKey)));
+    }
+    return result;
+  }
+
+  /**
+   * ������������������������������������������������������������������
+   *
+   * @param lineChartCriteria
+   * @return
+   */
+  @Override
+  public Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria) {
+    Map<String, List<List<Double>>> listMap = new HashMap<>();
+    List<String> sensorKeys = lineChartCriteria.getSensorKeys();
+    List<DataCondition> dataConditionList = lineChartCriteria.getDataConditions();
+    TimePeriod timePeriod = lineChartCriteria.getTimePeriod();
+    sensorKeys.forEach(sensorKey -> {
+      listMap.put(sensorKey, new ArrayList<List<Double>>(dataConditionList.size()));
+    });
+    dataConditionList.forEach(dataCondition -> {
+      Map<String, List<Double>> dataMap = queryOneLineChartDateByCrieria(sensorKeys, timePeriod, dataCondition);
+      // ������������
+      listMap.forEach((sensorKey, list) -> {
+        List<Double> rowData = dataMap.get(sensorKey);
+        list.add(rowData);
+      });
+    });
+    return listMap;
+  }
+
+  /**
+   * ������������������������������������������������������������������,������ ������������������
+   *
+   * @param sensorKeys
+   * @param timePeriod
+   * @param dataCondition
+   * @return
+   */
+  public Map<String, List<Double>> queryOneLineChartDateByCrieria(List<String> sensorKeys, TimePeriod timePeriod, DataCondition dataCondition) {
+    List<String> timeList = ReportTimeFormat.makeTimeList(timePeriod);
+    List<Map<String, Object>> lineChartDatas = historyMinutelyMapper.selectLineChartDateByCrieria(sensorKeys, timePeriod, dataCondition);
+    Map<String, List<Double>> lineChartDatasWithEmpty = new HashMap<>();
+    // lineChartDatasWithEmpty ���������
+    sensorKeys.forEach(sensorKey -> {
+      lineChartDatasWithEmpty.put(sensorKey, timeList.stream().map(time -> {
+        Double data = null;
+        return data;
+      }).collect(Collectors.toList()));
+    });
+    // m ���������data���index������������������m������
+    int m = 0;
+    int dataLength = lineChartDatas.size() - 1;
+    m = dataLength > -1 ? 0 : -1;
+    if (m > -1) {
+      for (int n = 0; n < timeList.size(); n++) {
+        if (m > -1) {
+          String time = timeList.get(n);
+          Map<String, Object> rowData = lineChartDatas.get(m);
+          String keyTime = rowData.get("format_time").toString();
+          if (time.equals(keyTime)) {
+            // list to map
+            int finalN = n;
+            sensorKeys.forEach(sensorKey -> {
+              Object value = rowData.get(sensorKey);
+              List<Double> lineChartDatasWithEmptyTemp = lineChartDatasWithEmpty.get(sensorKey);
+              if (finalN < lineChartDatasWithEmptyTemp.size()) {
+                Double sensorValue = value != null ? new Double(value.toString()) : null;
+                lineChartDatasWithEmptyTemp.set(finalN, sensorValue);
+              }
+            });
+            // ������ -1���������������
+            m = m < dataLength ? m + 1 : -1;
+          }
+        }
+      }
+    }
+    return lineChartDatasWithEmpty;
+  }
+
+  private Map<String, Object> getElementByType(Object type) {
+    Map<String, Object> resultMap = new HashMap<String, Object>();
+    switch (type.toString()) {
+      case "year":
+        resultMap.put("format", "yyyy");
+        resultMap.put("typeFormat", "%Y-%m");
+        resultMap.put("timeLength", 12);
+        resultMap.put("field", Calendar.YEAR);
+        break;
+      case "month":
+        resultMap.put("format", "yyyy-MM");
+        resultMap.put("typeFormat", "%Y-%m-%d");
+        resultMap.put("timeLength", 28);
+        resultMap.put("field", Calendar.MONTH);
+        break;
+      case "day":
+        resultMap.put("format", "yyyy-MM-dd");
+        resultMap.put("typeFormat", "%Y-%m-%d %H");
+        resultMap.put("timeLength", 24);
+        resultMap.put("field", Calendar.DATE);
+        break;
+      case "hour":
+        resultMap.put("format", "yyyy-MM-dd HH");
+        resultMap.put("typeFormat", "%Y-%m-%d %H:%i");
+        resultMap.put("timeLength", 60);
+        resultMap.put("field", Calendar.HOUR);
+        break;
+    }
+    return resultMap;
+  }
+
+  /*
+   * @description ���������������������������������sensor���
+   * @author ZhuDongming
+   * @date 2019-07-25 09:21:45
+   * @param parameters
+   * @return
+   */
+  @Override
+  public List<List<Map<String, Object>>> getSensorData(Map<String, Object> parameters) {
+    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;
+    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 (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()).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;
+  }
+
+  @Override
+  public List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters) throws Exception {
+    if ("month".equals(parameters.get("type"))) {
+      parameters.put("timeUnits", "daily");
+      parameters.put("typeFormat", "%Y-%m-%d");
+      String time = parameters.get("time") + "-01T00:00:00";
+      LocalDateTime value = LocalDateTime.parse(time);
+      LocalDateTime start = value.with(TemporalAdjusters.firstDayOfMonth());
+      LocalDateTime end = value.with(TemporalAdjusters.lastDayOfMonth());
+      parameters.put("start", start);
+      parameters.put("end", end);
+      int day = end.getDayOfMonth();
+      List<String> timeList = new ArrayList<>();
+      for (int i = 0; i <= day - 1; i++) {
+        timeList.add(start.plusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+      }
+      parameters.put("timeList", timeList);
+    } else if ("day".equals(parameters.get("type"))) {
+      String time = parameters.get("time") + "T00:00:00";
+      LocalDateTime value = LocalDateTime.parse(time);
+      LocalDateTime end = value.plusHours(23);
+      parameters.put("timeUnits", "hourly");
+      parameters.put("typeFormat", "%Y-%m-%d %H:%i");
+      parameters.put("start", time);
+      parameters.put("end", end);
+      List<String> timeList = new ArrayList<>();
+      for (int i = 0; i <= 23; i++) {
+        timeList.add(value.plusHours(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")));
+      }
+      parameters.put("timeList", timeList);
+    }
+    return historyMinutelyMapper.getDevicesAvgDataToExcel(parameters);
+  }
+
+  @Override
+  public List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters) throws Exception {
+    if ("month".equals(parameters.get("type"))) {
+      parameters.put("timeUnits", "daily");
+      parameters.put("typeFormat", "%Y-%m-%d");
+      String time = parameters.get("time") + "-01T00:00:00";
+      LocalDateTime value = LocalDateTime.parse(time);
+      LocalDateTime start = value.with(TemporalAdjusters.firstDayOfMonth());
+      LocalDateTime end = value.with(TemporalAdjusters.lastDayOfMonth());
+      parameters.put("start", start);
+      parameters.put("end", end);
+      int day = end.getDayOfMonth();
+      List<String> timeList = new ArrayList<>();
+      for (int i = 0; i <= day - 1; i++) {
+        timeList.add(start.plusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+      }
+      parameters.put("timeList", timeList);
+    } else if ("day".equals(parameters.get("type"))) {
+      String time = parameters.get("time") + "T00:00:00";
+      LocalDateTime value = LocalDateTime.parse(time);
+      LocalDateTime end = value.plusHours(23);
+      parameters.put("timeUnits", "hourly");
+      parameters.put("typeFormat", "%Y-%m-%d %H:%i");
+      parameters.put("start", time);
+      parameters.put("end", end);
+      List<String> timeList = new ArrayList<>();
+      for (int i = 0; i <= 23; i++) {
+        timeList.add(value.plusHours(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")));
+      }
+      parameters.put("timeList", timeList);
+    }
+    return historyMinutelyMapper.getDevicesSensorsAvgDataToExcel(parameters);
+  }
+
+}
diff --git a/src/main/resources/mapper/HangzhouAqiMapper.xml b/src/main/resources/mapper/HangzhouAqiMapper.xml
index bd3e260..81fe13b 100644
--- a/src/main/resources/mapper/HangzhouAqiMapper.xml
+++ b/src/main/resources/mapper/HangzhouAqiMapper.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.moral.mapper.HangzhouAqiMapper" >
-  <resultMap id="BaseResultMap" type="com.moral.entity.HangzhouAqi" >
-    <id column="time" property="time" jdbcType="TIMESTAMP" />
-    <result column="aqi_json" property="aqiJson" jdbcType="OTHER" />
-    <result column="city_code" property="cityCode" jdbcType="VARCHAR" />
+<mapper namespace="com.moral.mapper.HangzhouAqiMapper">
+  <resultMap id="BaseResultMap" type="com.moral.entity.HangzhouAqi">
+    <id column="time" property="time" jdbcType="TIMESTAMP"/>
+    <result column="aqi_json" property="aqiJson" jdbcType="OTHER"/>
+    <result column="city_code" property="cityCode" jdbcType="VARCHAR"/>
   </resultMap>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     time, aqi_json, city_code
   </sql>
   <!--<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.util.Date" >-->
-    <!--select-->
-    <!--<include refid="Base_Column_List" />-->
-    <!--from hangzhou_aqi-->
-    <!--where time = #{time,jdbcType=TIMESTAMP}-->
+  <!--select-->
+  <!--<include refid="Base_Column_List" />-->
+  <!--from hangzhou_aqi-->
+  <!--where time = #{time,jdbcType=TIMESTAMP}-->
   <!--</select>-->
-    <select id="selectAqisByCodeAndTimePeriod" resultType="map" parameterType="java.util.Date" >
+  <select id="selectAqisByCodeAndTimePeriod" resultType="map" parameterType="java.util.Date">
       select
         aqi_json->'$.AQI' as aqi,DATE_FORMAT(time,'${@com.moral.common.util.ReportTimeFormat@toMySqlTimeFormat(timePeriod.timeUnits)}') as 'time'
       from hangzhou_aqi
@@ -33,18 +33,22 @@
           order by time asc
     </select>
 
-    <select id="getAqisByOrganizationId" resultType="map">
-		SELECT
-			h.aqi_json ->> '$.AQI' * 1 aqi,
-			DATE_FORMAT( h.time, '%H' ) * 1 time 
-		FROM
-			hangzhou_aqi h 
-		<where>
-			h.city_code = #{cityCode}
-		AND h.time <![CDATA[<]]> #{end}
-		</where> 
-		ORDER BY
-			h.time DESC
-		LIMIT 24
+  <select id="getAqisByOrganizationId" resultType="map">
+    SELECT
+    h.aqi_json ->> '$.AQI' * 1 aqi,
+    DATE_FORMAT( h.time, '%H' ) * 1 time
+    FROM
+    hangzhou_aqi h
+    <where>
+      h.city_code = #{cityCode}
+      AND h.time <![CDATA[<]]> #{end}
+    </where>
+    ORDER BY
+    h.time DESC
+    LIMIT 24
+  </select>
+
+  <select id="queryCityCode" resultType="integer">
+      select city_code from area where area_code = #{areaCode}
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 151cc41..9a7d185 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -1,216 +1,233 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.moral.mapper.HistoryMinutelyMapper">
-    <resultMap id="PairDataResultMap" type="com.moral.entity.charts.PairData">
-        <result column="format_time" property="category" jdbcType="VARCHAR"/>
-        <result column="value" property="value" jdbcType="DOUBLE"/>
-    </resultMap>
-    <select id="getSersionAvgByDevice" resultType="java.util.Map">
-        SELECT
-        <foreach collection="sensorKeys" separator="," item="sensorKey">
-            AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'
-        </foreach>
-        FROM
-        history_minutely_${yearAndMonth}
-        WHERE
-        mac IN
-        (SELECT
-        d.mac
-        FROM
-        device d
-        WHERE
-        d.is_delete = 0
-        <if test="monitorPointId != null">
-            AND d.monitor_point_id = #{monitorPointId}
-        </if>
-        <if test="mac != null">
-            AND d.mac = #{mac}
-        </if>
-        )
-        AND time >= #{start}
-        AND time &lt; #{end}
-    </select>
+  <resultMap id="PairDataResultMap" type="com.moral.entity.charts.PairData">
+    <result column="format_time" property="category" jdbcType="VARCHAR"/>
+    <result column="value" property="value" jdbcType="DOUBLE"/>
+  </resultMap>
+  <select id="getSersionAvgByDevice" resultType="java.util.Map">
+    SELECT
+    <foreach collection="sensorKeys" separator="," item="sensorKey">
+      AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'
+    </foreach>
+    FROM
+    history_minutely_${yearAndMonth}
+    WHERE
+    mac IN
+    (SELECT
+    d.mac
+    FROM
+    device d
+    WHERE
+    d.is_delete = 0
+    <if test="monitorPointId != null">
+      AND d.monitor_point_id = #{monitorPointId}
+    </if>
+    <if test="mac != null">
+      AND d.mac = #{mac}
+    </if>
+    )
+    AND time >= #{start}
+    AND time &lt; #{end}
+  </select>
 
-    <select id="getMonitorPointOrDeviceAvgData" resultType="java.util.Map">
-        SELECT
-        DATE_FORMAT(time, #{typeFormat}) time
-        <foreach collection="sensorKeys" open="," separator="," item="sensorKey">
-            AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'
+  <select id="getMonitorPointOrDeviceAvgData" resultType="java.util.Map">
+    SELECT
+    DATE_FORMAT(time, #{typeFormat}) time
+    <foreach collection="sensorKeys" open="," separator="," item="sensorKey">
+      AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'
+    </foreach>
+    FROM
+    history_${timeUnits} h
+    WHERE
+    h.time >= #{start}
+    AND h.time <![CDATA[<]]> #{end}
+    <if test="mac != null">
+      AND h.mac = #{mac}
+    </if>
+    <if test="mac == null">
+      AND h.mac IN
+      (SELECT
+      d.mac
+      FROM
+      device d,
+      monitor_point mp
+      WHERE
+      d.monitor_point_id = mp.id
+      <if test="provinceCode != null">
+        AND mp.province_code = #{provinceCode}
+      </if>
+      <if test="cityCode != null">
+        AND mp.city_code = #{cityCode}
+      </if>
+      <if test="areaCode != null">
+        AND mp.area_code = #{areaCode}
+      </if>
+      <if test="monitorPointId != null">
+        AND mp.id = #{monitorPointId}
+      </if>
+      <if test="professionId != null">
+        AND d.profession_id = #{professionId}
+      </if>
+      )
+    </if>
+
+    GROUP BY
+    DATE_FORMAT(time, #{typeFormat})
+    ORDER BY
+    time
+  </select>
+
+  <select id="getAreaAvgDataByAreaCode" resultType="java.util.Map">
+    SELECT
+    DATE_FORMAT(time, #{typeFormat}) time,
+    AVG(aqi_json->'$.${sensors1}') AS '${sensors2}'
+    FROM
+    hangzhou_aqi ha
+    WHERE
+    ha.time >= #{start}
+    AND ha.time <![CDATA[<]]> #{end}
+    AND ha.city_code = #{areaCode}
+    GROUP BY
+    DATE_FORMAT(time, #{typeFormat})
+    ORDER BY
+    time
+  </select>
+
+  <select id="selectLineChartDateByCrieria" resultType="java.util.Map">
+    SELECT
+    <choose>
+      <when test="'MINUTE'==dataCondition.timeUnits.toString() and 'DEVICE'==dataCondition.areaRange.toString()">
+        <foreach collection="sensorKeys"
+                 item="sensorKey" separator="," close=",">
+          json->'$.${sensorKey}[0]' as '${sensorKey}'
         </foreach>
-        FROM
-        history_${timeUnits} h
-        WHERE
-        h.time >= #{start}
-        AND h.time <![CDATA[<]]> #{end}
-        <if test="mac != null">
-            AND h.mac = #{mac}
+      </when>
+      <otherwise>
+        <foreach collection="sensorKeys"
+                 item="sensorKey" separator="," close=",">
+          AVG(json->'$.${sensorKey}[0]') as '${sensorKey}'
+        </foreach>
+      </otherwise>
+    </choose>
+    DATE_FORMAT(time,'${@com.moral.common.util.ReportTimeFormat@toMySqlTimeFormat(timePeriod.timeUnits)}') as
+    format_time
+    FROM
+    `history_minutely` hmi
+    <where>
+      and hmi.time >= #{timePeriod.startTime}
+      and hmi.time <![CDATA[<=]]> #{timePeriod.endTime}
+      <if test="dataCondition.actualTime != null">
+        and DATE_FORMAT(time,
+        '${@com.moral.common.util.ReportTimeFormat@toMySqlActualTimeFormat(dataCondition.timeUnits)}') =
+        #{dataCondition.actualTime}
+      </if>
+      and hmi.mac in (
+      select mac from device dev
+      join monitor_point mpt on dev.monitor_point_id = mpt.id
+      <where>
+        <if test='"DEVICE"==dataCondition.areaRange.toString()'>
+          and dev.id = #{dataCondition.areaRangeId}
         </if>
-        <if test="mac == null">
-            AND h.mac IN
-            (SELECT
-            d.mac
-            FROM
-            device d,
-            monitor_point mp
-            WHERE
-            d.monitor_point_id = mp.id
-            <if test="provinceCode != null">
-                AND mp.province_code = #{provinceCode}
-            </if>
-            <if test="cityCode != null">
-                AND mp.city_code = #{cityCode}
-            </if>
-            <if test="areaCode != null">
-                AND mp.area_code = #{areaCode}
-            </if>
-            <if test="monitorPointId != null">
-                AND mp.id = #{monitorPointId}
-            </if>
-            <if test="professionId != null">
-                AND d.profession_id = #{professionId}
-            </if>
-            )
+        <if test='"PROFESSION"==dataCondition.deviceDimension.toString()'>
+          and dev.profession_id = #{dataCondition.dimensionValue}
         </if>
-
-        GROUP BY
-        DATE_FORMAT(time, #{typeFormat})
-        ORDER BY
-        time
-    </select>
-    <select id="selectLineChartDateByCrieria" resultType="java.util.Map">
-        SELECT
-        <choose>
-            <when test="'MINUTE'==dataCondition.timeUnits.toString() and 'DEVICE'==dataCondition.areaRange.toString()">
-                <foreach collection="sensorKeys"
-                         item="sensorKey" separator="," close=",">
-                    json->'$.${sensorKey}[0]' as '${sensorKey}'
-                </foreach>
-            </when>
-            <otherwise>
-                <foreach collection="sensorKeys"
-                         item="sensorKey" separator="," close=",">
-                    AVG(json->'$.${sensorKey}[0]') as '${sensorKey}'
-                </foreach>
-            </otherwise>
-        </choose>
-        DATE_FORMAT(time,'${@com.moral.common.util.ReportTimeFormat@toMySqlTimeFormat(timePeriod.timeUnits)}') as
-        format_time
-        FROM
-        `history_minutely` hmi
-        <where>
-            and hmi.time >= #{timePeriod.startTime}
-            and hmi.time <![CDATA[<=]]> #{timePeriod.endTime}
-            <if test="dataCondition.actualTime != null">
-                and DATE_FORMAT(time,
-                '${@com.moral.common.util.ReportTimeFormat@toMySqlActualTimeFormat(dataCondition.timeUnits)}') =
-                #{dataCondition.actualTime}
-            </if>
-            and hmi.mac in (
-            select mac from device dev
-            join monitor_point mpt on dev.monitor_point_id = mpt.id
-            <where>
-                <if test='"DEVICE"==dataCondition.areaRange.toString()'>
-                    and dev.id = #{dataCondition.areaRangeId}
-                </if>
-                <if test='"PROFESSION"==dataCondition.deviceDimension.toString()'>
-                    and dev.profession_id = #{dataCondition.dimensionValue}
-                </if>
-                <if test='"MONITORPOINT"==dataCondition.areaRange.toString()'>
-                    and mpt.id = #{dataCondition.areaRangeId}
-                </if>
-                <if test='"PROVINCE"==dataCondition.areaRange.toString()'>
-                    and mpt.province_code = #{dataCondition.areaRangeId}
-                </if>
-                <if test='"CITY"==dataCondition.areaRange.toString()'>
-                    and mpt.city_code = #{dataCondition.areaRangeId}
-                </if>
-                <if test='"AREA"==dataCondition.areaRange.toString()'>
-                    and mpt.area_code = #{dataCondition.areaRangeId}
-                </if>
-            </where>
-            )
-        </where>
-        <if test="'MINUTE'!=dataCondition.timeUnits.toString() or 'DEVICE'!=dataCondition.areaRange.toString()">
-            GROUP BY format_time
+        <if test='"MONITORPOINT"==dataCondition.areaRange.toString()'>
+          and mpt.id = #{dataCondition.areaRangeId}
         </if>
-        ORDER BY format_time asc
-    </select>
+        <if test='"PROVINCE"==dataCondition.areaRange.toString()'>
+          and mpt.province_code = #{dataCondition.areaRangeId}
+        </if>
+        <if test='"CITY"==dataCondition.areaRange.toString()'>
+          and mpt.city_code = #{dataCondition.areaRangeId}
+        </if>
+        <if test='"AREA"==dataCondition.areaRange.toString()'>
+          and mpt.area_code = #{dataCondition.areaRangeId}
+        </if>
+      </where>
+      )
+    </where>
+    <if test="'MINUTE'!=dataCondition.timeUnits.toString() or 'DEVICE'!=dataCondition.areaRange.toString()">
+      GROUP BY format_time
+    </if>
+    ORDER BY format_time asc
+  </select>
 
-    <!-- ���������sensor������ -->
-    <select id="getSensorData" resultType="java.util.LinkedHashMap">
-        SELECT
-        DATE_FORMAT(hm.time,'%Y-%m-%d %H:%i:%s') time,
-        <foreach collection="sensorKeys" item="sensorKey" separator=",">
-            hm.json->'$.${sensorKey}[0]' as '${sensorKey}',
-            hm.json->'$.${sensorKey}[1]' as 'min${sensorKey}',
-            hm.json->'$.${sensorKey}[2]' as 'max${sensorKey}'
-        </foreach>
-        FROM
-        history_minutely as hm
-        <where>
-            <if test="mac!=null">
-                and hm.mac=#{mac}
-            </if>
-            and hm.time >= #{startTime}
-            and hm.time <![CDATA[<]]> #{endTime}
-        </where>
-        ORDER BY
-        hm.time
-    </select>
+  <!-- ���������sensor������ -->
+  <select id="getSensorData" resultType="java.util.LinkedHashMap">
+    SELECT
+    DATE_FORMAT(hm.time,'%Y-%m-%d %H:%i:%s') time,
+    <foreach collection="sensorKeys" item="sensorKey" separator=",">
+      hm.json->'$.${sensorKey}[0]' as '${sensorKey}',
+      hm.json->'$.${sensorKey}[1]' as 'min${sensorKey}',
+      hm.json->'$.${sensorKey}[2]' as 'max${sensorKey}'
+    </foreach>
+    FROM
+    history_minutely as hm
+    <where>
+      <if test="mac!=null">
+        and hm.mac=#{mac}
+      </if>
+      and hm.time >= #{startTime}
+      and hm.time <![CDATA[<]]> #{endTime}
+    </where>
+    ORDER BY
+    hm.time
+  </select>
 
-    <select id="getSensorData2020" resultType="java.util.LinkedHashMap">
-        SELECT
-        DATE_FORMAT(hm.time,'%Y-%m-%d %H:%i:%s') time,
-        <foreach collection="sensorKeys" item="sensorKey" separator=",">
-            hm.json->'$.${sensorKey}[0]' as '${sensorKey}',
-            hm.json->'$.${sensorKey}[1]' as 'min${sensorKey}',
-            hm.json->'$.${sensorKey}[2]' as 'max${sensorKey}'
-        </foreach>
-        FROM
-        history_minutely_${yearAndMonth} as hm
-        <where>
-            <if test="mac!=null">
-                and hm.mac=#{mac}
-            </if>
-            and hm.time >= #{startTime}
-            and hm.time <![CDATA[<]]> #{endTime}
-        </where>
-        ORDER BY
-        hm.time
-    </select>
+  <select id="getSensorData2020" resultType="java.util.LinkedHashMap">
+    SELECT
+    DATE_FORMAT(hm.time,'%Y-%m-%d %H:%i:%s') time,
+    <foreach collection="sensorKeys" item="sensorKey" separator=",">
+      hm.json->'$.${sensorKey}[0]' as '${sensorKey}',
+      hm.json->'$.${sensorKey}[1]' as 'min${sensorKey}',
+      hm.json->'$.${sensorKey}[2]' as 'max${sensorKey}'
+    </foreach>
+    FROM
+    history_minutely_${yearAndMonth} as hm
+    <where>
+      <if test="mac!=null">
+        and hm.mac=#{mac}
+      </if>
+      and hm.time >= #{startTime}
+      and hm.time <![CDATA[<]]> #{endTime}
+    </where>
+    ORDER BY
+    hm.time
+  </select>
 
-    <select id="getDevicesAvgDataToExcel" resultType="java.util.LinkedHashMap">
-        select
-        rs.monitorPointName,rs.name,
-        <foreach collection="timeList" separator="," item="time">
-            max(case time when #{time} then rs.${sensorKey} else "" end) as #{time}
-        </foreach>
-        from
-        (SELECT
-        m.name as monitorPointName,d.name,DATE_FORMAT(time, #{typeFormat}) time,
-        <foreach collection="sensorKeys" separator="," item="sensorKey">
-            AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'
-        </foreach>
-        FROM
-        history_${timeUnits} h,
-        device d,
-        monitor_point m
-        WHERE
-        h.mac=d.mac
-        AND d.monitor_point_id=m.id
-        AND h.time >= #{start}
-        AND h.time <![CDATA[<=]]> #{end}
-        AND h.mac in
-        <foreach collection="macs" open="(" separator="," close=")"
-                 item="mac">
-            #{mac}
-        </foreach>
-        GROUP BY
-        h.mac,m.name,d.name,DATE_FORMAT(time, #{typeFormat})
-        ORDER BY
-        h.mac) rs
-        GROUP BY rs.monitorPointName,rs.name
-        order by rs.monitorPointName
-    </select>
+  <select id="getDevicesAvgDataToExcel" resultType="java.util.LinkedHashMap">
+    select
+    rs.monitorPointName,rs.name,
+    <foreach collection="timeList" separator="," item="time">
+      max(case time when #{time} then rs.${sensorKey} else "" end) as #{time}
+    </foreach>
+    from
+    (SELECT
+    m.name as monitorPointName,d.name,DATE_FORMAT(time, #{typeFormat}) time,
+    <foreach collection="sensorKeys" separator="," item="sensorKey">
+      AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'
+    </foreach>
+    FROM
+    history_${timeUnits} h,
+    device d,
+    monitor_point m
+    WHERE
+    h.mac=d.mac
+    AND d.monitor_point_id=m.id
+    AND h.time >= #{start}
+    AND h.time <![CDATA[<=]]> #{end}
+    AND h.mac in
+    <foreach collection="macs" open="(" separator="," close=")"
+             item="mac">
+      #{mac}
+    </foreach>
+    GROUP BY
+    h.mac,m.name,d.name,DATE_FORMAT(time, #{typeFormat})
+    ORDER BY
+    h.mac) rs
+    GROUP BY rs.monitorPointName,rs.name
+    order by rs.monitorPointName
+  </select>
 
 </mapper>

--
Gitblit v1.8.0