xufenglei
2018-07-31 6b9938b5faf4a1b66f1c8886adc402d42bd447c1
src/main/java/com/moral/controller/ScreenController.java
@@ -528,7 +528,12 @@
   @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");
      int length = ((String)parameters.get("time")).split("-").length;
      if (length == 2) {
         parameters.put("type", "month");
      } else if (length == 3){
         parameters.put("type", "day");
      }
      parameters.put("monitorPointId", parameters.remove("monitorPoint"));
      String sensorKey = parameters.remove("sensorKey").toString();
      List<String> sensorKeys = new ArrayList<String>();