From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java | 12 ++++++++++--
1 files changed, 10 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 d69ad0c..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;
@@ -100,9 +101,9 @@
return ResultMessage.ok(resultList);
}
- @RequestMapping(value = "getHourCompleteDataByMacSensorCodeDate2", method = RequestMethod.GET)
+ @RequestMapping(value = "test2", method = RequestMethod.GET)
@ResponseBody
- public ResultMessage getHourCompleteDataByMacSensorCodeDate2(HttpServletRequest request){
+ public ResultMessage test2(HttpServletRequest request){
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
Object mac = parameters.get("mac");
Object sensorCode = parameters.get("sensor_code");
@@ -124,4 +125,11 @@
}
+ @RequestMapping(value = "historyHourlyTest", method = RequestMethod.POST)
+ public ResultMessage historyHourlyTest(HistoryHourlyVo historyHourlyVo){
+ historyHourlyService.historyHourly(historyHourlyVo);
+ return ResultMessage.ok();
+ }
+
+
}
--
Gitblit v1.8.0