From aa1bdb548aa6a6371a8953efacc3986300eee576 Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Fri, 15 Nov 2024 08:50:23 +0800
Subject: [PATCH] fix:补充提交

---
 screen-job/src/main/java/com/moral/api/controller/PubController.java |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 54 insertions(+), 4 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 c29aa7e..cb46262 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
@@ -21,7 +21,6 @@
 import javax.mail.MessagingException;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.nio.file.Files;
 import java.util.*;
 
 /**
@@ -55,10 +54,18 @@
     @Autowired
     private DeviceService deviceService;
 
-    private final EmailSpringUtil emailSpringUtil;
+    @Autowired
+    private ManageCoordinateDetailService manageCoordinateDetailService;
 
-    public PubController(EmailSpringUtil emailSpringUtil) {
+    @Autowired
+    private HistorySecondCruiserService historySecondCruiserService;
+
+    private final EmailSpringUtil emailSpringUtil;
+    private final CityWeatherForecastService cityWeatherForecastService;
+
+    public PubController(EmailSpringUtil emailSpringUtil, CityWeatherForecastService cityWeatherForecastService) {
         this.emailSpringUtil = emailSpringUtil;
+        this.cityWeatherForecastService = cityWeatherForecastService;
     }
 
     @GetMapping("insertHistoryDaily")
@@ -85,12 +92,23 @@
     @GetMapping("dateInsertHistoryHourlyJKAvg")
     @ApiOperation(value = "������������������������", notes = "������������������������")
     public ResultMessage dateInsertHistoryHourlyJKAvg(String start,String end) {
+        Date ks = DateUtils.getDate(start,"yyyy-MM-dd HH:mm:ss");
+        Date js = DateUtils.getDate("2024-01-23 13:00:00","yyyy-MM-dd HH:mm:ss");
+        Date ends = DateUtils.getDate(end,"yyyy-MM-dd HH:mm:ss");
+        while (DateUtils.isTimeBefor(js,ks)){
+            String dateString = DateUtils.dateToDateString(ks);
+            String dateString1 = DateUtils.dateToDateString(ends);
+//            historyHourlyService.dateInsertHistoryHourlyJKAvg(start, end);
+            historyHourlyService.dateInsertHistoryHourlyJKAvg(dateString, dateString1);
+            ks = DateUtils.getDateAddHour(ks,1);
+            ends = DateUtils.getDateAddHour(ends,1);
+        }
 //        String format = DateUtils.yyyy_MM_dd_HH_mm_EN;
 //        String start ="2023-11-19 09:00"
 //        String end ="2023-11-19 10:00";
 //        Date start1 = DateUtils.getDate(start,format);
 //        Date end1 = DateUtils.getDate(end,format);
-        historyHourlyService.dateInsertHistoryHourlyJKAvg(start, end);
+
         return new ResultMessage();
     }
 
@@ -105,6 +123,13 @@
     @ApiOperation(value = "������������������", notes = "������������������")
     public ResultMessage insertHistoryAqi(String time) {
         historyAqiService.insertHistoryAqi(time);
+        return new ResultMessage();
+    }
+
+    @GetMapping("insertHistoryHourly")
+    @ApiOperation(value = "������������������������", notes = "������������������������")
+    public ResultMessage insertHistoryHourly() {
+        historyHourlyService.insertHistoryHourly();
         return new ResultMessage();
     }
 
@@ -134,6 +159,13 @@
         return new ResultMessage();
     }
 
+    @GetMapping("insertCityWeatherForecast")
+    @ApiOperation(value = "������������������������", notes = "������������������������")
+    public ResultMessage insertCityWeatherForecast() {
+        cityWeatherForecastService.insertCityWeatherForecast();
+        return new ResultMessage();
+    }
+
     @GetMapping("insertHistoryMonthly")
     @ApiOperation(value = "���������", notes = "���������")
     public ResultMessage insertHistoryMonthly() {
@@ -141,6 +173,24 @@
         return new ResultMessage();
     }
 
+    @GetMapping("secondCruiserSort")
+    @ApiOperation(value = "���������������", notes = "���������������")
+    public ResultMessage secondCruiserSort() {
+        String startTime ="2024-11-13 00:00:00";
+        String endTime ="2024-11-14 00:00:00";
+        historySecondCruiserService.sort(startTime,endTime);
+        return new ResultMessage();
+    }
+
+    @GetMapping("insertCoordinateDetail")
+    @ApiOperation(value = "������������", notes = "������������")
+    public ResultMessage insertCoordinateDetail() {
+        String startTime ="2024-06-06 00:07:01";
+        String endTime ="2024-06-06 23:07:01";
+        manageCoordinateDetailService.insertCoordinateDetail(startTime,endTime);
+        return new ResultMessage();
+    }
+
 
     public static void main(String[] args) {
         String host = "https://pair.market.alicloudapi.com";

--
Gitblit v1.8.0