From 3b0c9e51e16619e59b58e4ce9870e8f69e89259b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 21 十月 2025 17:42:11 +0800
Subject: [PATCH] 月台自动叫号处理问题
---
server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 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 614a051..df51e12 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
@@ -1,12 +1,15 @@
package com.doumee.api;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.utils.Constants;
+import com.doumee.service.business.third.WmsService;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.PlatformJobService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -23,15 +26,18 @@
@Autowired
private PlatformJobService platformJobService;
+ @Autowired
+ private WmsService wmsService;
+
@ApiOperation("鏈堝彴鍋滈潬瓒呮椂鎶ヨ涓氬姟")
- @GetMapping("/platformJobTimer")
+ @PostMapping("/platformJobTimer")
public ApiResponse platformJobTimer() {
platformJobService.timeOutReport();
return ApiResponse.success("鏈堝彴鍋滈潬瓒呮椂鎶ヨ涓氬姟");
}
@ApiOperation("鏈堝彴浣滀笟妫�鏌ョ數瀛愰攣涓婇攣鐘舵��")
- @GetMapping("/platformCheckWmsLockStatus")
+ @PostMapping("/platformCheckWmsLockStatus")
public ApiResponse checkWmsLockStatus() {
platformJobService.checkWmsLockStatus();
return ApiResponse.success("鏈堝彴鍋滈潬瓒呮椂鎶ヨ涓氬姟");
@@ -39,7 +45,7 @@
@ApiOperation("鏈堝彴浣滀笟瓒呮椂鎶ヨ涓氬姟")
- @GetMapping("/platformJobWorkTimeOut")
+ @PostMapping("/platformJobWorkTimeOut")
public ApiResponse platformJobWorkTimeOut() {
platformJobService.timeOutWork();
return ApiResponse.success("鏈堝彴浣滀笟瓒呮椂鎶ヨ涓氬姟");
@@ -47,20 +53,56 @@
@ApiOperation("鏈堝彴绛夊緟浣滀笟瓒呮椂涓氬姟")
- @GetMapping("/platformJobWaitTimeOut")
+ @PostMapping("/platformJobWaitTimeOut")
public ApiResponse platformJobWaitTimeOut() {
platformJobService.timeOutCallIn();
return ApiResponse.success("鏈堝彴绛夊緟浣滀笟瓒呮椂涓氬姟");
}
+
+ @PreventRepeat(interval = 2000)
@ApiOperation("鏈堝彴浠婃棩浣滀笟鏈畬鎴愰�氱煡瀹氭椂")
- @GetMapping("/sendUnFinishNotice")
- public ApiResponse sendUnFinishNotice() {
+ @PostMapping("/sendUnFinishNotice")
+ public synchronized ApiResponse sendUnFinishNotice() {
log.error("========鏈堝彴浠婃棩浣滀笟鏈畬鎴愰�氱煡瀹氭椂============寮�濮�"+System.currentTimeMillis()+"");
platformJobService.sendUnFinishNotice();
log.error("========鏈堝彴浠婃棩浣滀笟鏈畬鎴愰�氱煡瀹氭椂============缁撴潫"+System.currentTimeMillis()+"");
return ApiResponse.success("鏈堝彴浠婃棩浣滀笟澶栧畬鎴愰�氱煡瀹氭椂");
}
+
+
+ @ApiOperation("鏈堝彴鑷姩鍙彿")
+ @PostMapping("/autoPlatformCallCar")
+ public ApiResponse autoPlatformCallCar() {
+ log.error("========鏈堝彴鑷姩鍙彿============寮�濮�"+System.currentTimeMillis()+"");
+ if(Constants.IS_AUTOCALL_WORKING){
+ log.error("========鏈堝彴鑷姩鍙彿============缁撴潫锛屼笂涓�杞綔涓氭湭缁撴潫"+System.currentTimeMillis());
+ return ApiResponse.success("鏈堝彴鑷姩鍙彿,涓婁竴杞綔涓氭湭缁撴潫");
+ }
+ try {
+ Constants.IS_AUTOCALL_WORKING =true;
+ platformJobService.autoPlatformCallCar(wmsService);
+ platformJobService.autoCallInParkCar(wmsService);
+ log.error("========鏈堝彴鑷姩鍙彿============瀹屾垚"+System.currentTimeMillis()+"");
+ }catch (Exception e){
+ log.error("========鏈堝彴鑷姩鍙彿============寮傚父"+System.currentTimeMillis()+e.getMessage());
+ }finally {
+ Constants.IS_AUTOCALL_WORKING =false;
+ log.error("========鏈堝彴鑷姩鍙彿============缁撴潫"+System.currentTimeMillis());
+ }
+ return ApiResponse.success("鏈堝彴鑷姩鍙彿");
+
+ }
+
+
+// @ApiOperation("鏈堝彴鑷姩鍙彿鍏ュ洯")
+// @PostMapping("/autoCallInParkCar")
+// public ApiResponse autoCallInParkCar() {
+// platformJobService.autoCallInParkCar(wmsService);
+// return ApiResponse.success("鏈堝彴鑷姩鍙彿鍏ュ洯");
+// }
+
+
}
--
Gitblit v1.9.3