From 6831504a0ece1c073b65873757905936b533f2d9 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 10 四月 2026 17:10:23 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java | 5 +++--
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java | 9 ++++++---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java | 10 +++++++---
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/ConveyorBackgroundService.java | 15 +++++++++++----
5 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/ConveyorBackgroundService.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/ConveyorBackgroundService.java
index 5b3d79e..381166b 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/ConveyorBackgroundService.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/ConveyorBackgroundService.java
@@ -1,5 +1,6 @@
package com.zy.acs.conveyor.core;
+import com.zy.acs.common.utils.News;
import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
import com.zy.acs.conveyor.core.properties.CtuServiceProperties;
import com.zy.acs.conveyor.core.properties.SystemProperties;
@@ -32,6 +33,11 @@
private final AtomicBoolean running = new AtomicBoolean(false);
+ private long lastDbUpdateTime = 0;
+
+
+ private static final int LOG_INTERVAL_MS = 30000;
+
@PostConstruct
public void init() {
// 鍒濆鍖栫嚎绋嬫睜
@@ -57,15 +63,16 @@
log.debug("绯荤粺鏈繍琛屾垨鏈嶅姟宸插仠姝紝璺宠繃杈撻�佺嚎浠诲姟澶勭悊");
return;
}
-
+ long currentTime = System.currentTimeMillis();
+ if (currentTime - lastDbUpdateTime > LOG_INTERVAL_MS) {
+ News.info("鎵ц杈撻�佺嚎鎿嶄綔");
+ lastDbUpdateTime = currentTime;
+ }
try {
// 鎵ц閰嶇疆鐨勬搷浣滃簭鍒�
for (CtuOperationConfig config : properties.getOperations()) {
- //log.info("鎵ц杈撻�佺嚎鎿嶄綔: {}", config.getType());
operationExecutor.execute(config);
}
-
- //log.info("杈撻�佺嚎浠诲姟澶勭悊瀹屾垚");
} catch (Exception e) {
log.error("杈撻�佺嚎浠诲姟澶勭悊寮傚父", 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 3f3eb9c..6ec79e6 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
@@ -1,5 +1,6 @@
package com.zy.acs.conveyor.core.operation.handler;
+import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.controller.vo.ApplyInDto;
import com.zy.acs.conveyor.controller.vo.ApplyInRepsonseDto;
@@ -82,7 +83,8 @@
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
String barcode = staProtocol.getBarcode();
if (Cools.isEmpty(barcode)) {
- log.error("绔欑偣锛歿}锛屾湭鎵埌鐮佸�硷細{}", staProtocol.getSiteId(), barcode);
+ News.error("绔欑偣锛歿}锛屾湭鎵埌鐮佸�硷細{}", staProtocol.getSiteId(), barcode);
+ //log.error("绔欑偣锛歿}锛屾湭鎵埌鐮佸�硷細{}", staProtocol.getSiteId(), barcode);
return;
}
// 9991鏄┖鏉匡紝9992鏄弧鏉�
@@ -97,10 +99,12 @@
staProtocol.setStaNo(inSta.getTargetSta());
redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
if (jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
- log.info("鐢宠鍏ュ簱鎴愬姛锛屾潯鐮侊細{},绔欑偣锛歿}", barcode, inSta.getStaNo());
+ News.info("鐢宠鍏ュ簱鎴愬姛锛屾潯鐮侊細{},绔欑偣锛歿}", barcode, inSta.getStaNo());
+ //log.info("鐢宠鍏ュ簱鎴愬姛锛屾潯鐮侊細{},绔欑偣锛歿}", barcode, inSta.getStaNo());
}
} else {
- log.info("WMS鏈繑鍥炲簱浣嶄俊鎭紝鏉＄爜锛歿},绔欑偣锛歿}", barcode, inSta.getStaNo());
+ News.error("WMS鏈繑鍥炲簱浣嶄俊鎭紝鏉＄爜锛歿},绔欑偣锛歿}", barcode, inSta.getStaNo());
+ //log.info("WMS鏈繑鍥炲簱浣嶄俊鎭紝鏉＄爜锛歿},绔欑偣锛歿}", barcode, inSta.getStaNo());
}
}
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java
index 179651b..a03a113 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java
@@ -1,5 +1,6 @@
package com.zy.acs.conveyor.core.operation.handler;
+import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
import com.zy.acs.conveyor.core.enums.ConveyorStateType;
@@ -72,10 +73,10 @@
staProtocol.setStaNo(0);
redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
- log.info("" + config.getMark() + "绔欑偣娓呯┖澶辫触锛歿},{}", takeSta.getStaNo(), staProtocol.getWorkNo());
job.setJobSts(ConveyorStateType.CLEARSIGNAL.getStatus());
jobService.updateById(job);
-
+ //log.info("" + config.getMark() + "绔欑偣娓呯┖锛歿},{}", takeSta.getStaNo(), staProtocol.getWorkNo());
+ News.info("" + config.getMark() + "绔欑偣娓呯┖锛歿},{}", takeSta.getStaNo(), staProtocol.getWorkNo());
}
}
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
index 8049f9f..9a642a8 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
@@ -1,5 +1,6 @@
package com.zy.acs.conveyor.core.operation.handler;
+import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
import com.zy.acs.conveyor.core.enums.ConveyorStateType;
@@ -70,14 +71,16 @@
// 鍒ゆ柇鏄惁婊¤冻鏉′欢
if (!staProtocol.isLoading()) {
if (staProtocol.getWorkNo() > 0) {
- log.error("杈撻�佺嚎涓婃湁浠诲姟鍙锋棤璐э紝闇�瑕佷汉宸ュ鐞嗭細{}", staProtocol.getSiteId());
+ News.error("杈撻�佺嚎涓婃湁浠诲姟鍙锋棤璐э紝闇�瑕佷汉宸ュ鐞嗭細{}", staProtocol.getSiteId());
+ //log.error("杈撻�佺嚎涓婃湁浠诲姟鍙锋棤璐э紝闇�瑕佷汉宸ュ鐞嗭細{}", staProtocol.getSiteId());
}
continue;
}
if (staProtocol.isAutoing() && staProtocol.getWorkNo() == 0) {
if (staProtocol.isInEnable()) {
- log.error("娌℃湁鍙叆淇″彿锛歿}", staProtocol.getSiteId());
+ News.error("娌℃湁鍙叆淇″彿锛歿}", staProtocol.getSiteId());
+ //log.error("娌℃湁鍙叆淇″彿锛歿}", staProtocol.getSiteId());
continue;
}
String seqNum = ctuMainService.checkStationStatus(releaseSta.getStaNo());
@@ -98,7 +101,8 @@
log.info("杈撻�佺嚎涓嬪彂锛歿},{}", staProtocol.getWorkNo(), releaseSta.getTargetSta());
}
} else {
- log.info("绔欑偣淇℃伅涓嶇鍚堝叆搴撴潯浠讹紒锛侊紒" + " 璋冪敤RCS妫�楠屾湭閫氳繃,绔欑偣锛歿}", staProtocol.getSiteId());
+ News.error("绔欑偣淇℃伅涓嶇鍚堝叆搴撴潯浠讹紒锛侊紒" + " 璋冪敤RCS妫�楠屾湭閫氳繃,绔欑偣锛歿}", staProtocol.getSiteId());
+ //log.info("绔欑偣淇℃伅涓嶇鍚堝叆搴撴潯浠讹紒锛侊紒" + " 璋冪敤RCS妫�楠屾湭閫氳繃,绔欑偣锛歿}", staProtocol.getSiteId());
}
}
}
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 29117c0..1f487d9 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
@@ -1,6 +1,7 @@
package com.zy.acs.conveyor.core.operation.handler;
+import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.controller.vo.OpenBusSubmitParam;
import com.zy.acs.conveyor.controller.vo.TaskDto;
@@ -73,12 +74,14 @@
// 鍒ゆ柇鏄惁婊¤冻鏉′欢
if (!staProtocol.isLoading()) {
if (staProtocol.getWorkNo() > 0) {
- log.error("杈撻�佺嚎涓婃湁浠诲姟鍙锋棤璐э紝闇�瑕佷汉宸ュ鐞嗭細{}", staProtocol.getSiteId());
+ News.error("杈撻�佺嚎涓婃湁璐ф棤浠诲姟鍙凤紝闇�瑕佷汉宸ュ鐞嗭細{}", staProtocol.getSiteId());
+ //log.error("杈撻�佺嚎涓婃湁浠诲姟鍙锋棤璐э紝闇�瑕佷汉宸ュ鐞嗭細{}", staProtocol.getSiteId());
}
continue;
}
if (staProtocol.getWorkNo() == 0) {
- log.error("杈撻�佺嚎涓婃湁璐ф棤浠诲姟鍙凤紝闇�瑕佷汉宸ュ鐞嗭細{}", staProtocol.getSiteId());
+ News.error("杈撻�佺嚎涓婃湁璐ф棤浠诲姟鍙凤紝闇�瑕佷汉宸ュ鐞嗭細{}", staProtocol.getSiteId());
+ //log.error("杈撻�佺嚎涓婃湁璐ф棤浠诲姟鍙凤紝闇�瑕佷汉宸ュ鐞嗭細{}", staProtocol.getSiteId());
continue;
}
if (staProtocol.isAutoing()) {
@@ -94,7 +97,7 @@
}
}
} else {
- log.error("杈撻�佺嚎涓鸿嚜鍔紝闇�瑕佸紑鍚細{}", staProtocol.getSiteId());
+ log.error("杈撻�佺嚎鏈嚜鍔紝闇�瑕佸紑鍚細{}", staProtocol.getSiteId());
}
}
}
--
Gitblit v1.9.1