From f76c68a87261cf2396a64c7125324c24483d4623 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 09 六月 2026 09:46:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 53bf7a9..6988277 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
@@ -11,6 +11,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.concurrent.atomic.AtomicBoolean;
+
/**
* @author 姹熻箘韫�
* @date 2023/11/30 15:33
@@ -24,16 +26,20 @@
@Autowired
private PlatformJobService platformJobService;
+ private final AtomicBoolean dealingSendNotice = new AtomicBoolean(false);
+
@ApiOperation("鏈堝彴鍋滈潬瓒呮椂鎶ヨ涓氬姟")
@PostMapping("/platformJobTimer")
public ApiResponse platformJobTimer() {
+ log.info("瀹氭椂浠诲姟鎵ц寮�濮嬶細platformJobTimer-鏈堝彴鍋滈潬瓒呮椂鎶ヨ");
platformJobService.timeOutReport();
return ApiResponse.success("鏈堝彴鍋滈潬瓒呮椂鎶ヨ涓氬姟");
}
@ApiOperation("鏈堝彴浣滀笟妫�鏌ョ數瀛愰攣涓婇攣鐘舵��")
@PostMapping("/platformCheckWmsLockStatus")
public ApiResponse checkWmsLockStatus() {
+ log.info("瀹氭椂浠诲姟鎵ц寮�濮嬶細checkWmsLockStatus-妫�鏌ョ數瀛愰攣涓婇攣鐘舵��");
platformJobService.checkWmsLockStatus();
return ApiResponse.success("鏈堝彴鍋滈潬瓒呮椂鎶ヨ涓氬姟");
}
@@ -42,6 +48,7 @@
@ApiOperation("鏈堝彴浣滀笟瓒呮椂鎶ヨ涓氬姟")
@PostMapping("/platformJobWorkTimeOut")
public ApiResponse platformJobWorkTimeOut() {
+ log.info("瀹氭椂浠诲姟鎵ц寮�濮嬶細platformJobWorkTimeOut-鏈堝彴浣滀笟瓒呮椂鎶ヨ");
platformJobService.timeOutWork();
return ApiResponse.success("鏈堝彴浣滀笟瓒呮椂鎶ヨ涓氬姟");
}
@@ -50,6 +57,7 @@
@ApiOperation("鏈堝彴绛夊緟浣滀笟瓒呮椂涓氬姟")
@PostMapping("/platformJobWaitTimeOut")
public ApiResponse platformJobWaitTimeOut() {
+ log.info("瀹氭椂浠诲姟鎵ц寮�濮嬶細platformJobWaitTimeOut-鏈堝彴绛夊緟浣滀笟瓒呮椂");
platformJobService.timeOutCallIn();
return ApiResponse.success("鏈堝彴绛夊緟浣滀笟瓒呮椂涓氬姟");
}
@@ -59,10 +67,18 @@
@PreventRepeat(interval = 2000)
@ApiOperation("鏈堝彴浠婃棩浣滀笟鏈畬鎴愰�氱煡瀹氭椂")
@PostMapping("/sendUnFinishNotice")
- public synchronized ApiResponse sendUnFinishNotice() {
- log.error("========鏈堝彴浠婃棩浣滀笟鏈畬鎴愰�氱煡瀹氭椂============寮�濮�"+System.currentTimeMillis()+"");
- platformJobService.sendUnFinishNotice();
- log.error("========鏈堝彴浠婃棩浣滀笟鏈畬鎴愰�氱煡瀹氭椂============缁撴潫"+System.currentTimeMillis()+"");
+ public ApiResponse sendUnFinishNotice() {
+ if(!dealingSendNotice.compareAndSet(false, true)){
+ return ApiResponse.success("sendUnFinishNotice姝ｅ湪鎵ц锛岃烦杩�");
+ }
+ try {
+ log.info("瀹氭椂浠诲姟鎵ц寮�濮嬶細sendUnFinishNotice-鏈堝彴浣滀笟鏈畬鎴愰�氱煡");
+ platformJobService.sendUnFinishNotice();
+ } catch (Exception e){
+ log.error("sendUnFinishNotice寮傚父", e);
+ } finally {
+ dealingSendNotice.set(false);
+ }
return ApiResponse.success("鏈堝彴浠婃棩浣滀笟澶栧畬鎴愰�氱煡瀹氭椂");
}
--
Gitblit v1.9.3