From a022ae9804d0c2f402711b6b5202319d853919cf Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Fri, 09 Aug 2024 13:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl

---
 screen-job/src/main/java/com/moral/api/controller/PubController.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 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 bf074cd..d6fab21 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
@@ -54,6 +54,12 @@
     @Autowired
     private DeviceService deviceService;
 
+    @Autowired
+    private ManageCoordinateDetailService manageCoordinateDetailService;
+
+    @Autowired
+    private HistorySecondCruiserService historySecondCruiserService;
+
     private final EmailSpringUtil emailSpringUtil;
     private final CityWeatherForecastService cityWeatherForecastService;
 
@@ -160,6 +166,24 @@
         return new ResultMessage();
     }
 
+    @GetMapping("secondCruiserSort")
+    @ApiOperation(value = "���������������", notes = "���������������")
+    public ResultMessage secondCruiserSort() {
+        String startTime ="2024-06-06 00:07:01";
+        String endTime ="2024-06-06 23:07:01";
+        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