From bcd62be27acf68adb54415f75b37f5e26d65c11b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 10:34:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
index 289aec6..1bf2935 100644
--- a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
+++ b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
@@ -1,6 +1,6 @@
package com.doumee.jobs.fegin;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
@@ -18,9 +18,9 @@
ApiResponse syncEmpowerDetailData();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇汉鍛樿澶囨巿鏉冧笅杞借繘搴�")
@GetMapping("/timer/empower/syncEmpowerResultData")
- ApiResponse syncEmpowerResultData() ;
+ ApiResponse syncEmpowerResultData();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃堕噸鏂颁笅鍙戝け璐ョ殑鎺堟潈鏁版嵁")
- @GetMapping("/timer/empower/syncEmpowerFailData")
+ @GetMapping("/timeempowerr/syncEmpowerFailData")
ApiResponse syncEmpowerFailData();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃跺埛鏂颁汉鍛樿澶囨巿鏉�")
@GetMapping("/timer/empower/syncEmpowerData")
@@ -28,6 +28,9 @@
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇㈣澶囩姸鎬�")
@GetMapping("/timer/device/getAscDeviceStatus")
ApiResponse getAscDeviceStatus() ;
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃跺浠芥暟鎹簱")
+ @GetMapping("/timer/db/backupDatabase")
+ ApiResponse backupDatabase() ;
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇㈡湀鍙扮姸鎬�")
@GetMapping("/timer/platform/getPlatformStatus")
ApiResponse getPlatformStatus() ;
@@ -64,15 +67,34 @@
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃朵粖鏃ョ殑璁垮棰勭害鏁版嵁")
@GetMapping("/timer/visit/syncVistAppointData")
ApiResponse syncVistAppointData() ;
- @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵洿鏂板井淇″叕浼楀彿accesstoken")
- @GetMapping("/timer/wxtoken/updateWxAccessToken")
- ApiResponse updateWxAccessToken();
- @ApiOperation("銆愭暟瀛楀寲鏈堝彴銆戞湀鍙颁綔涓氭姤璀︿笟鍔�")
- @GetMapping("/timer/platformJob/platformJobTimer")
- ApiResponse platformJobTimer();
+// @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵洿鏂板井淇″叕浼楀彿accesstoken")
+// @GetMapping("/timer/wxtoken/updateWxAccessToken")
+// ApiResponse updateWxAccessToken();
@ApiOperation("銆愯瀹㈢郴缁熴�戣瀹㈡暟鎹嵆灏嗚秴鏃堕璀�")
@GetMapping("/timer/visit/visitTimeOut")
ApiResponse visitTimeOut() ;
+ @ApiOperation("銆愯瀹㈢郴缁熴�戣瀹㈢敵璇峰緟瀹℃壒璁板綍鎴鏃堕棿宸茶繃鑷姩鍙栨秷棰勭害")
+ @GetMapping("/timer/visit/visitNoCheckCancel")
+ ApiResponse visitNoCheckCancel() ;
+ @ApiOperation("銆愭暟瀛楀寲鏈堝彴銆戞湀鍙板仠闈犺秴鏃舵姤璀︿笟鍔�")
+ @GetMapping("/timer/platformJob/platformJobTimer")
+ ApiResponse platformJobTimer();
+ @ApiOperation("銆愭暟瀛楀寲鏈堝彴銆戞湀鍙版鏌ョ數瀛愰攣涓婇攣鐘舵��")
+ @GetMapping("/timer/platformJob/platformCheckWmsLockStatus")
+ ApiResponse platformCheckWmsLockStatusTimer();
+ @ApiOperation("銆愭暟瀛楀寲鏈堝彴銆戞湀鍙颁綔涓氳秴鏃舵姤璀︿笟鍔�")
+ @GetMapping("/timer/platformJob/platformJobWorkTimeOut")
+ ApiResponse platformJobWorkTimeOut();
+ @ApiOperation("銆愭暟瀛楀寲鏈堝彴銆戞湀鍙扮瓑寰呬綔涓氳秴鏃朵笟鍔�")
+ @GetMapping("/timer/platformJob/platformJobWaitTimeOut")
+ ApiResponse platformJobWaitTimeOut();
+ @ApiOperation("銆愮煭淇￠�氱煡銆戝畾鏃跺彂閫佺瓑寰呯煭淇′换鍔�")
+ @GetMapping("/timer/sms/sendWaitingSmsNotice")
+ ApiResponse sendWaitingSmsNotice();
+
+ @ApiOperation("銆愭暟瀛楀寲鏈堝彴銆戞湀鍙颁粖鏃ヤ綔涓氭湭瀹屾垚閫氱煡瀹氭椂")
+ @GetMapping("/timer/platformJob/sendUnFinishNotice")
+ ApiResponse sendUnFinishNotice();
}
--
Gitblit v1.9.3