From bf79a36667124868583fcbf47af0e709e088b5e9 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 12 十月 2024 09:09:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
index 433cdd1..b259a1f 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
@@ -34,21 +34,14 @@
     @Autowired
     private PlatformJobService platformJobService;
 
-    @ApiOperation("瓒呮椂鎶ヨ鏁版嵁")
-    @GetMapping("/platformJobTimeOut")
-    public ApiResponse platformJobTimeOut() {
+    @ApiOperation("鏈堝彴浣滀笟鎶ヨ涓氬姟")
+    @GetMapping("/platformJobTimer")
+    public ApiResponse platformJobTimer() {
         platformJobService.timeOutReport();
-        return ApiResponse.success("瓒呮椂鎶ヨ鏁版嵁");
-    }
-
-
-    @ApiOperation("瓒呮椂鑷姩杩囧彿")
-    @GetMapping("/timeOutCallIn")
-    public ApiResponse timeOutCallIn() {
         platformJobService.timeOutCallIn();
-        return ApiResponse.success("鑷姩杩囧彿");
+        platformJobService.timeOutWork();
+        return ApiResponse.success("鏈堝彴浣滀笟鎶ヨ涓氬姟");
     }
-
 
 
 }

--
Gitblit v1.9.3