From 0a37b816117828dfc216d00c17724900f4bb14e3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 17 四月 2026 14:29:23 +0800
Subject: [PATCH] 123
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java
index 402f87d..a9c4b1a 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java
@@ -2,7 +2,6 @@
import HslCommunication.Core.Types.OperateResult;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
-import com.alibaba.fastjson.JSON;
import com.zy.acs.common.utils.News;
import com.zy.acs.conveyor.core.constant.PlcConstant;
import com.zy.acs.conveyor.core.enums.SafeSignalField;
@@ -36,26 +35,23 @@
private static final int WRITE_RETRY_INTERVAL_MS = 200;
- public void read(StaProtocol staProtocol, SiemensS7Net siemensS7Net) {
-
- }
public void writeSafe(StaProtocol staProtocol) throws InterruptedException {
if (staProtocol == null) {
- News.warn("鍐欏叆鏁版嵁涓虹┖锛岃烦杩� [id:{}]", JSON.toJSONString(staProtocol));
+ News.warn("鍐欏叆瀹夊叏淇″彿锛岀珯鐐规暟鎹负绌�");
return;
}
SiemensS7Net siemensS7Net = devpS7Service.get(staProtocol.getPlcId());
if (siemensS7Net == null) {
- News.error("PLC鏈繛鎺ワ紝鏃犳硶鍐欏叆 [id:{}]", JSON.toJSONString(staProtocol));
+ News.error("PLC鏈繛鎺ワ紝鏃犳硶鍐欏叆 [id:{}]", staProtocol.getSafeSignalData());
return;
}
List<DevpSlave> devp = slaveProperties.getDevp();
DevpSlave devpSlave = devp.stream().filter(slave -> slave.getId().equals(staProtocol.getPlcId())).findFirst().orElse(null);
if (devpSlave == null) {
- News.error("PLC鏈厤缃紝鏃犳硶鍐欏叆 [id:{}]", JSON.toJSONString(staProtocol));
+ News.error("PLC鏈厤缃紝鏃犳硶鍐欏叆 [id:{}]", staProtocol.getSafeSignalData());
return;
}
int index = devpSlave.getStaNos().indexOf(staProtocol.getSiteId());
@@ -91,17 +87,17 @@
OperateResult writeResult = siemensS7Net.Write(flagAddr, array);
if (writeResult.IsSuccess) {
- News.info("鍐欏叆瀹夊叏淇″彿杈撻�佺嚎鍛戒护鎴愬姛 [id:{}] [siteId:{}] [workNo:{}] [destSta:{}] [retry:{}]",
+ News.info("鍐欏叆瀹夊叏淇″彿鎴愬姛 [id:{}] [siteId:{}] [workNo:{}] [destSta:{}] [retry:{}]",
staProtocol.getPlcId(), staProtocol.getSiteId(), staProtocol.getWorkNo(),
staProtocol.getStaNo(), writeCount);
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ畨鍏ㄤ俊鍙疯緭閫佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}",
- staProtocol.getPlcId(), JSON.toJSON(staProtocol)));
+ OutputQueue.DEVP.offer(MessageFormat.format("鍐欏叆瀹夊叏淇″彿杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={0}锛岀珯鐐规暟鎹�={1}",
+ staProtocol.getPlcId(), staProtocol.getSafeSignalData()));
success = true;
break;
}
writeCount++;
- News.error("鍐欏叆瀹夊叏淇″彿杈撻�佺嚎鍛戒护澶辫触 [id:{}] [siteId:{}] [retry:{}] [workErr:{}] ",
+ News.error("鍐欏叆瀹夊叏淇″彿澶辫触 [id:{}] [siteId:{}] [retry:{}] [workErr:{}] ",
staProtocol.getPlcId(), staProtocol.getSiteId(), writeCount,
writeResult.Message);
if (writeCount <= WRITE_RETRY) {
@@ -110,31 +106,31 @@
}
if (!success) {
- String errorMsg = MessageFormat.format("銆恵0}銆戝啓鍏ュ畨鍏ㄤ俊鍙疯緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}",
- staProtocol.getPlcId(), JSON.toJSON(staProtocol));
+ String errorMsg = MessageFormat.format("鍐欏叆瀹夊叏淇″彿澶辫触銆傝緭閫佺嚎plc缂栧彿={0}锛岀珯鐐规暟鎹�={1}",
+ staProtocol.getPlcId(), staProtocol.getSafeSignalData());
OutputQueue.DEVP.offer(errorMsg);
- News.error("SiemensDevp - 4 - 鍐欏叆瀹夊叏淇″彿杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}",
- staProtocol.getPlcId(), JSON.toJSON(staProtocol));
+ News.error("SiemensDevp - 4 - 鍐欏叆瀹夊叏淇″彿澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}",
+ staProtocol.getPlcId(), staProtocol.getSafeSignalData());
}
}
public void write(StaProtocol staProtocol) throws InterruptedException {
if (staProtocol == null) {
- News.warn("鍐欏叆鏁版嵁涓虹┖锛岃烦杩� [id:{}]", JSON.toJSONString(staProtocol));
+ News.warn("鍐欏叆浠诲姟鏁版嵁,绔欑偣鏁版嵁涓虹┖");
return;
}
SiemensS7Net siemensS7Net = devpS7Service.get(staProtocol.getPlcId());
if (siemensS7Net == null) {
- News.error("PLC鏈繛鎺ワ紝鏃犳硶鍐欏叆 [id:{}]", JSON.toJSONString(staProtocol));
+ News.error("PLC鏈繛鎺ワ紝鏃犳硶鍐欏叆 [id:{}]", staProtocol.getTaskData());
return;
}
List<DevpSlave> devp = slaveProperties.getDevp();
DevpSlave devpSlave = devp.stream().filter(slave -> slave.getId().equals(staProtocol.getPlcId())).findFirst().orElse(null);
if (devpSlave == null) {
- News.error("PLC鏈厤缃紝鏃犳硶鍐欏叆 [id:{}]", JSON.toJSONString(staProtocol));
+ News.error("PLC鏈厤缃紝鏃犳硶鍐欏叆 [id:{}]", staProtocol.getTaskData());
return;
}
int index = devpSlave.getStaNos().indexOf(staProtocol.getSiteId());
@@ -163,8 +159,8 @@
News.info("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛 [id:{}] [siteId:{}] [workNo:{}] [destSta:{}] [retry:{}]",
staProtocol.getPlcId(), staProtocol.getSiteId(), staProtocol.getWorkNo(),
staProtocol.getStaNo(), writeCount);
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}",
- staProtocol.getPlcId(), JSON.toJSON(staProtocol)));
+ OutputQueue.DEVP.offer(MessageFormat.format("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={0}锛岀珯鐐规暟鎹�={1}",
+ staProtocol.getPlcId(), staProtocol.getTaskData()));
success = true;
break;
}
@@ -180,11 +176,11 @@
}
if (!success) {
- String errorMsg = MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}",
- staProtocol.getPlcId(), JSON.toJSON(staProtocol));
+ String errorMsg = MessageFormat.format("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={0}锛岀珯鐐规暟鎹�={1}",
+ staProtocol.getPlcId(), staProtocol.getTaskData());
OutputQueue.DEVP.offer(errorMsg);
News.error("SiemensDevp - 4 - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}",
- staProtocol.getPlcId(), JSON.toJSON(staProtocol));
+ staProtocol.getPlcId(), staProtocol.getTaskData());
}
}
--
Gitblit v1.9.1