From 4e45a8252d7bccd23a1a57aa541a2ea521760572 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 21 十月 2024 15:39:04 +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 | 19 +++++++------------
1 files changed, 7 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..9159418 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
@@ -8,6 +8,7 @@
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.PlatformJobService;
+import com.doumee.service.business.VisitsService;
import com.doumee.service.system.SystemDictDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,21 +35,15 @@
@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