From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java
index ed9cf97..2f62b40 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java
@@ -19,6 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import com.zy.acs.common.utils.News;
import java.util.ArrayList;
import java.util.Date;
@@ -65,7 +66,7 @@
Long agvId = agvService.getAgvId(protocol.getAgvNo());
if (null == agvId) {
- log.warn("Agv [{}] 灏氭湭閴存潈 锛侊紒锛�", protocol.getAgvNo());
+ News.warn("Agv [{}] 灏氭湭閴存潈 锛侊紒锛�", protocol.getAgvNo());
return;
}
AgvDetail detail = agvDetailService.selectByAgvId(agvId);
@@ -73,7 +74,7 @@
detail = new AgvDetail();
detail.setAgvId(agvId);
if (!agvDetailService.save(detail)) {
- log.error("Agv [{}] 璇︽儏鏇存柊澶辫触 锛侊紒锛�", protocol.getAgvNo());
+ News.error("Agv [{}] 璇︽儏鏇存柊澶辫触 锛侊紒锛�", protocol.getAgvNo());
return;
}
}
@@ -95,7 +96,7 @@
this.sync(agv_12_up, detail);
// redis.setObject(RedisConstant.DIGITAL_AGV_FLAG, agv.getUuid(), agv_12_up);
if (PRINT_LOG) {
- log.info("Agv [{}] 鏈夌爜瀹炴椂鏁版嵁鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_12_up));
+ News.info("Agv [{}] 鏈夌爜瀹炴椂鏁版嵁鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_12_up));
}
}
// 鏃犵爜瀹炴椂鏁版嵁鍖�
@@ -105,7 +106,7 @@
this.sync(agv_13_up, detail);
// redis.setObject(RedisConstant.DIGITAL_AGV_FLAG, agv.getUuid(), agv_13_up);
if (PRINT_LOG) {
- log.info("Agv [{}] 鏃犵爜瀹炴椂鏁版嵁鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_13_up));
+ News.info("Agv [{}] 鏃犵爜瀹炴椂鏁版嵁鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_13_up));
}
}
// 蹇冭烦鍖�
@@ -113,20 +114,20 @@
AGV_03_UP agv_03_up = (AGV_03_UP) msgBody;
this.sync(agv_03_up, detail);
if (PRINT_LOG) {
- log.info("Agv [{}] 蹇冭烦鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_03_up));
+ News.info("Agv [{}] 蹇冭烦鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_03_up));
}
}
// 鐧婚檰鍖�
if (msgBody instanceof AGV_F0_UP) {
AGV_F0_UP agv_f0_up = (AGV_F0_UP) msgBody;
this.sync(agv_f0_up, detail);
- log.info("Agv [{}] 鐧婚檰鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_f0_up));
+ News.info("Agv [{}] 鐧婚檰鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_f0_up));
}
// 鏁呴殰鏁版嵁鍖�
if (msgBody instanceof AGV_04_UP) {
AGV_04_UP agv_04_up = (AGV_04_UP) msgBody;
AgvErrorType errorType = AgvErrorType.query(agv_04_up.getHexFaultId());
- log.info("Agv [{}] 鏁呴殰鏁版嵁鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_04_up));
+ News.info("Agv [{}] 鏁呴殰鏁版嵁鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_04_up));
// save
faultProcessor.execute(new VehicleFaultDto<>(protocol.getAgvNo(), protocol.getTimestamp(), agv_04_up));
@@ -145,7 +146,7 @@
}
}
if (!agvDetailService.updateById(detail)) {
- log.error("Agv [{}] 璇︽儏鏇存柊澶辫触 锛侊紒锛�", protocol.getAgvNo());
+ News.error("Agv [{}] 璇︽儏鏇存柊澶辫触 锛侊紒锛�", protocol.getAgvNo());
}
}
@@ -160,10 +161,10 @@
detail.setLastCode(null);
detail.setPos(1);
// if (!agvDetailService.updatePosCode(detail.getId(), code.getId())) {
-// log.error("Agv [{}] 鏇存柊瀹氫綅鏁版嵁澶辫触 锛侊紒锛�", agvService.getById(detail.getAgvId()).getUuid());
+// News.error("Agv [{}] 鏇存柊瀹氫綅鏁版嵁澶辫触 锛侊紒锛�", agvService.getById(detail.getAgvId()).getUuid());
// }
} else {
- log.error("Agv [{}] 鏇存柊瀹氫綅鏁版嵁澶辫触 锛侊紒锛佷笂浼犳潯鐮侊細{}", agvService.getById(detail.getAgvId()).getUuid(), mesBody.getQrCode());
+ News.error("Agv [{}] 鏇存柊瀹氫綅鏁版嵁澶辫触 锛侊紒锛佷笂浼犳潯鐮侊細{}", agvService.getById(detail.getAgvId()).getUuid(), mesBody.getQrCode());
}
// 鍦伴潰鐮佸亸绉�
@@ -217,7 +218,7 @@
} else {
- log.error("Agv [{}] 鏇存柊瀹氫綅鏁版嵁澶辫触 锛侊紒锛佷笂浼犳潯鐮侊細{}", agvService.getById(detail.getAgvId()).getUuid(), mesBody.getQrCode());
+ News.error("Agv [{}] 鏇存柊瀹氫綅鏁版嵁澶辫触 锛侊紒锛佷笂浼犳潯鐮侊細{}", agvService.getById(detail.getAgvId()).getUuid(), mesBody.getQrCode());
}
detail.setStraightVal((double) mesBody.getStraightDirectionPosition());
@@ -281,4 +282,4 @@
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1