From 34f587564c9a34515e7deda4dcd02eb748480e1f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 13 一月 2025 18:05:24 +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 | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 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..14e26d6 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,26 +1,13 @@
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.service.business.third.model.ApiResponse;
import com.doumee.service.business.PlatformJobService;
-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 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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Date;
-import java.util.Objects;
/**
* @author 姹熻箘韫�
@@ -34,21 +21,34 @@
@Autowired
private PlatformJobService platformJobService;
- @ApiOperation("瓒呮椂鎶ヨ鏁版嵁")
- @GetMapping("/platformJobTimeOut")
- public ApiResponse platformJobTimeOut() {
+
+ @ApiOperation("鏈堝彴鍋滈潬瓒呮椂鎶ヨ涓氬姟")
+ @GetMapping("/platformJobTimer")
+ public ApiResponse platformJobTimer() {
platformJobService.timeOutReport();
- return ApiResponse.success("瓒呮椂鎶ヨ鏁版嵁");
+ return ApiResponse.success("鏈堝彴鍋滈潬瓒呮椂鎶ヨ涓氬姟");
+ }
+ @ApiOperation("鏈堝彴浣滀笟妫�鏌ョ數瀛愰攣涓婇攣鐘舵��")
+ @GetMapping("/platformCheckWmsLockStatus")
+ public ApiResponse checkWmsLockStatus() {
+ platformJobService.checkWmsLockStatus();
+ return ApiResponse.success("鏈堝彴鍋滈潬瓒呮椂鎶ヨ涓氬姟");
}
- @ApiOperation("瓒呮椂鑷姩杩囧彿")
- @GetMapping("/timeOutCallIn")
- public ApiResponse timeOutCallIn() {
+ @ApiOperation("鏈堝彴浣滀笟瓒呮椂鎶ヨ涓氬姟")
+ @GetMapping("/platformJobWorkTimeOut")
+ public ApiResponse platformJobWorkTimeOut() {
+ platformJobService.timeOutWork();
+ return ApiResponse.success("鏈堝彴浣滀笟瓒呮椂鎶ヨ涓氬姟");
+ }
+
+
+ @ApiOperation("鏈堝彴绛夊緟浣滀笟瓒呮椂涓氬姟")
+ @GetMapping("/platformJobWaitTimeOut")
+ public ApiResponse platformJobWaitTimeOut() {
platformJobService.timeOutCallIn();
- return ApiResponse.success("鑷姩杩囧彿");
+ return ApiResponse.success("鏈堝彴绛夊緟浣滀笟瓒呮椂涓氬姟");
}
-
-
}
--
Gitblit v1.9.3