From a901d8910243b6c15c3ff7722d006e06d87ec6f6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 28 Aug 2023 15:58:50 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java | 11 +++++++++--
1 files changed, 9 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..bcccc46 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
@@ -100,9 +100,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 +124,11 @@
}
+ @RequestMapping(value = "historyHourlyTest", method = RequestMethod.GET)
+ public ResultMessage historyHourlyTest(){
+ historyHourlyService.historyHourly();
+ return ResultMessage.ok();
+ }
+
+
}
--
Gitblit v1.8.0