From 975e2f1de550dceaf7c96b29f5bc8692245291fa Mon Sep 17 00:00:00 2001
From: Administrator <zc857179121@qq.com>
Date: 星期四, 16 四月 2026 17:48:17 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java | 4 ++--
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/requestParam/StaParam.java | 2 +-
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorBackgroundService.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java
index 47b55e5..5c143f6 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java
@@ -40,7 +40,7 @@
@PostMapping("/station/getTaskNo")
public R query(@RequestBody StaParam param) {
log.info("鏍规嵁绔欑偣鏌ヨstaNo锛歿}", param);
- String staNo = param.getStaNo();
+ String staNo = param.getStationId();
Map<Integer, StaProtocol> station = stationService.getStationMap(param.getDevpId());
StaProtocol staProtocol = station.get(Integer.parseInt(staNo));
Integer workNo = staProtocol.getWorkNo();
@@ -61,7 +61,7 @@
@PostMapping("/station/getError")
public R getError(@RequestBody StaParam param) {
log.info("鏍规嵁绔欑偣鏌ヨstaNo锛歿}", param);
- String staNo = param.getStaNo();
+ String staNo = param.getStationId();
Map<Integer, StaProtocol> station = stationService.getStationMap(param.getDevpId());
StaProtocol staProtocol = station.get(Integer.parseInt(staNo));
return R.ok(staPlcErr(staProtocol));
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/requestParam/StaParam.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/requestParam/StaParam.java
index 02801d3..f04e5be 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/requestParam/StaParam.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/requestParam/StaParam.java
@@ -9,7 +9,7 @@
/**
* 绔欑偣鍒楄〃
*/
- private String staNo;
+ private String stationId;
/**
* 杈撻�佺嚎缂栧彿
*/
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorBackgroundService.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorBackgroundService.java
index bdf444c..2439112 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorBackgroundService.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorBackgroundService.java
@@ -36,7 +36,7 @@
private long lastDbUpdateTime = 0;
- private static final int LOG_INTERVAL_MS = 30000;
+ private static final int LOG_INTERVAL_MS = 300000;
@PostConstruct
public void init() {
--
Gitblit v1.9.1