| | |
| | | return ResultMessage.ok(resultList); |
| | | } |
| | | |
| | | @RequestMapping(value = "test2", method = RequestMethod.GET) |
| | | @ResponseBody |
| | | public ResultMessage test2(HttpServletRequest request){ |
| | | Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null); |
| | | Object mac = parameters.get("mac"); |
| | | Object sensorCode = parameters.get("sensor_code"); |
| | | // Object date = parameters.get("date"); |
| | | Object startTime = parameters.get("startTime"); |
| | | Object endTime = parameters.get("endTime"); |
| | | if (ObjectUtils.isEmpty(mac) || ObjectUtils.isEmpty(sensorCode) || ObjectUtils.isEmpty(startTime)|| ObjectUtils.isEmpty(endTime)){ |
| | | return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); |
| | | } |
| | | QueryWrapper<Device> deviceQueryWrapper = new QueryWrapper<>(); |
| | | deviceQueryWrapper.eq("is_delete",Constants.NOT_DELETE); |
| | | deviceQueryWrapper.eq("mac",mac); |
| | | Device device = deviceMapper.selectOne(deviceQueryWrapper); |
| | | if (ObjectUtils.isEmpty(device)){ |
| | | return ResultMessage.fail(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode(), ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg()); |
| | | } |
| | | List<Map<String, Object>> resultList = historyHourlyService.getHourCompleteDataByMacSensorCodeDate(parameters); |
| | | return ResultMessage.ok(resultList); |
| | | } |
| | | |
| | | |
| | | @RequestMapping(value = "historyHourlyTest", method = RequestMethod.GET) |
| | | public ResultMessage historyHourlyTest(){ |
| | | historyHourlyService.historyHourly(); |
| | | return ResultMessage.ok(); |
| | | } |
| | | |
| | | |
| | | } |