From 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 17 Aug 2018 17:13:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/ScreenController.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index a78ff3d..85ca2b6 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;
@@ -531,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) {
@@ -616,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 {
@@ -648,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));
@@ -671,5 +664,13 @@
}
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);
+ }
}
--
Gitblit v1.8.0