From ed31a3811ec5b23770ce4bd3516f11bcc91d08c2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 13 四月 2026 11:10:51 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 4 ++--
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/dto/FaultUplinkParam.java | 2 +-
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/vo/ApplyInDto.java | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/dto/FaultUplinkParam.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/dto/FaultUplinkParam.java
index a4b6ae4..8c9a899 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/dto/FaultUplinkParam.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/dto/FaultUplinkParam.java
@@ -17,7 +17,7 @@
* 鏁呴殰鍚�
*/
private String faultName;
-
+ //鍙戠敓鏃堕棿锛屾椂闂存埑
private Long timestamp;
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
index 7df45fb..10c72e3 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
@@ -184,7 +184,7 @@
}
@Scheduled(cron = "0/3 * * * * ? ")
- private void reportTaskToUplink() {
+ private synchronized void reportTaskToUplink() {
if (!uplinkProperties.getEnabled()) {
return;
}
@@ -226,7 +226,7 @@
@Scheduled(cron = "0/3 * * * * ? ")
- private void reportFault() {
+ private synchronized void reportFault() {
String reportFaultUrl = configService.getVal("reportFaultUrl", String.class);
if (Cools.isEmpty(reportFaultUrl)) {
return;
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/vo/ApplyInDto.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/vo/ApplyInDto.java
index 8ac8602..a58e948 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/vo/ApplyInDto.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/vo/ApplyInDto.java
@@ -8,12 +8,14 @@
@Data
public class ApplyInDto {
+ //绔欑偣鍙�
private String staNo;
+ //鏉＄爜
private String barcode;
+ //鏄惁婊＄増
private Boolean full;
-
//閲嶉噺
private Double weight;
--
Gitblit v1.9.1