From 3c3f6b4816efe48645866a6ebc1581eb522dc229 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 27 Sep 2018 10:57:57 +0800
Subject: [PATCH] 大屏 path 更新

---
 src/main/java/com/moral/controller/ScreenController.java |   58 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 91f21b1..bcea347 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;
@@ -110,6 +112,9 @@
 	@Resource
 	private WeatherService weatherService;
 	
+	@Resource 
+	private QualityDailyService qualityDailyService;
+
 	/**
 	 * Screen login. ������������
 	 * 
@@ -132,21 +137,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( 0 == organization.getRank()) {
+						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 );
                 }
                 resultMap.put("mapPath",areaNamesBuilder.toString());
             }
@@ -419,7 +439,7 @@
 	 * @return
 	 */
 	@RequestMapping(value = "/map-page", method = RequestMethod.GET)
-	public ModelAndView map(ModelAndView model, @RequestParam("areaCode")int code, @RequestParam("accountId")int accountId){
+	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){
@@ -720,7 +740,7 @@
 	@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 = "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 {
@@ -736,9 +756,7 @@
 	})
 	public ResultBean<Map<String, Object>> getQualityCountDayByRegion(HttpServletRequest request) throws Exception {
 		Map<String, Object> parameters = getParametersStartingWith(request, null);
-		//Map<String, Object> map = hangzhouAqiService.getQualityCountDayByRegion(parameters);
-		Map<String, Object> map = new HashMap<String, Object>();
-		map.put("count", 136);
+		Map<String, Object> map = qualityDailyService.getQualityCountDayByRegion(parameters);
 		return new ResultBean<Map<String, Object>>(map);
 	}
 }

--
Gitblit v1.8.0