From a4c1346fe8b37507d69413632848d30a5826efc6 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 21 Nov 2018 09:25:08 +0800
Subject: [PATCH] 更新

---
 src/main/java/com/moral/controller/ScreenController.java |   75 +++++++++++++++++++++++++++++--------
 1 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 2478a83..7d68481 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -10,6 +10,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 import com.alibaba.fastjson.*;
+import com.moral.common.util.BeanUtils;
 import com.moral.common.util.ParameterUtils;
 import com.moral.common.util.StringUtils;
 import com.moral.entity.*;
@@ -19,6 +20,7 @@
 import com.moral.entity.layout.RealTimeDeviceLayout;
 import com.moral.service.*;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.math.NumberUtils;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.log4j.Logger;
 import org.dom4j.Document;
@@ -37,6 +39,7 @@
 import com.moral.common.bean.PageResult;
 import com.moral.common.bean.ResultBean;
 import com.moral.common.util.ValidateUtil;
+import com.moral.common.util.WebUtils;
 import com.moral.common.xml.Version;
 import com.moral.entity.alarm.AlarmSensorLevel;
 
@@ -135,21 +138,36 @@
                 StringBuilder areaNamesBuilder = new StringBuilder("������");
                 if(!((Integer) orgId).equals(dictionaryDataService.querySupperOrgId())) {
                     Organization organization = organizationService.getOrganizationById((Integer) orgId);
-                    if(organization.getAreaNames()!=null){
-                        AreaNames areaNames =  organization.getAreaNames();
-                        if(!StringUtils.isNullOrEmpty(areaNames.getProvinceName())){
-                            areaNamesBuilder.append("/");
-                            areaNamesBuilder.append(areaNames.getProvinceName());
-                            if(!StringUtils.isNullOrEmpty(areaNames.getCityName())){
-                                areaNamesBuilder.append("/");
-                                areaNamesBuilder.append(areaNames.getCityName());
-                                if(!StringUtils.isNullOrEmpty(areaNames.getAreaName())){
-                                    areaNamesBuilder.append("/");
-                                    areaNamesBuilder.append(areaNames.getAreaName());
-                                }
-                            }
-                        }
-                    }
+						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());
             }
@@ -688,7 +706,7 @@
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "orgid",defaultValue = "5",value = "������id", required = true, paramType = "query", dataType = "Integer"),
 	})
-	public ResultBean<List<Map>> getAqi24HoursNC(@RequestParam("orgid") Integer organizationId) {
+	public ResultBean<List<Map<String,Object>>> getAqi24HoursNC(@RequestParam("orgid") Integer organizationId) {
 		return new ResultBean<>(hangzhouAqiService.queryAqi24Hours(organizationId));
 	}
 	@GetMapping("mpt-dev-summary")
@@ -742,4 +760,29 @@
 		Map<String, Object> map = qualityDailyService.getQualityCountDayByRegion(parameters);
 		return new ResultBean<Map<String, Object>>(map);
 	}
+
+	@GetMapping("monitorpoints-devices")
+	@ApiOperation(value = "���������������������������", notes = "���������������������������")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "organizationId",defaultValue = "8", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
+			@ApiImplicitParam(name = "regionCode",defaultValue = "320583", value = "���������", required = true, paramType = "query", dataType = "String")
+	})
+	public ResultBean<List<MonitorPoint>> getMonitorPointsAndDevicesByRegion(HttpServletRequest request) throws Exception {
+		Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+		List<MonitorPoint> monitorPoints= monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
+		return new ResultBean<List<MonitorPoint>>(monitorPoints);
+	}
+
+
+	@GetMapping("devices-state")
+	@ApiOperation(value = "������������������", notes = "������������������")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "organizationId",defaultValue = "8", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
+			@ApiImplicitParam(name = "regionCode",defaultValue = "320583", value = "���������", required = true, paramType = "query", dataType = "String")
+	})
+	public ResultBean<Collection<Object>> getDevicesStateByRegion(HttpServletRequest request) throws Exception {
+		Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+		Collection<Object> monitorPoints= monitorPointService.getDevicesStateByRegion(parameters);
+		return new ResultBean<Collection<Object>>(monitorPoints);
+	}
 }

--
Gitblit v1.8.0