From f72da3bc5ca43fd37c1f0de15a1e9128a627a563 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 18 Apr 2024 13:59:35 +0800
Subject: [PATCH] fix：日报数据调整
---
screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 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..85c1ad0 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
@@ -8,6 +8,7 @@
import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.service.AlarmInfoService;
import com.moral.api.service.HistoryHourlyService;
+import com.moral.api.vo.HistoryHourlyVo;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
@@ -83,8 +84,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 +101,35 @@
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.POST)
+ public ResultMessage historyHourlyTest(HistoryHourlyVo historyHourlyVo){
+ historyHourlyService.historyHourly(historyHourlyVo);
+ return ResultMessage.ok();
+ }
+
+
}
--
Gitblit v1.8.0