From 1830f5429730a40f7d2f17ca748a80a4b1046c21 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 25 Mar 2019 09:12:22 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/ScreenController.java | 217 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 182 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 91f21b1..32d638a 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -3,21 +3,23 @@
import static com.moral.common.util.ResourceUtil.getValue;
import static com.moral.common.util.WebUtils.getParametersStartingWith;
-import java.io.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
import java.util.stream.Collectors;
+
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import com.alibaba.fastjson.*;
-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;
-import com.moral.entity.charts.DataSortCondition;
-import com.moral.entity.layout.RealTimeDeviceLayout;
-import com.moral.service.*;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.log4j.Logger;
@@ -29,16 +31,61 @@
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.*;
+import org.springframework.web.bind.annotation.CrossOrigin;
+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.servlet.ModelAndView;
import org.xml.sax.InputSource;
+
+import com.alibaba.fastjson.JSON;
+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.BeanUtils;
+import com.moral.common.util.ParameterUtils;
import com.moral.common.util.ValidateUtil;
+import com.moral.common.util.WebUtils;
import com.moral.common.xml.Version;
+import com.moral.entity.Account;
+import com.moral.entity.AreaNames;
+import com.moral.entity.Device;
+import com.moral.entity.DeviceVersion;
+import com.moral.entity.MapBounds;
+import com.moral.entity.MonitorPoint;
+import com.moral.entity.Organization;
+import com.moral.entity.Region;
+import com.moral.entity.alarm.AlarmConfig;
+import com.moral.entity.alarm.AlarmConfigValue;
import com.moral.entity.alarm.AlarmSensorLevel;
+import com.moral.entity.charts.DataSortCondition;
+import com.moral.entity.layout.RealTimeDeviceLayout;
+import com.moral.service.AccountService;
+import com.moral.service.AlarmConfigService;
+import com.moral.service.AlarmDailyService;
+import com.moral.service.AreaService;
+import com.moral.service.DeviceService;
+import com.moral.service.DeviceVersionService;
+import com.moral.service.DictionaryDataService;
+import com.moral.service.HangzhouAqiService;
+import com.moral.service.HistoryDailyService;
+import com.moral.service.HistoryMinutelyService;
+import com.moral.service.HistoryService;
+import com.moral.service.MachineActivateService;
+import com.moral.service.MonitorPointService;
+import com.moral.service.OrganizationLayoutService;
+import com.moral.service.OrganizationService;
+import com.moral.service.QualityDailyService;
+import com.moral.service.SensorService;
+import com.moral.service.WeatherService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -110,6 +157,9 @@
@Resource
private WeatherService weatherService;
+ @Resource
+ private QualityDailyService qualityDailyService;
+
/**
* Screen login. ������������
*
@@ -132,21 +182,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());
}
@@ -419,7 +484,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){
@@ -447,11 +512,13 @@
}
@RequestMapping(value="/get-monitorpoints",method = RequestMethod.GET)
@ResponseBody
- public ResultBean getMonitorpointList(@RequestParam("orgId")String orgId,MapBounds mapBounds){
+ public ResultBean getMonitorpointList(@RequestParam("orgId")String orgId,MapBounds mapBounds,@RequestParam("regionCode")String regionCode){
ResultBean<List<MonitorPoint>> resultBean = new ResultBean();
Map<String,Object> paramMap = new HashMap<String, Object>();
paramMap.put("orgId", orgId);
paramMap.put("mapBounds",mapBounds);
+ paramMap.put("regionCode",regionCode);
+ ParameterUtils.getRegionType4RegionCode(paramMap);
List<MonitorPoint> list = monitorPointService.queryWithStateByMap(paramMap);
resultBean.setData(list);
resultBean.setCode(ResultBean.SUCCESS);
@@ -459,11 +526,13 @@
}
@RequestMapping(value="/get-devices",method = RequestMethod.GET)
@ResponseBody
- public ResultBean getDevices(@RequestParam("orgId")Integer orgId,MapBounds mapBounds){
+ public ResultBean getDevices(@RequestParam("orgId")Integer orgId,MapBounds mapBounds,@RequestParam("regionCode")String regionCode){
ResultBean<List<Device>> resultBean = new ResultBean();
Map<String,Object> paramMap = new HashMap<String, Object>();
paramMap.put("orgId", orgId);
paramMap.put("mapBounds",mapBounds);
+ paramMap.put("regionCode",regionCode);
+ ParameterUtils.getRegionType4RegionCode(paramMap);
List<Device> list = deviceService.query(paramMap);
resultBean.setData(list);
resultBean.setCode(ResultBean.SUCCESS);
@@ -685,7 +754,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")
@@ -720,7 +789,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 +805,87 @@
})
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);
}
+
+ @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);
+ }
+
+ @Resource
+ private HistoryDailyService historyDailyService;
+
+ @GetMapping("emissions")
+ @ApiOperation(value = "���������", notes = "���������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "organizationId",defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "time",defaultValue = "2019", value = "���������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey",defaultValue = "e27", value = "������������������������key", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "regionCode",defaultValue = "130000", value = "���������", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<List<Map<String, Object>>> getemissionsData(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ List<Map<String, Object>> result = historyDailyService.getEmissionsData(parameters);
+ return new ResultBean<List<Map<String, Object>>>(result);
+ }
+
+
+ @GetMapping("overproof")
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "organizationId",defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "time",defaultValue = "2019", value = "���������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey",defaultValue = "e27", value = "������������������������key", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "overproofRatio",defaultValue = "0", value = "������������(0,1,2,3)(������,������100%,������200%,������300%)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "regionCode",defaultValue = "130000", value = "���������", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<Map> getOverproofData(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ Map result = historyDailyService.getOverproofData(parameters);
+ return new ResultBean<Map>(result);
+ }
+
+ @GetMapping("limit-device")
+ @ApiOperation(value = "���������������������������", notes = "���������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "mac",defaultValue = "p5dnd7a0391956", value = "������mac���", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<List<Map<String, Object>>> getLimitDataByDevice(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String density = deviceService.getLimitDataByDevice(parameters);
+ JSONObject parseObject = JSONObject.parseObject(density);
+ List<Map<String, Object>> resuList = new ArrayList<Map<String,Object>>();
+ for (Map.Entry entry : parseObject.entrySet()) {
+ resuList.add(new HashMap<String, Object>() {
+ {
+ put("key",entry.getKey());
+ put("limit", entry.getValue());
+ }
+ });
+ }
+ return new ResultBean<List<Map<String, Object>>>(resuList);
+ }
+
}
--
Gitblit v1.8.0