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

---
 src/main/java/com/moral/controller/ScreenController.java | 3262 +++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 2,723 insertions(+), 539 deletions(-)

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

--
Gitblit v1.8.0