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/controller/ScreenController.java | 2942 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1,534 insertions(+), 1,408 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);
+    }
+
+}

--
Gitblit v1.8.0