From 3b4574cf01b839bdac2ef5647a106185d709dd71 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 21 Jul 2023 15:54:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-job/src/main/java/com/moral/api/controller/PubController.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 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 82550d4..48e41a2 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
@@ -1,6 +1,8 @@
package com.moral.api.controller;
+import com.moral.api.service.HistoryAqiService;
import com.moral.api.service.HistoryDailyService;
+import com.moral.api.service.HistoryFiveMinutelyService;
import com.moral.constant.ResultMessage;
import com.moral.util.DateUtils;
import io.swagger.annotations.Api;
@@ -29,6 +31,11 @@
public class PubController {
@Autowired
private HistoryDailyService historyDailyService;
+ @Autowired
+ private HistoryFiveMinutelyService historyFiveMinutelyService;
+
+ @Autowired
+ private HistoryAqiService historyAqiService;
@GetMapping("insertHistoryDaily")
@ApiOperation(value = "���������������", notes = "���������������")
@@ -39,6 +46,28 @@
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) {
+ historyFiveMinutelyService.insertHistoryFiveMinutely(yz,mac);
+ return new ResultMessage();
+ }
+
+ @GetMapping("insertHistoryAqi")
+ @ApiOperation(value = "������������������", notes = "������������������")
+ public ResultMessage insertHistoryAqi() {
+ historyAqiService.insertHistoryAqi();
+ return new ResultMessage();
+ }
+
+
public static void main(String[] args) {
String s = "2023-9-01";
Date d = DateUtils.getDate(s,"yyyy-MM-dd");
--
Gitblit v1.8.0