From 59efc00b3c872c76f50317513ddd4a1574844960 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 15 Mar 2018 14:52:28 +0800
Subject: [PATCH] 地图相关资源

---
 src/main/java/com/moral/controller/ScreenController.java |   88 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 65 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index eeac838..21c6424 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1,32 +1,22 @@
 package com.moral.controller;
 
-import static com.moral.common.util.RedisUtil.get;
-import static com.moral.common.util.RedisUtil.hasKey;
 import static com.moral.common.util.ResourceUtil.getValue;
 import static com.moral.common.util.WebUtils.getParametersStartingWith;
 
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.alibaba.fastjson.*;
-import com.moral.common.bean.JsonData;
-import com.moral.common.bean.PageResult;
-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.*;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.log4j.Logger;
 import org.dom4j.Document;
@@ -35,13 +25,40 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import com.moral.common.bean.ResultBean;
-import com.moral.common.util.ValidateUtil;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 import org.xml.sax.InputSource;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.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.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.������������
@@ -400,4 +417,29 @@
 		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("format", "yyyy-MM");
+		parameters.put("typeFormat", "%Y-%m-%d");
+		List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+		String sensorKey = parameters.get("sensorKey").toString();
+		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.get(sensorKey));
+			map.remove(sensorKey);
+		}
+		return new ResultBean<List<Map<String, Object>>>(list);
+	}
 }

--
Gitblit v1.8.0