From 3a4442da13b6f1300956bd63a5d106c5b2fc7184 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 22 Oct 2020 11:19:00 +0800
Subject: [PATCH] update(post)
---
src/main/java/com/moral/controller/ScreenController.java | 71 ++++++++++++++++-------------------
1 files changed, 33 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 1589d0b..da6a8cc 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -2227,7 +2227,6 @@
}
-
@GetMapping("/contrastFactor")
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams(value = {
@@ -2262,13 +2261,9 @@
}
- @GetMapping("/tellAlarm")
+ @PostMapping("/tellAlarm")
@ResponseBody
- public List<List> tellAlarm(@Param("states") String states,
- @Param("orgId") String orgId,
- @Param("accountId") String accountId,
- @Param("states1") String states1,
- @Param("regionCode") String regionCode) {
+ public List<List> tellAlarm(String states, String orgId, String accountId, String states1, String regionCode) {
JSONArray stateList = JSONArray.parseArray(states);//���������������������
JSONArray stateList1 = JSONArray.parseArray(states1);//���10������������������
List<List> lookList = new ArrayList<>();
@@ -2443,7 +2438,7 @@
}
String state = (String) dataMap.get("state");
String state1 = (String) dataMap.get("state1");
- List<Map> mapList=new ArrayList();
+ List<Map> mapList = new ArrayList();
for (String key : list) {
if (((Map) aEMap.get("eMap")).containsKey(key)) {
Double val = Double.valueOf(sensorMap.get(key).toString());
@@ -2455,23 +2450,23 @@
if ((state1.equals("0") || state1.equals("1")) && Integer.parseInt(state) > 1) {
if (val > Double.valueOf(String.valueOf(valueList.get(1)))) {
Map lookMap = new HashMap();
- lookMap.put("time",time);
- lookMap.put("name",device.getName());
- lookMap.put("sensor",sensors.get("description"));
- lookMap.put("value",val + ""+sensors.get("unit"));
+ lookMap.put("time", time);
+ lookMap.put("name", device.getName());
+ lookMap.put("sensor", sensors.get("description"));
+ lookMap.put("value", val + "" + sensors.get("unit"));
mapList.add(lookMap);
- //lookString = time+" "+device.getName()+sensors.get("description")+"="+val + sensors.get("unit")+"������";
- //System.out.println(time + "====" + device.getName() + "=====" + sensors.get("description") + "======" + val + sensors.get("unit"));
+ //lookString = time+" "+device.getName()+sensors.get("description")+"="+val + sensors.get("unit")+"������";
+ //System.out.println(time + "====" + device.getName() + "=====" + sensors.get("description") + "======" + val + sensors.get("unit"));
}
}
- }else {//���������������������������
+ } else {//���������������������������
if (state1.equals("0")) {
if (val > Double.valueOf(String.valueOf(valueList.get(0)))) {
Map lookMap = new HashMap();
- lookMap.put("time",time);
- lookMap.put("name",device.getName());
- lookMap.put("sensor",sensors.get("description"));
- lookMap.put("value",val + ""+sensors.get("unit"));
+ lookMap.put("time", time);
+ lookMap.put("name", device.getName());
+ lookMap.put("sensor", sensors.get("description"));
+ lookMap.put("value", val + "" + sensors.get("unit"));
mapList.add(lookMap);
}
}
@@ -2479,9 +2474,9 @@
}
}
- if (mapList.size()>0){
+ if (mapList.size() > 0) {
lookList.add(mapList);
- }else {
+ } else {
continue;
}
}
@@ -2491,24 +2486,24 @@
return lookList;
}
- /* @GetMapping("/lianxian")
- @ApiOperation(value = "������", notes = "������" )
- @GetMapping("multiDeviceContrast")
- @ApiOperation(value = "���������������������", notes = "���������������������")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "macs", value = "������mac,���������������������������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "time", value = "������,������(���������2018-03-12)", required = true, paramType = "query", dataType = "String"),})
- public ResultBean<List<Map<String, Object>>> multiDeviceSensor(HttpServletRequest request) throws Exception {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- ParameterUtils.getTimeType4Time(parameters);
- List<Map<String, Object>> list = historyMinutelyService.getMultiDeviceSensorData(parameters);
- return new ResultBean<List<Map<String, Object>>>(list);
- }
+ /* @GetMapping("/lianxian")
+ @ApiOperation(value = "������", notes = "������" )
+ @GetMapping("multiDeviceContrast")
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "macs", value = "������mac,���������������������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������,������(���������2018-03-12)", required = true, paramType = "query", dataType = "String"),})
+ public ResultBean<List<Map<String, Object>>> multiDeviceSensor(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ ParameterUtils.getTimeType4Time(parameters);
+ List<Map<String, Object>> list = historyMinutelyService.getMultiDeviceSensorData(parameters);
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
- /*
- * ���������������������������������������������
- */
+ /*
+ * ���������������������������������������������
+ */
@GetMapping("screenVersion")
public Map<String, Object> getScreenVersion(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
--
Gitblit v1.8.0