From 6344a8b6b7e2853dbfa9e6506ff2e17a31930297 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 10 Jul 2023 14:17:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-job/src/main/java/com/moral/api/controller/PubController.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 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
new file mode 100644
index 0000000..7343dd5
--- /dev/null
+++ b/screen-job/src/main/java/com/moral/api/controller/PubController.java
@@ -0,0 +1,64 @@
+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;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * @ClassName UserController
+ * @Description ������������
+ * @Author ���������
+ * @Date 2021/3/22 13:52
+ * @Version TODO
+ **/
+@Slf4j
+@Api(tags = {"������������"})
+@RestController
+@RequestMapping("/pub")
+public class PubController {
+ @Autowired
+ private HistoryDailyService historyDailyService;
+ @Autowired
+ private HistoryFiveMinutelyService historyFiveMinutelyService;
+
+ @GetMapping("insertHistoryDaily")
+ @ApiOperation(value = "���������������", notes = "���������������")
+ public ResultMessage insertHistoryDaily(String time) {
+ Date d = DateUtils.getDate(time,"yyyy-MM-dd");
+ historyDailyService.insertHistoryDaily(time);
+ int i = 0;
+ 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");
+ System.out.println(DateUtils.dateToDateFullString(d));
+ //System.out.println( DateUtils.dateToDateFullString(DateUtils.getDateOfDay(d, -1), "yyyy-MM-dd"));
+
+
+
+ }
+
+}
--
Gitblit v1.8.0