fengxiang
2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41
src/main/java/com/moral/controller/ScreenController.java
@@ -53,7 +53,7 @@
@RequestMapping("/screen")
@CrossOrigin(origins = "*", maxAge = 3600)
@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
@Api(tags = "Screen", description = "大屏相关")
@Api(tags = "Screen", description = "大屏接口")
public class ScreenController {
   public  static Logger log = Logger.getLogger(ScreenController.class);
    @Resource
@@ -619,7 +619,12 @@
   })
   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");
      }
      parameters.put("monitorPointId", parameters.remove("monitorPoint"));
      String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
      parameters.put("sensors", Arrays.asList(sensorKeys));