From f9911a1e881d19521c50cebc7ddf04e8783bf072 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 12 Jul 2023 10:26:32 +0800
Subject: [PATCH] fix: 修补bug
---
screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java b/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
index bf34467..d0b826f 100644
--- a/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
@@ -83,8 +83,10 @@
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
Object mac = parameters.get("mac");
Object sensorCode = parameters.get("sensor_code");
- Object date = parameters.get("date");
- if (ObjectUtils.isEmpty(mac) || ObjectUtils.isEmpty(sensorCode) || ObjectUtils.isEmpty(date)){
+// 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)){
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
QueryWrapper<Device> deviceQueryWrapper = new QueryWrapper<>();
@@ -98,4 +100,28 @@
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);
+ }
+
+
}
--
Gitblit v1.8.0