From 21be3eed9e4c9e0acd6bddc6b97f2e54d130bede Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Mon, 20 Jan 2025 14:37:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?=
=?UTF-8?q?=20=E5=9B=9E=E9=80=80=E4=B8=80=E9=83=A8=E5=88=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-quartz/pom.xml | 6 -
.../com/ruoyi/quartz/task/TaskExecutor.java | 114 +++++++++---------
2 files changed, 56 insertions(+), 64 deletions(-)
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index 41c0addd..5a4172c3 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -38,12 +38,6 @@
com.ruoyi
ruoyi-system
-
- com.ruoyi
- ruoyi-admin
- 3.8.9
- compile
-
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java
index 22c3b669..b7fc6616 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java
@@ -9,8 +9,6 @@ import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.system.service.ISysConfigService;
-import com.ruoyi.web.domain.WcsCommonResponse;
-import com.ruoyi.web.domain.WcsStackerTaskRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -93,66 +91,66 @@ public class TaskExecutor {
* 任务状态为0
*/
public void sendWcsTask() {
- // 查询出所有的待下发的wcs任务
- AppWcsTask wcsTaskQuery = new AppWcsTask();
- wcsTaskQuery.setWcsTaskStatus(0);
- List wcsTaskList = appWcsTaskService.selectAppWcsTaskList(wcsTaskQuery);
- if (wcsTaskList == null || wcsTaskList.isEmpty()) {
- // 没有待下发的任务，跳过任务
- return;
- }
- // 获取请求地址
- String url = sysConfigService.selectConfigByKey("wcs.url");
- if (StringUtils.isEmpty(url)) {
- // 查询不到wcs任务发送地址
- return;
- }
- for (AppWcsTask appWcsTask : wcsTaskList) {
- // 添加wcs任务请求
- WcsStackerTaskRequest wcsStackerTaskRequest = getWcsStackerTaskRequest(appWcsTask);
- // 发送http请求---请求5次
- for (int i = 0; i < 5; i++) {
- try {
- WcsCommonResponse wcsCommonResponse = JSON.parseObject(HttpUtils.sendPost(url, JSON.toJSONString(wcsStackerTaskRequest)), WcsCommonResponse.class);
-
- if (wcsCommonResponse == null) {
- continue;
- }
- if (wcsCommonResponse.getCode() == 0) {
- // 返回ok
- appWcsTask.setWcsTaskStatus(1);// 已经发送成功
- } else {
- // 返回error
- appWcsTask.setWcsTaskStatus(999);// 任务异常
- }
- appWcsTask.setSendTime(new Date());
- appWcsTaskService.updateAppWcsTask(appWcsTask);
- // 请求成功，不再发送
- break;
- } catch (Exception e) {
- logger.error("任务发送异常。{}", JSON.toJSONString(e));
- }
- }
- }
+// // 查询出所有的待下发的wcs任务
+// AppWcsTask wcsTaskQuery = new AppWcsTask();
+// wcsTaskQuery.setWcsTaskStatus(0);
+// List wcsTaskList = appWcsTaskService.selectAppWcsTaskList(wcsTaskQuery);
+// if (wcsTaskList == null || wcsTaskList.isEmpty()) {
+// // 没有待下发的任务，跳过任务
+// return;
+// }
+// // 获取请求地址
+// String url = sysConfigService.selectConfigByKey("wcs.url");
+// if (StringUtils.isEmpty(url)) {
+// // 查询不到wcs任务发送地址
+// return;
+// }
+// for (AppWcsTask appWcsTask : wcsTaskList) {
+// // 添加wcs任务请求
+// WcsStackerTaskRequest wcsStackerTaskRequest = getWcsStackerTaskRequest(appWcsTask);
+// // 发送http请求---请求5次
+// for (int i = 0; i < 5; i++) {
+// try {
+// WcsCommonResponse wcsCommonResponse = JSON.parseObject(HttpUtils.sendPost(url, JSON.toJSONString(wcsStackerTaskRequest)), WcsCommonResponse.class);
+//
+// if (wcsCommonResponse == null) {
+// continue;
+// }
+// if (wcsCommonResponse.getCode() == 0) {
+// // 返回ok
+// appWcsTask.setWcsTaskStatus(1);// 已经发送成功
+// } else {
+// // 返回error
+// appWcsTask.setWcsTaskStatus(999);// 任务异常
+// }
+// appWcsTask.setSendTime(new Date());
+// appWcsTaskService.updateAppWcsTask(appWcsTask);
+// // 请求成功，不再发送
+// break;
+// } catch (Exception e) {
+// logger.error("任务发送异常。{}", JSON.toJSONString(e));
+// }
+// }
+// }
}
- /**
- * 创建wcs请求
- * @param appWcsTask 任务
- * @return 请求详情
- */
- private WcsStackerTaskRequest getWcsStackerTaskRequest(AppWcsTask appWcsTask) {
- WcsStackerTaskRequest wcsStackerTaskRequest = new WcsStackerTaskRequest();
- wcsStackerTaskRequest.setTaskId(appWcsTask.getWcsTaskId());
- wcsStackerTaskRequest.setTaskType(appWcsTask.getWcsTaskType());
- wcsStackerTaskRequest.setPriority(appWcsTask.getTaskPriority());
- wcsStackerTaskRequest.setOrigin(appWcsTask.getOrigin());
- wcsStackerTaskRequest.setDestination(appWcsTask.getDestination());
- wcsStackerTaskRequest.setVehicleNo(appWcsTask.getVehicleId());
- return wcsStackerTaskRequest;
- }
+// /**
+// * 创建wcs请求
+// * @param appWcsTask 任务
+// * @return 请求详情
+// */
+// private WcsStackerTaskRequest getWcsStackerTaskRequest(AppWcsTask appWcsTask) {
+// WcsStackerTaskRequest wcsStackerTaskRequest = new WcsStackerTaskRequest();
+// wcsStackerTaskRequest.setTaskId(appWcsTask.getWcsTaskId());
+// wcsStackerTaskRequest.setTaskType(appWcsTask.getWcsTaskType());
+// wcsStackerTaskRequest.setPriority(appWcsTask.getTaskPriority());
+// wcsStackerTaskRequest.setOrigin(appWcsTask.getOrigin());
+// wcsStackerTaskRequest.setDestination(appWcsTask.getDestination());
+// wcsStackerTaskRequest.setVehicleNo(appWcsTask.getVehicleId());
+// return wcsStackerTaskRequest;
+// }
}