From 4a50bd93dfcdedb85f117d25f89e67291eb65cf7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 14 Oct 2023 10:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-job/src/main/java/com/moral/api/controller/PubController.java | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/controller/PubController.java b/screen-job/src/main/java/com/moral/api/controller/PubController.java
index 3a54e5b..5771894 100644
--- a/screen-job/src/main/java/com/moral/api/controller/PubController.java
+++ b/screen-job/src/main/java/com/moral/api/controller/PubController.java
@@ -53,14 +53,6 @@
int i = 0;
return new ResultMessage();
}
-
- @GetMapping("insertHistoryFiveMinutely")
- @ApiOperation(value = "5������������", notes = "5������������")
- public ResultMessage insertHistoryFiveMinutely() {
- historyFiveMinutelyService.insertHistoryFiveMinutely();
- return new ResultMessage();
- }
-
@GetMapping("FiveMinutelyTest")
@ApiOperation(value = "5������������1", notes = "5������������1")
public ResultMessage FiveMinutelyTest(String yz,String mac) {
@@ -70,8 +62,8 @@
@GetMapping("insertHistoryAqi")
@ApiOperation(value = "������������������", notes = "������������������")
- public ResultMessage insertHistoryAqi() {
- historyAqiService.insertHistoryAqi();
+ public ResultMessage insertHistoryAqi(String time) {
+ historyAqiService.insertHistoryAqi(time);
return new ResultMessage();
}
--
Gitblit v1.8.0