From 9b02f67b17b9dcbd798862021ac0a516d1ba69b3 Mon Sep 17 00:00:00 2001 From: 于紫祥_1901 <email@yuzixiang_1910> Date: Fri, 06 Nov 2020 15:37:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/moral/controller/ScreenController.java | 34 ++++++++++++++++++++++++++++------ 1 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index 8ecd5e6..3a5e467 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -41,6 +41,7 @@ import com.rabbitmq.client.*; import com.rabbitmq.client.Channel; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -48,6 +49,7 @@ import io.swagger.models.auth.In; import jdk.nashorn.internal.runtime.regexp.joni.Regex; import net.sf.json.JSONString; + import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.net.ftp.FTPClient; @@ -72,6 +74,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; import org.xml.sax.InputSource; + import static com.moral.common.util.ResourceUtil.getValue; import static com.moral.common.util.WebUtils.getParametersStartingWith; import static java.util.Calendar.*; @@ -2037,7 +2040,7 @@ mon = "" + month; } String table = "history_minutely_" + year + mon; - List list = deviceService.byMonitorIdGetDeviceAndWind(monitorPointId,table); + List list = deviceService.byMonitorIdGetDeviceAndWind(monitorPointId, table); return list; } @@ -2058,7 +2061,7 @@ mon = "" + month; } String table = "history_minutely_" + year + mon; - List list = deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId,table); + List list = deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId, table); return list; } @@ -2182,7 +2185,7 @@ for (Map<String, Object> dataMap : dataList) { JSONObject dataJson = JSONObject.parseObject(dataMap.get("json").toString()); if (dataMap.get("time").toString().equals(day + " 00:00:00.0")) { - oneSensorMap.put(dataMap.get("time").toString().substring(0, 10), dataJson.getJSONArray(key).get(2)); + oneSensorMap.put(dataMap.get("time").toString().substring(0, 10), dataJson.getJSONArray(key).get(0)); break; } else { continue; @@ -2198,7 +2201,7 @@ for (Map sameDayHourlyMap : sameDayHourlyList) { List<Double> arr = new ArrayList<>(); JSONObject hourlyJson = JSONObject.parseObject(sameDayHourlyMap.get("json").toString()); - arr.add(Double.parseDouble(hourlyJson.getJSONArray(key).get(2).toString())); + arr.add(Double.parseDouble(hourlyJson.getJSONArray(key).get(0).toString())); Double sum = 0.0; for (int i = 0; i < arr.size(); i++) { sum += arr.get(i); @@ -2234,8 +2237,10 @@ for (Map<String, Object> hourlyMap : hourlyList) { JSONObject dataJson = JSONObject.parseObject(hourlyMap.get("json").toString()); if (hourlyMap.get("time").toString().equals(hour + ".0")) { - oneSensorMap.put(hourlyMap.get("time").toString().substring(0, 19), dataJson.getJSONArray(key).get(2)); - break; + if (dataJson.getJSONArray(key) != null) { + oneSensorMap.put(hourlyMap.get("time").toString().substring(0, 19), dataJson.getJSONArray(key).get(0)); + break; + } } else { continue; } @@ -2596,4 +2601,21 @@ } return 0; } + + @RequestMapping("/biaozhun") + @ResponseBody + public List<Device> queryDevice(String macOrName){ + List<Device> deviceList = new ArrayList<>(); + if (!macOrName.equals("")){ + deviceList= deviceService.getDevice(macOrName); + } + return deviceList; + } + + @RequestMapping("/getSensor") + @ResponseBody + public List<Map<String, Object>> getSensor(String id){ + List<Map<String, Object>> allSensors = sensorService.getSensorByDeviceId(id); + return allSensors; + } } \ No newline at end of file -- Gitblit v1.8.0