From e66b0932eb782c6ec771ffaa9957e6d5d5361286 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 07 Aug 2018 12:49:06 +0800
Subject: [PATCH] 增加 年查询
---
src/main/java/com/moral/controller/ScreenController.java | 66 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 6da7b44..286fa38 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -9,8 +9,8 @@
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;
@@ -32,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;
@@ -106,6 +104,8 @@
private DeviceVersionService dviceVersionService;
@Resource
private OrganizationService organizationService;
+ @Resource
+ private DictionaryDataService dictionaryDataService;
/**
* Screen login. ������������
*
@@ -122,26 +122,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);
- StringBuilder areaNamesBuilder = new StringBuilder("������");
- 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());
+ StringBuilder areaNamesBuilder = new StringBuilder("������");
+ if((Integer) orgId != 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;
@@ -526,12 +529,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) {
@@ -611,7 +612,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 {
@@ -643,12 +646,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));
--
Gitblit v1.8.0