From 3fa7cdec6ce44f07a0dc7e1910511ead606990f3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 11 九月 2025 08:19:53 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/third/ReportThirdScheduler.java | 69 +++++++++++++++++++++++++++++-----
1 files changed, 58 insertions(+), 11 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/third/ReportThirdScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/third/ReportThirdScheduler.java
index 4fe348f..855f981 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/third/ReportThirdScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/third/ReportThirdScheduler.java
@@ -8,6 +8,7 @@
import com.zy.acs.manager.core.utils.HttpHandler;
import com.zy.acs.manager.manager.entity.TaskReport;
import com.zy.acs.manager.manager.entity.TaskReportLog;
+import com.zy.acs.manager.manager.enums.TaskReportStsType;
import com.zy.acs.manager.manager.service.TaskReportLogService;
import com.zy.acs.manager.manager.service.TaskReportService;
import com.zy.acs.manager.system.service.ConfigService;
@@ -44,21 +45,68 @@
if (report) {
String wmsUrl = configService.getVal("WMS_URL", String.class);
String wmsPath = configService.getVal("WMS_PATH", String.class);
+
+ String wcsUrl = configService.getVal("WCS_URL", String.class);
+ String wcsPath = configService.getVal("WCS_TASK_REPORT", String.class);
List<TaskReport> list = taskReportService.list(new LambdaQueryWrapper<TaskReport>().eq(TaskReport::getCompleted, 0).le(TaskReport::getReportTimes, 3));
for (TaskReport taskReport : list) {
- TaskEvent taskEvent = new TaskEvent(taskReport.getSeqNum(), taskReport.getEventType(), taskReport.getAgvId() + "");
- log.info("寮�濮嬩笂鎶ワ細{}", taskEvent);
- if (report(taskEvent, wmsUrl, wmsPath)) {
- taskReport.setReportTimes((Cools.isEmpty(taskReport.getReportTimes()) ? 0 : taskReport.getReportTimes()) + 1);
- taskReport.setUpdateTime(new Date());
- taskReport.setCompleted(1);
+ if (taskReport.getEventType().equalsIgnoreCase(TaskReportStsType.COMPLETED.name)) {
+ String response = null;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(wcsUrl)
+ .setPath(wcsPath)
+ .setJson(JSON.toJSONString(taskReport))
+ .build()
+ .doPost();
+ log.info("杩斿洖鍙傛暟锛歿}", response);
+ taskReport.setReportTimes((Cools.isEmpty(taskReport.getReportTimes()) ? 0 : taskReport.getReportTimes()) + 1);
+ taskReport.setUpdateTime(new Date());
+ taskReport.setCompleted(1);
+ } catch (IOException e) {
+ taskReport.setReportTimes((Cools.isEmpty(taskReport.getReportTimes()) ? 0 : taskReport.getReportTimes()) + 1);
+ taskReport.setUpdateTime(new Date());
+ e.printStackTrace();
+ }
+ taskReportService.updateById(taskReport);
+ } else if (taskReport.getEventType().equalsIgnoreCase(TaskReportStsType.OTBIN.name) && taskReport.getSeqNum().contains("SSX-RK")) {
+ String response = null;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(wcsUrl)
+ .setPath(wcsPath)
+ .setJson(JSON.toJSONString(taskReport))
+ .build()
+ .doPost();
+ log.info("杩斿洖鍙傛暟锛歿}", response);
+ taskReport.setReportTimes((Cools.isEmpty(taskReport.getReportTimes()) ? 0 : taskReport.getReportTimes()) + 1);
+ taskReport.setUpdateTime(new Date());
+ taskReport.setCompleted(1);
+ } catch (IOException e) {
+ taskReport.setReportTimes((Cools.isEmpty(taskReport.getReportTimes()) ? 0 : taskReport.getReportTimes()) + 1);
+ taskReport.setUpdateTime(new Date());
+ e.printStackTrace();
+ }
+ taskReportService.updateById(taskReport);
} else {
- taskReport.setReportTimes((Cools.isEmpty(taskReport.getReportTimes()) ? 0 : taskReport.getReportTimes()) + 1);
- taskReport.setUpdateTime(new Date());
+ TaskEvent taskEvent = new TaskEvent(taskReport.getSeqNum(), taskReport.getEventType(), taskReport.getAgvId() + "");
+ log.info("寮�濮嬩笂鎶ワ細{}", taskEvent);
+ if (report(taskEvent, wmsUrl, wmsPath)) {
+ taskReport.setReportTimes((Cools.isEmpty(taskReport.getReportTimes()) ? 0 : taskReport.getReportTimes()) + 1);
+ taskReport.setUpdateTime(new Date());
+ taskReport.setCompleted(1);
+ } else {
+ taskReport.setReportTimes((Cools.isEmpty(taskReport.getReportTimes()) ? 0 : taskReport.getReportTimes()) + 1);
+ taskReport.setUpdateTime(new Date());
+ }
+ taskReportService.updateById(taskReport);
}
- taskReportService.updateById(taskReport);
}
}
+ }
+
+ public static void main(String[] args) {
+ System.out.println("SSX-RK122".contains("SSX-RK"));
}
/**
@@ -93,13 +141,12 @@
response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath(wmsPath)
-
.setJson(JSON.toJSONString(taskReport))
.build()
.doPost();
log.info("杩斿洖鍙傛暟锛歿}", response);
JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject != null && jsonObject.getInteger("code").equals(200)) {
+ if (jsonObject != null && jsonObject.get("code") != null && jsonObject.getInteger("code").equals(200)) {
return true;
}
} catch (IOException e) {
--
Gitblit v1.9.1