From 30e3c5e878ed305a49e48a06f947c818933c5e3b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 06 Feb 2018 17:13:02 +0800
Subject: [PATCH] 地图相关

---
 src/main/java/com/moral/controller/ScreenController.java |   81 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 0673c42..88efaf1 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -6,21 +6,22 @@
 import static com.moral.common.util.WebUtils.getParametersStartingWith;
 
 import java.io.*;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.alibaba.fastjson.JSONObject;
+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.service.*;
+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;
@@ -32,9 +33,6 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONReader;
-import com.alibaba.fastjson.TypeReference;
 import com.moral.common.bean.ResultBean;
 import com.moral.common.util.ValidateUtil;
 import org.springframework.web.servlet.ModelAndView;
@@ -277,7 +275,17 @@
 		}
 		return version;
 	}
-
+	/**
+	 * ������������
+	 * ������
+	 */
+	/**
+	 * ������������
+	 * @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);
@@ -317,6 +325,18 @@
 		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(
@@ -327,4 +347,47 @@
 	){
 		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;
+	}
 }

--
Gitblit v1.8.0