From 9f161e190dbe9dc83642c6ad78bab5a113c9f660 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 27 Sep 2018 11:20:27 +0800
Subject: [PATCH] 大屏 path 更新
---
src/main/java/com/moral/controller/ScreenController.java | 68 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 3fdf54c..a2887ec 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.toString() );
}
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&®ionName!=null){
@@ -551,7 +571,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");
@@ -719,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 {
@@ -727,4 +748,15 @@
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);
+ }
}
--
Gitblit v1.8.0