From c467370d8741bc05ca7c22d4253c58ac0a979ef5 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 09 六月 2026 09:46:25 +0800
Subject: [PATCH] 功能优化
---
server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java | 76 ++++++++++++++++++++++++++++----------
1 files changed, 56 insertions(+), 20 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 9159418..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
@@ -1,32 +1,23 @@
package com.doumee.api;
-import com.alibaba.fastjson.JSONObject;
-import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.HttpsUtil;
-import com.doumee.core.wx.WXConstant;
-import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.service.business.third.model.ApiResponse;
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;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.mgt.DefaultSecurityManager;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-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;
-import java.util.Date;
-import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
* @author 姹熻箘韫�
* @date 2023/11/30 15:33
*/
+@Slf4j
@Api(tags = "鏈堝彴浣滀笟瀹氭椂")
@RestController
@RequestMapping("/timer/platformJob")
@@ -35,15 +26,60 @@
@Autowired
private PlatformJobService platformJobService;
+ private final AtomicBoolean dealingSendNotice = new AtomicBoolean(false);
- @ApiOperation("鏈堝彴浣滀笟鎶ヨ涓氬姟")
- @GetMapping("/platformJobTimer")
+
+ @ApiOperation("鏈堝彴鍋滈潬瓒呮椂鎶ヨ涓氬姟")
+ @PostMapping("/platformJobTimer")
public ApiResponse platformJobTimer() {
+ log.info("瀹氭椂浠诲姟鎵ц寮�濮嬶細platformJobTimer-鏈堝彴鍋滈潬瓒呮椂鎶ヨ");
platformJobService.timeOutReport();
- platformJobService.timeOutCallIn();
- platformJobService.timeOutWork();
- return ApiResponse.success("鏈堝彴浣滀笟鎶ヨ涓氬姟");
+ return ApiResponse.success("鏈堝彴鍋滈潬瓒呮椂鎶ヨ涓氬姟");
+ }
+ @ApiOperation("鏈堝彴浣滀笟妫�鏌ョ數瀛愰攣涓婇攣鐘舵��")
+ @PostMapping("/platformCheckWmsLockStatus")
+ public ApiResponse checkWmsLockStatus() {
+ log.info("瀹氭椂浠诲姟鎵ц寮�濮嬶細checkWmsLockStatus-妫�鏌ョ數瀛愰攣涓婇攣鐘舵��");
+ platformJobService.checkWmsLockStatus();
+ return ApiResponse.success("鏈堝彴鍋滈潬瓒呮椂鎶ヨ涓氬姟");
}
+ @ApiOperation("鏈堝彴浣滀笟瓒呮椂鎶ヨ涓氬姟")
+ @PostMapping("/platformJobWorkTimeOut")
+ public ApiResponse platformJobWorkTimeOut() {
+ log.info("瀹氭椂浠诲姟鎵ц寮�濮嬶細platformJobWorkTimeOut-鏈堝彴浣滀笟瓒呮椂鎶ヨ");
+ platformJobService.timeOutWork();
+ return ApiResponse.success("鏈堝彴浣滀笟瓒呮椂鎶ヨ涓氬姟");
+ }
+
+
+ @ApiOperation("鏈堝彴绛夊緟浣滀笟瓒呮椂涓氬姟")
+ @PostMapping("/platformJobWaitTimeOut")
+ public ApiResponse platformJobWaitTimeOut() {
+ log.info("瀹氭椂浠诲姟鎵ц寮�濮嬶細platformJobWaitTimeOut-鏈堝彴绛夊緟浣滀笟瓒呮椂");
+ platformJobService.timeOutCallIn();
+ return ApiResponse.success("鏈堝彴绛夊緟浣滀笟瓒呮椂涓氬姟");
+ }
+
+
+
+ @PreventRepeat(interval = 2000)
+ @ApiOperation("鏈堝彴浠婃棩浣滀笟鏈畬鎴愰�氱煡瀹氭椂")
+ @PostMapping("/sendUnFinishNotice")
+ 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