From 9437c74510c25be9d2413821c65fcf6ca4e6d21a Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 31 Aug 2018 08:35:26 +0800
Subject: [PATCH] 获取优良天数
---
src/main/java/com/moral/controller/ScreenController.java | 133 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 110 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 8fd835e..91f21b1 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -9,8 +9,9 @@
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.ParameterUtils;
+import com.moral.common.util.StringUtils;
import com.moral.entity.*;
import com.moral.entity.alarm.AlarmConfig;
import com.moral.entity.alarm.AlarmConfigValue;
@@ -31,8 +32,6 @@
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;
@@ -105,6 +104,12 @@
private DeviceVersionService dviceVersionService;
@Resource
private OrganizationService organizationService;
+ @Resource
+ private DictionaryDataService dictionaryDataService;
+
+ @Resource
+ private WeatherService weatherService;
+
/**
* Screen login. ������������
*
@@ -121,14 +126,29 @@
resultMap.put("accountId", -1);
} else {
resultMap = accountService.screenLogin(parameters);
+ // ������������������������������������������
Object orgId = resultMap.get("orgId");
if(resultMap.get("orgId")!=null && resultMap.get("orgId") instanceof Integer) {
- Organization organization = organizationService.getOrganizationById((Integer) orgId);
- if( organization.getAreaNames()!=null){
- AreaNames areaNames = organization.getAreaNames();
- resultMap.put("mapPath ","������/"+areaNames.getProvinceName()+"/"
- +areaNames.getCityName()+"/"+areaNames.getAreaName());
- }
+ 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());
+ }
+ }
+ }
+ }
+ }
+ resultMap.put("mapPath",areaNamesBuilder.toString());
}
}
return resultMap;
@@ -513,12 +533,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) {
@@ -533,7 +551,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");
@@ -598,7 +617,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 {
@@ -630,12 +651,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));
@@ -653,5 +669,76 @@
}
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>> 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 = hangzhouAqiService.getQualityCountDayByRegion(parameters);
+ Map<String, Object> map = new HashMap<String, Object>();
+ map.put("count", 136);
+ return new ResultBean<Map<String, Object>>(map);
+ }
}
--
Gitblit v1.8.0