From fc4e5c458094c6bf5238d7d21291325f19a57adb Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 22 十二月 2025 16:57:21 +0800
Subject: [PATCH] 修改：逻辑交互写入使用plc通讯工厂统一接口
---
mes-processes/mes-plcSend/src/main/java/com/mes/interaction/vehicle/handler/LoadVehicleLogicHandler.java | 149 +++++++++++++++++++++----------------------------
1 files changed, 65 insertions(+), 84 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/vehicle/handler/LoadVehicleLogicHandler.java b/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/vehicle/handler/LoadVehicleLogicHandler.java
index 63b1ea4..b49102b 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/vehicle/handler/LoadVehicleLogicHandler.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/vehicle/handler/LoadVehicleLogicHandler.java
@@ -15,9 +15,8 @@
import com.mes.interaction.vehicle.model.VehicleState;
import com.mes.interaction.vehicle.model.VehicleStatus;
import com.mes.interaction.vehicle.model.VehicleTask;
-import com.mes.s7.enhanced.EnhancedS7Serializer;
-import com.mes.s7.provider.S7SerializerProvider;
-import com.mes.service.PlcDynamicDataService;
+import com.mes.plc.client.PlcClient;
+import com.mes.plc.factory.PlcClientFactory;
import com.mes.task.model.TaskExecutionContext;
import com.mes.interaction.workstation.scanner.handler.HorizontalScannerLogicHandler;
import lombok.extern.slf4j.Slf4j;
@@ -56,10 +55,7 @@
private DeviceStatusService deviceStatusService;
@Autowired(required = false)
- private PlcDynamicDataService plcDynamicDataService;
-
- @Autowired(required = false)
- private S7SerializerProvider s7SerializerProvider;
+ private PlcClientFactory plcClientFactory;
// MES瀛楁鍒楄〃锛堣繘鐗囧拰鍑虹墖鍏辩敤鍚屼竴濂楀崗璁級
// 鏍规嵁鍗忚锛屼娇鐢ㄥ甫鏁板瓧鍚庣紑鐨勫瓧娈靛悕锛�1-6瀵瑰簲6涓幓鐠冧綅缃級
@@ -120,9 +116,13 @@
@Autowired
public LoadVehicleLogicHandler(
DevicePlcOperationService devicePlcOperationService,
- @Qualifier("deviceGlassInfoService") GlassInfoService glassInfoService) {
+ @Qualifier("deviceGlassInfoService") GlassInfoService glassInfoService,
+ PlcClientFactory plcClientFactory) {
super(devicePlcOperationService);
this.glassInfoService = glassInfoService;
+ this.plcClientFactory = plcClientFactory;
+ // 璁剧疆 PlcClientFactory 鍒板熀绫�
+ this.setPlcClientFactory(plcClientFactory);
}
@Override
@@ -1247,20 +1247,17 @@
}
// 妫�鏌ユ槸鍚︽湁寰呭鐞嗙殑杩涚墖鎴栧嚭鐗囦换鍔�
- if (plcDynamicDataService != null && s7SerializerProvider != null) {
- EnhancedS7Serializer serializer = s7SerializerProvider.getSerializer(deviceConfig);
- if (serializer != null) {
- // 妫�鏌ヨ繘鐗囦换鍔�
- Map<String, Object> mesData = plcDynamicDataService.readPlcData(
- deviceConfig, MES_FIELDS, serializer);
- Integer mesSend = parseInteger(mesData != null ? mesData.get("mesSend") : null);
-
- // 杩涚墖鍜屽嚭鐗囧叡鐢╩esSend瀛楁锛屽彧闇�妫�鏌ヤ竴娆�
- // 濡傛灉鏈夊緟澶勭悊鐨勪换鍔★紝涓嶈缃畃lcRequest锛堢瓑寰呬换鍔″鐞嗭級
- if (mesSend != null && mesSend == 1) {
- log.debug("澶ц溅绌洪棽鐩戞帶: deviceId={}, 妫�娴嬪埌寰呭鐞嗕换鍔★紙mesSend=1锛夛紝涓嶈缃畃lcRequest", deviceId);
- return;
- }
+ PlcClient plcClient = getPlcClient(deviceConfig);
+ if (plcClient != null) {
+ // 妫�鏌ヨ繘鐗囦换鍔�
+ Map<String, Object> mesData = plcClient.readData(MES_FIELDS.toArray(new String[0]));
+ Integer mesSend = parseInteger(mesData != null ? mesData.get("mesSend") : null);
+
+ // 杩涚墖鍜屽嚭鐗囧叡鐢╩esSend瀛楁锛屽彧闇�妫�鏌ヤ竴娆�
+ // 濡傛灉鏈夊緟澶勭悊鐨勪换鍔★紝涓嶈缃畃lcRequest锛堢瓑寰呬换鍔″鐞嗭級
+ if (mesSend != null && mesSend == 1) {
+ log.debug("澶ц溅绌洪棽鐩戞帶: deviceId={}, 妫�娴嬪埌寰呭鐞嗕换鍔★紙mesSend=1锛夛紝涓嶈缃畃lcRequest", deviceId);
+ return;
}
}
@@ -1310,19 +1307,12 @@
Map<String, Object> params,
Map<String, Object> logicParams) {
- if (plcDynamicDataService == null || s7SerializerProvider == null) {
- return DevicePlcVO.OperationResult.builder()
- .success(false)
- .message("PlcDynamicDataService鎴朣7SerializerProvider鏈敞鍏�")
- .build();
- }
-
String deviceId = deviceConfig.getDeviceId();
- EnhancedS7Serializer serializer = s7SerializerProvider.getSerializer(deviceConfig);
- if (serializer == null) {
+ PlcClient plcClient = getPlcClient(deviceConfig);
+ if (plcClient == null) {
return DevicePlcVO.OperationResult.builder()
.success(false)
- .message("鑾峰彇PLC搴忓垪鍖栧櫒澶辫触")
+ .message("鑾峰彇PLC瀹㈡埛绔け璐�")
.build();
}
@@ -1351,8 +1341,7 @@
}
// 璇诲彇MES瀛楁锛堣繘鐗囧拰鍑虹墖鍏辩敤锛�
- Map<String, Object> mesData = plcDynamicDataService.readPlcData(
- deviceConfig, MES_FIELDS, serializer);
+ Map<String, Object> mesData = plcClient.readData(MES_FIELDS.toArray(new String[0]));
if (mesData == null || mesData.isEmpty()) {
log.warn("璇诲彇MES瀛楁澶辫触: deviceId={}, mesData涓虹┖鎴杗ull", deviceId);
return DevicePlcVO.OperationResult.builder()
@@ -1550,7 +1539,7 @@
// 娓呯┖plcRequest锛堣〃绀哄凡鎺ユ敹浠诲姟锛�
Map<String, Object> payload = new HashMap<>();
payload.put("plcRequest", 0);
- plcDynamicDataService.writePlcData(deviceConfig, payload, serializer);
+ plcClient.writeData(payload);
log.info("宸叉竻绌簆lcRequest=0: deviceId={}", deviceId);
// 鏇存柊杞﹁締鐘舵�佷负鎵ц涓�
@@ -1843,13 +1832,9 @@
MesTaskInfo taskInfo,
Map<String, Object> logicParams) {
- if (plcDynamicDataService == null || s7SerializerProvider == null) {
- return;
- }
-
String deviceId = deviceConfig.getDeviceId();
- EnhancedS7Serializer serializer = s7SerializerProvider.getSerializer(deviceConfig);
- if (serializer == null) {
+ PlcClient plcClient = getPlcClient(deviceConfig);
+ if (plcClient == null) {
return;
}
@@ -1899,7 +1884,7 @@
// 浼樺厛妫�鏌ユ槸鍚︽爣璁颁负鐮存崯锛坰tate=8锛�
// 妫�鏌ヤ换鍔′俊鎭腑鏄惁鏍囪浜嗚鐜荤拑涓虹牬鎹�
if (taskInfo.brokenGlassIndices != null && taskInfo.brokenGlassIndices.contains(i)) {
- updateStateIfNeeded(deviceConfig, serializer, stateValues, stateField, 8, taskInfo);
+ updateStateIfNeeded(deviceConfig, plcClient, stateValues, stateField, 8, taskInfo);
log.info("鐜荤拑鏍囪涓虹牬鎹�: deviceId={}, stateField={}, glassIndex={}",
deviceConfig.getDeviceId(), stateField, i);
continue;
@@ -1907,7 +1892,7 @@
// 妫�鏌ヨ秴鏃舵湭瀹屾垚锛坰tate=3锛�
if (elapsed >= state3TimeoutTime && (currentState == null || currentState < 2)) {
- updateStateIfNeeded(deviceConfig, serializer, stateValues, stateField, 3, taskInfo);
+ updateStateIfNeeded(deviceConfig, plcClient, stateValues, stateField, 3, taskInfo);
log.warn("浠诲姟瓒呮椂鏈畬鎴�: deviceId={}, stateField={}, elapsed={}ms, expectedTime={}ms",
deviceConfig.getDeviceId(), stateField, elapsed, state2Time);
continue;
@@ -1916,7 +1901,7 @@
// 姝ｅ父鐘舵�佹洿鏂�
if (elapsed >= state1Time && elapsed < state2Time) {
// state搴旇涓�1锛堜笂杞﹀畬鎴愶級
- boolean stateChanged = updateStateIfNeeded(deviceConfig, serializer, stateValues, stateField, 1, taskInfo);
+ boolean stateChanged = updateStateIfNeeded(deviceConfig, plcClient, stateValues, stateField, 1, taskInfo);
if (stateChanged) {
hasStateOne = true;
currentStepDesc = "鐜荤拑宸蹭笂杞︼紙state=1锛夛紝姝ｅ湪杩愯緭鍒扮洰鏍囦綅缃�";
@@ -1925,7 +1910,7 @@
}
} else if (elapsed >= state2Time) {
// state搴旇涓�2锛堣繍杈撳畬鎴愶級
- boolean stateChanged = updateStateIfNeeded(deviceConfig, serializer, stateValues, stateField, 2, taskInfo);
+ boolean stateChanged = updateStateIfNeeded(deviceConfig, plcClient, stateValues, stateField, 2, taskInfo);
if (stateChanged) {
hasStateTwo = true;
currentStepDesc = "鐜荤拑宸插埌杈剧洰鏍囦綅缃紙state=2锛夛紝绛夊緟MES纭";
@@ -1949,7 +1934,7 @@
// 妫�鏌ユ槸鍚︽墍鏈塻tate閮�>=2锛屽鏋滄槸鍒欑粰MES姹囨姤
if (elapsed >= state2Time && allStatesCompleted(stateValues, glassCount)) {
- reportToMes(deviceConfig, serializer, taskInfo, logicParams);
+ reportToMes(deviceConfig, plcClient, taskInfo, logicParams);
// 璁板綍MES纭寮�濮嬬瓑寰呯殑鏃堕棿锛堝彧璁板綍涓�娆★級
if (taskInfo.mesConfirmStartTime == null) {
taskInfo.mesConfirmStartTime = System.currentTimeMillis();
@@ -1972,7 +1957,7 @@
* @return 鏄惁鍙戠敓浜嗙姸鎬佸彉鍖栵紙浠庨潪鐩爣鐘舵�佸彉涓虹洰鏍囩姸鎬侊級
*/
private boolean updateStateIfNeeded(DeviceConfig deviceConfig,
- EnhancedS7Serializer serializer,
+ PlcClient plcClient,
Map<String, Object> currentStates,
String stateField,
int targetState,
@@ -1995,7 +1980,7 @@
try {
Map<String, Object> payload = new HashMap<>();
payload.put(stateField, targetState);
- plcDynamicDataService.writePlcData(deviceConfig, payload, serializer);
+ plcClient.writeData(payload);
log.info("浠诲姟鐘舵�佸凡鏇存柊鍒癙LC: deviceId={}, stateField={}, currentState={}, targetState={}",
deviceConfig.getDeviceId(), stateField, currentState, targetState);
@@ -2066,7 +2051,7 @@
* 缁橫ES姹囨姤
*/
private void reportToMes(DeviceConfig deviceConfig,
- EnhancedS7Serializer serializer,
+ PlcClient plcClient,
MesTaskInfo taskInfo,
Map<String, Object> logicParams) {
@@ -2074,7 +2059,7 @@
// 璁剧疆姹囨姤瀛�
Map<String, Object> payload = new HashMap<>();
payload.put("plcReport", 1);
- plcDynamicDataService.writePlcData(deviceConfig, payload, serializer);
+ plcClient.writeData(payload);
String taskType = taskInfo.isOutbound ? "鍑虹墖" : "杩涚墖";
String glassIds = taskInfo.glasses.stream()
@@ -2096,21 +2081,14 @@
public DevicePlcVO.OperationResult checkMesConfirm(DeviceConfig deviceConfig,
Map<String, Object> params,
Map<String, Object> logicParams) {
- if (plcDynamicDataService == null || s7SerializerProvider == null) {
- return DevicePlcVO.OperationResult.builder()
- .success(false)
- .message("PlcDynamicDataService鎴朣7SerializerProvider鏈敞鍏�")
- .build();
- }
- EnhancedS7Serializer serializer = s7SerializerProvider.getSerializer(deviceConfig);
- if (serializer == null) {
- return DevicePlcVO.OperationResult.builder()
- .success(false)
- .message("鑾峰彇PLC搴忓垪鍖栧櫒澶辫触")
- .build();
- }
-
String deviceId = deviceConfig.getDeviceId();
+ PlcClient plcClient = getPlcClient(deviceConfig);
+ if (plcClient == null) {
+ return DevicePlcVO.OperationResult.builder()
+ .success(false)
+ .message("鑾峰彇PLC瀹㈡埛绔け璐�")
+ .build();
+ }
MesTaskInfo taskInfo = currentTasks.get(deviceId);
// 濡傛灉娌℃湁浠诲姟璁板綍锛屼紭鍏堝皾璇曡ˉ鍋挎�у湴妫�鏌ヤ竴娆ES浠诲姟锛堥伩鍏嶅洜鏃跺簭闂涓�鐩磏oTask锛�
@@ -2184,7 +2162,7 @@
// 瓒呮椂瑙嗕负浠诲姟澶辫触锛氭竻鐞嗕换鍔＄姸鎬佸苟鍋滄鐩戞帶锛岄伩鍏嶇户缁疮鍔犵瓑寰呮椂闂�
try {
- clearTaskStates(deviceConfig, serializer);
+ clearTaskStates(deviceConfig, plcClient);
} catch (Exception e) {
log.warn("MES纭瓒呮椂鏃舵竻绌轰换鍔＄姸鎬佸け璐�: deviceId={}, error={}", deviceId, e.getMessage());
}
@@ -2200,15 +2178,14 @@
.build();
}
- Object confirmValue = plcDynamicDataService.readPlcField(
- deviceConfig, "mesConfirm", serializer);
- Integer confirm = parseInteger(confirmValue);
+ Map<String, Object> confirmData = plcClient.readData("mesConfirm");
+ Integer confirm = parseInteger(confirmData != null ? confirmData.get("mesConfirm") : null);
boolean completed = confirm != null && confirm == 1;
data.put("completed", completed);
if (completed) {
- // MES宸茬‘璁わ細鏈浜や簰瀹屾垚锛堜笉鍦ㄨ澶囦晶鍒ゆ柇鈥滄槸鍚﹁繕鏈夋洿澶氱幓鐠冣�濓紝鐢变换鍔″紩鎿庣粺涓�缂栨帓锛�
- clearTaskStates(deviceConfig, serializer);
+ // MES宸茬‘璁わ細鏈浜や簰瀹屾垚锛堜笉鍦ㄨ澶囦晶鍒ゆ柇"鏄惁杩樻湁鏇村鐜荤拑"锛岀敱浠诲姟寮曟搸缁熶竴缂栨帓锛�
+ clearTaskStates(deviceConfig, plcClient);
// 璁板綍宸插畬鎴愮殑浠诲姟绛惧悕锛岄伩鍏峂ES鏈浣嶆椂琚噸澶嶆媺璧�
if (taskInfo != null && taskInfo.mesSignature != null) {
@@ -2230,7 +2207,7 @@
// 鎭㈠plcRequest=1锛堝彲浠ユ帴鏀舵柊浠诲姟锛�
Map<String, Object> payload = new HashMap<>();
payload.put("plcRequest", 1);
- plcDynamicDataService.writePlcData(deviceConfig, payload, serializer);
+ plcClient.writeData(payload);
log.info("MES浠诲姟宸茬‘璁ゅ畬鎴�: deviceId={}", deviceConfig.getDeviceId());
String taskType = (taskInfo != null && taskInfo.isOutbound) ? "鍑虹墖" : "杩涚墖";
@@ -2321,20 +2298,27 @@
}
// 绔嬪嵆鍐欏叆PLC鐨剆tate瀛楁
- EnhancedS7Serializer serializer = s7SerializerProvider.getSerializer(deviceConfig);
- if (serializer != null) {
+ PlcClient plcClient = getPlcClient(deviceConfig);
+ if (plcClient != null) {
try {
Map<String, Object> payload = new HashMap<>();
for (Integer index : brokenIndices) {
String stateField = "state" + (index + 1);
payload.put(stateField, 8);
}
- plcDynamicDataService.writePlcData(deviceConfig, payload, serializer);
- log.info("宸叉爣璁扮幓鐠冧负鐮存崯骞跺啓鍏LC: deviceId={}, brokenIndices={}",
- deviceId, brokenIndices);
+ boolean success = plcClient.writeData(payload);
+ if (success) {
+ log.info("宸叉爣璁扮幓鐠冧负鐮存崯骞跺啓鍏LC: deviceId={}, brokenIndices={}",
+ deviceId, brokenIndices);
+ } else {
+ log.error("鍐欏叆鐮存崯鐘舵�佸埌PLC澶辫触: deviceId={}, brokenIndices={}",
+ deviceId, brokenIndices);
+ }
} catch (Exception e) {
log.error("鍐欏叆鐮存崯鐘舵�佸埌PLC澶辫触: deviceId={}, error={}", deviceId, e.getMessage());
}
+ } else {
+ log.error("鑾峰彇PLC瀹㈡埛绔け璐ワ紝鏃犳硶鍐欏叆鐮存崯鐘舵��: deviceId={}", deviceId);
}
return DevicePlcVO.OperationResult.builder()
@@ -2346,7 +2330,7 @@
/**
* 娓呯┖浠诲姟鐘舵��
*/
- private void clearTaskStates(DeviceConfig deviceConfig, EnhancedS7Serializer serializer) {
+ private void clearTaskStates(DeviceConfig deviceConfig, PlcClient plcClient) {
try {
Map<String, Object> payload = new HashMap<>();
// 娓呯┖state1~6
@@ -2355,7 +2339,7 @@
}
// 娓呯┖姹囨姤瀛�
payload.put("plcReport", 0);
- plcDynamicDataService.writePlcData(deviceConfig, payload, serializer);
+ plcClient.writeData(payload);
} catch (Exception e) {
log.error("娓呯┖浠诲姟鐘舵�佸紓甯�: deviceId={}", deviceConfig.getDeviceId(), e);
}
@@ -2498,13 +2482,10 @@
}
private void clearDynamicTaskStates(DeviceConfig deviceConfig) {
- if (plcDynamicDataService == null || s7SerializerProvider == null) {
- return;
- }
try {
- EnhancedS7Serializer serializer = s7SerializerProvider.getSerializer(deviceConfig);
- if (serializer != null) {
- clearTaskStates(deviceConfig, serializer);
+ PlcClient plcClient = getPlcClient(deviceConfig);
+ if (plcClient != null) {
+ clearTaskStates(deviceConfig, plcClient);
}
} catch (Exception e) {
log.warn("娓呯┖澶ц溅state瀛楁澶辫触: deviceId={}, error={}", deviceConfig != null ? deviceConfig.getId() : "null", e.getMessage());
--
Gitblit v1.8.0