From 9869f39cc82ae584ef4d783bb13316ccd24d26dd Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 17 四月 2026 10:16:47 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java | 6 +-
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorOperationExecutor.java | 26 ++-----------
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java | 1
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WmsMainServiceImpl.java | 2
zy-asc-conveyor/src/main/resources/application.yml | 10 -----
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/CtuOperationConfig.java | 2 -
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java | 10 ++--
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorBackgroundService.java | 20 +++++-----
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java | 2
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java | 2
10 files changed, 25 insertions(+), 56 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java
index ff68000..c937057 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java
@@ -184,13 +184,13 @@
public String getLocTypeStr() {
- if (high){
+ if (high) {
return "楂�";
}
- if (low){
+ if (low) {
return "浣�";
}
- if (mid){
+ if (mid) {
return "涓�";
}
return "-";
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 fbe9fa1..720790b 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
@@ -31,7 +31,6 @@
private ScheduledExecutorService executorService;
- private final AtomicBoolean running = new AtomicBoolean(false);
private long lastDbUpdateTime = 0;
@@ -44,7 +43,7 @@
executorService = Executors.newSingleThreadScheduledExecutor(r -> {
Thread thread = new Thread(r);
thread.setName("cv-background-thread");
- thread.setDaemon(true);
+ //thread.setDaemon(true);
return thread;
});
@@ -53,13 +52,12 @@
properties.getInitialDelay(),
properties.getInterval(),
TimeUnit.MILLISECONDS);
- running.set(true);
News.info("杈撻�佺嚎鍚庡彴鏈嶅姟绾跨▼鍒濆鍖栧畬鎴�");
}
private void processConveyorTasks() {
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (!SystemProperties.WCS_RUNNING_STATUS.get() || !running.get()) {
+ if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
News.info("绯荤粺鏈繍琛屾垨鏈嶅姟宸插仠姝紝璺宠繃杈撻�佺嚎浠诲姟澶勭悊");
return;
}
@@ -68,19 +66,21 @@
News.info("鎵ц杈撻�佺嚎鎿嶄綔");
lastDbUpdateTime = currentTime;
}
- try {
- // 鎵ц閰嶇疆鐨勬搷浣滃簭鍒�
- for (CtuOperationConfig config : properties.getOperations()) {
+
+ // 鎵ц閰嶇疆鐨勬搷浣滃簭鍒�
+ for (CtuOperationConfig config : properties.getOperations()) {
+ try {
operationExecutor.execute(config);
+ } catch (Exception e) {
+ News.error("杈撻�佺嚎鎿嶄綔鎵ц鏈�缁堝け璐�, type={}, error={}", config.getType(), e.getMessage());
+ // 鍙�夛細鍙戦�佸憡璀︺�佹殏鍋滆皟搴︾瓑
}
- } catch (Exception e) {
- News.error("杈撻�佺嚎浠诲姟澶勭悊寮傚父,{}", e.getMessage());
}
+
}
@PreDestroy
public void shutDown() {
- running.set(false);
if (executorService != null && !executorService.isShutdown()) {
News.info("姝ｅ湪鍏抽棴杈撻�佺嚎鍚庡彴鏈嶅姟绾跨▼...");
executorService.shutdown();
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorOperationExecutor.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorOperationExecutor.java
index 85cfb33..7c0fce6 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorOperationExecutor.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorOperationExecutor.java
@@ -32,28 +32,10 @@
News.warn("鏈壘鍒版搷浣滃鐞嗗櫒: {}", config.getType());
return;
}
-
- int retryCount = 0;
- while (retryCount < config.getMaxRetries()) {
- try {
- handler.execute(config);
- return;
- } catch (Exception e) {
- retryCount++;
- if (retryCount >= config.getMaxRetries()) {
- News.error("鎿嶄綔鎵ц澶辫触锛屽凡杈惧埌鏈�澶ч噸璇曟鏁�: {}", config.getType(), e);
- } else {
- News.warn("鎿嶄綔鎵ц澶辫触锛屾鍦ㄩ噸璇�({}/{})",
- retryCount, config.getMaxRetries(), e);
- try {
- Thread.sleep(config.getRetryDelay());
- } catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
- News.error("閲嶈瘯浼戠湢琚腑鏂�", ie);
- return;
- }
- }
- }
+ try {
+ handler.execute(config);
+ } catch (Exception e) {
+ News.error("鎿嶄綔鎵ц澶辫触锛岀瓑寰呬笅涓�鍛ㄦ湡閲嶈瘯: {}", config.getType(), e);
}
}
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
index ee0088b..d55f036 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
@@ -88,7 +88,7 @@
News.error("{}锛氱珯鐐癸細{}锛屾棤鐗�", config.getMark(), staProtocol.getSiteId());
continue;
}
- if (staProtocol.isErr()){
+ if (staProtocol.isErr()) {
if (staProtocol.isFrontErr()) {
News.error("{}锛氱珯鐐癸細{}锛屽墠瓒呴檺", config.getMark(), staProtocol.getSiteId());
continue;
@@ -97,15 +97,15 @@
News.error("{}锛氱珯鐐癸細{}锛屽悗瓒呴檺", config.getMark(), staProtocol.getSiteId());
continue;
}
- if ( staProtocol.isHighErr()) {
+ if (staProtocol.isHighErr()) {
News.error("{}锛氱珯鐐癸細{}锛岄珮瓒呴檺", config.getMark(), staProtocol.getSiteId());
continue;
}
- if ( staProtocol.isLeftErr()) {
+ if (staProtocol.isLeftErr()) {
News.error("{}锛氱珯鐐癸細{}锛屽乏瓒呴檺", config.getMark(), staProtocol.getSiteId());
continue;
}
- if ( staProtocol.isRightErr()) {
+ if (staProtocol.isRightErr()) {
News.error("{}锛氱珯鐐癸細{}锛屽彸瓒呴檺", config.getMark(), staProtocol.getSiteId());
continue;
}
@@ -113,7 +113,7 @@
News.error("{}锛氱珯鐐癸細{}锛岃秴閲嶆垨", config.getMark(), staProtocol.getSiteId());
continue;
}
- if ( staProtocol.isBarcodeErr()) {
+ if (staProtocol.isBarcodeErr()) {
News.error("{}锛氱珯鐐癸細{}锛屾壂鐮佸け璐�", config.getMark(), staProtocol.getSiteId());
continue;
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java
index 2baef11..814ef48 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java
@@ -6,7 +6,6 @@
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.controller.vo.OpenBusSubmitParam;
import com.zy.acs.conveyor.controller.vo.TaskDto;
-import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
import com.zy.acs.conveyor.core.enums.ConveyorStateType;
import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.operation.OperationHandler;
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
index b7aee24..4b51454 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
@@ -105,7 +105,7 @@
staProtocol.setStartUpFlag(false);
redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
if (!jobService.insert(job)) {
- News.info("{},鍚姩鍏ュ簱锛氬伐浣滃彿锛歿},鐩爣绔欑偣锛歿},婊★細{},绌猴細{}", config.getMark(), staProtocol.getWorkNo(), staProtocol.getStaNo(),staProtocol.isFullPlt(),staProtocol.isEmptyMk());
+ News.info("{},鍚姩鍏ュ簱锛氬伐浣滃彿锛歿},鐩爣绔欑偣锛歿},婊★細{},绌猴細{}", config.getMark(), staProtocol.getWorkNo(), staProtocol.getStaNo(), staProtocol.isFullPlt(), staProtocol.isEmptyMk());
}
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/CtuOperationConfig.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/CtuOperationConfig.java
index 67b866f..1f11de8 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/CtuOperationConfig.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/CtuOperationConfig.java
@@ -10,7 +10,5 @@
public class CtuOperationConfig {
private ConveyorStateType type;
private String mark;
- private int maxRetries = 3;
- private long retryDelay = 500;
private Map<String, Object> params = new HashMap<>();
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
index cd5153c..838d394 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
@@ -4,7 +4,7 @@
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
-import com.zy.acs.conveyor.core.constant.*;
+import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
import com.zy.acs.conveyor.core.enums.DeviceField;
import com.zy.acs.conveyor.core.enums.PlcAlarmDefinition;
import com.zy.acs.conveyor.core.enums.SafeSignalField;
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WmsMainServiceImpl.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WmsMainServiceImpl.java
index 8b10e97..74a05f8 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WmsMainServiceImpl.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WmsMainServiceImpl.java
@@ -58,7 +58,7 @@
.setJson(JSON.toJSONString(applyInDto))
.build()
.doPost();
- log.info("璇锋眰鏁版嵁锛歿},WMS杩斿洖鏁版嵁锛歿}", applyInDto,response);
+ log.info("璇锋眰鏁版嵁锛歿},WMS杩斿洖鏁版嵁锛歿}", applyInDto, response);
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.get(code) != null && jsonObject.getInteger(code).equals(codeValue)) {
return JSONObject.parseObject(jsonObject.getString(dataCode), ApplyInRepsonseDto.class);
diff --git a/zy-asc-conveyor/src/main/resources/application.yml b/zy-asc-conveyor/src/main/resources/application.yml
index 2d6249b..cdde676 100644
--- a/zy-asc-conveyor/src/main/resources/application.yml
+++ b/zy-asc-conveyor/src/main/resources/application.yml
@@ -43,24 +43,14 @@
operations:
- type: OUTBOUND
mark: 鍑哄簱娴佺▼
- max-retries: 3
- retry-delay: 800
- type: STARTUP
mark: 鍚姩鍏ュ簱娴佺▼
- max-retries: 2
- retry-delay: 800
- type: APPLYLOC
mark: 鐢宠鍏ュ簱娴佺▼
- max-retries: 2
- retry-delay: 2000
- type: CLEARSIGNAL
mark: 娓呯悊淇″彿娴佺▼
- max-retries: 2
- retry-delay: 800
- type: SENDTASK
mark: 鍙戦�佷换鍔CS娴佺▼
- max-retries: 2
- retry-delay: 800
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
--
Gitblit v1.9.1