From 315ec391b2a36a6d796a8726b57b7c2b8908db12 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 10 Jul 2023 14:22:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into qa
---
screen-job/src/main/java/com/moral/api/controller/PubController.java | 12 ++++++++++++
1 files changed, 12 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..7343dd5 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,7 @@
package com.moral.api.controller;
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 +30,8 @@
public class PubController {
@Autowired
private HistoryDailyService historyDailyService;
+ @Autowired
+ private HistoryFiveMinutelyService historyFiveMinutelyService;
@GetMapping("insertHistoryDaily")
@ApiOperation(value = "���������������", notes = "���������������")
@@ -39,6 +42,15 @@
return new ResultMessage();
}
+ @GetMapping("insertHistoryFiveMinutely")
+ @ApiOperation(value = "5������������", notes = "5������������")
+ public ResultMessage insertHistoryFiveMinutely() {
+ historyFiveMinutelyService.insertHistoryFiveMinutely();
+ 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