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 |  189 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 162 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 064270e..7d68481 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -9,8 +9,10 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.alibaba.fastjson.JSONReader;
-import com.alibaba.fastjson.TypeReference;
+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.*;
 import com.moral.entity.alarm.AlarmConfig;
 import com.moral.entity.alarm.AlarmConfigValue;
@@ -18,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;
@@ -28,23 +31,15 @@
 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.bind.annotation.*;
 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.util.WebUtils;
 import com.moral.common.xml.Version;
 import com.moral.entity.alarm.AlarmSensorLevel;
 
@@ -58,7 +53,7 @@
  */
 @RestController
 @RequestMapping("/screen")
-//@CrossOrigin(origins = "*", maxAge = 3600)
+@CrossOrigin(origins = "*", maxAge = 3600)
 @SuppressWarnings({ "rawtypes", "unchecked", "unused" })
 @Api(tags = "Screen", description = "������������") 
 public class ScreenController {
@@ -110,6 +105,17 @@
 	private OrganizationLayoutService orgLayoutService;
 	@Resource
 	private  DeviceVersionService dviceVersionService;
+	@Resource
+    private  OrganizationService organizationService;
+	@Resource
+    private  DictionaryDataService dictionaryDataService;
+	
+	@Resource
+	private WeatherService weatherService;
+	
+	@Resource 
+	private QualityDailyService qualityDailyService;
+
 	/**
 	 * Screen login. ������������
 	 * 
@@ -126,6 +132,45 @@
 			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;
 	}
@@ -395,7 +440,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){
@@ -509,12 +554,10 @@
 	@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");
+		ParameterUtils.getTimeType4Time(parameters);
 		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);
+		Object sensorKey = parameters.remove("sensorKey");
+		parameters.put("sensors", Arrays.asList(sensorKey));
 		List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
 		
 		for (Map<String, Object> map : list) {
@@ -529,7 +572,8 @@
 	@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");
+		ParameterUtils.getTimeType4Time(parameters);
+		//parameters.put("type", "month");
 		String sensorKey = "list";
 		if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {
 			parameters.put("description", "description");
@@ -594,7 +638,9 @@
 				 DeviceVersion deviceVersion = deviceVersionService.queryVersionById(device.getDeviceVersionId());
 			     rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(orgId,deviceVersion.getVersion());
 			}else {
-				return  ResultBean.fail();
+				String errMsg = "device ���������������"+ JSON.toJSONString(device);
+				log.warn(errMsg);
+				return  ResultBean.fail(errMsg);
 			}
 
 		} else {
@@ -626,12 +672,7 @@
 	})
 	public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgDataBySensorKey(HttpServletRequest request) throws Exception {
 		Map<String, Object> parameters = getParametersStartingWith(request, null);
-		int length = ((String)parameters.get("time")).split("-").length;
-		if (length == 2) {
-			parameters.put("type", "month");
-		} else if (length == 3){
-			parameters.put("type", "day");
-		}
+		ParameterUtils.getTimeType4Time(parameters);
 		parameters.put("monitorPointId", parameters.remove("monitorPoint"));
 		String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
 		parameters.put("sensors", Arrays.asList(sensorKeys));
@@ -649,5 +690,99 @@
 		}
 		return new ResultBean<List<Map<String, Object>>>(list);
 	}
+	@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);
+		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