From 8bfa93e6f92dce08c036766747aa2aba13217280 Mon Sep 17 00:00:00 2001 From: ZhuDongming <773644075@qq.com> Date: Fri, 16 Aug 2019 11:58:33 +0800 Subject: [PATCH] 删除科学计数转为普通计数方法 --- src/main/java/com/moral/controller/ScreenController.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index 662378a..03e24df 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -1166,21 +1166,25 @@ @ApiOperation(value = "���������������������������", notes = "���������������������������") @ApiImplicitParams(value = { @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392068���", required = true, paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "startTime", value = "������������(���������2019-07-17 17:07:00)", required = false, paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17 17:07:00)", required = false, paramType = "query", dataType = "String") + @ApiImplicitParam(name = "startTime", value = "������������(���������2019-07-17 17:07:00)", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17 17:07:00)", required = true, paramType = "query", dataType = "String") }) public ModelAndView uavTrajectory(ModelAndView model, HttpServletRequest request) throws Exception { Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null); String mac = parameters.get("mac").toString(); if (mac != null && mac.length() != 0) { List<Map<String, Object>> sensorList = historyMinutelyService.getSensorData(parameters); + List<Map<String, Object>> sensorListMin = historyMinutelyService.getSensorDataMin(parameters); + List<Map<String, Object>> sensorListMax = historyMinutelyService.getSensorDataMax(parameters); JSONObject params = new JSONObject(); params.put("sensorInfo", sensorList); + params.put("sensorInfoMin", sensorListMin); + params.put("sensorInfoMax", sensorListMax); String paramsJson = params.toJSONString(); model.addObject("uavTrajectoryParams", paramsJson); model.setViewName("uavTrajectory"); return model; - }else { + } else { StringBuilder msg = new StringBuilder(); msg.append(" param[0] mac:"); msg.append(mac); -- Gitblit v1.8.0