From ab389a5a6b329b15a655340ba7b87bce7fd7871d Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 24 十二月 2025 17:16:19 +0800
Subject: [PATCH] 添加新增设备自动生成编码
---
mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/transfer/handler/HorizontalTransferLogicHandler.java | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/transfer/handler/HorizontalTransferLogicHandler.java b/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/transfer/handler/HorizontalTransferLogicHandler.java
index e1e177d..9db7993 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/transfer/handler/HorizontalTransferLogicHandler.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/workstation/transfer/handler/HorizontalTransferLogicHandler.java
@@ -9,9 +9,9 @@
import com.mes.device.vo.DevicePlcVO;
import com.mes.interaction.workstation.base.WorkstationBaseHandler;
import com.mes.interaction.workstation.config.WorkstationLogicConfig;
-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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -32,9 +32,8 @@
@Component
public class HorizontalTransferLogicHandler extends WorkstationBaseHandler {
- private final PlcDynamicDataService plcDynamicDataService;
private final GlassInfoService glassInfoService;
- private final S7SerializerProvider s7SerializerProvider;
+ private final PlcClientFactory plcClientFactory;
@Autowired(required = false)
private DeviceGlassInfoMapper glassInfoMapper;
@@ -57,13 +56,13 @@
@Autowired
public HorizontalTransferLogicHandler(DevicePlcOperationService devicePlcOperationService,
- PlcDynamicDataService plcDynamicDataService,
@Qualifier("deviceGlassInfoService") GlassInfoService glassInfoService,
- S7SerializerProvider s7SerializerProvider) {
+ PlcClientFactory plcClientFactory) {
super(devicePlcOperationService);
- this.plcDynamicDataService = plcDynamicDataService;
this.glassInfoService = glassInfoService;
- this.s7SerializerProvider = s7SerializerProvider;
+ this.plcClientFactory = plcClientFactory;
+ // 璁剧疆 PlcClientFactory 鍒板熀绫�
+ this.setPlcClientFactory(plcClientFactory);
}
@Override
@@ -116,10 +115,10 @@
Map<String, Object> params) {
String deviceId = deviceConfig.getDeviceId();
- EnhancedS7Serializer serializer = s7SerializerProvider.getSerializer(deviceConfig);
- if (serializer == null) {
+ PlcClient plcClient = getPlcClient(deviceConfig);
+ if (plcClient == null) {
return buildResult(deviceConfig, "checkAndProcess", false,
- "鑾峰彇PLC搴忓垪鍖栧櫒澶辫触");
+ "鑾峰彇PLC瀹㈡埛绔け璐�");
}
try {
@@ -184,7 +183,7 @@
// 6. 鍐欏叆PLC锛堝皾璇曚粠浠诲姟鍙傛暟涓幏鍙栧崸杞珛缂栧彿锛�
DevicePlcVO.OperationResult writeResult = writeBatchToPlc(
- deviceConfig, batch, serializer, logicParams, params);
+ deviceConfig, batch, plcClient, logicParams, params);
if (!Boolean.TRUE.equals(writeResult.getSuccess())) {
return writeResult;
@@ -194,16 +193,15 @@
try {
if (params != null) {
Object ctxObj = params.get("_taskContext");
- if (ctxObj instanceof com.mes.task.model.TaskExecutionContext) {
- com.mes.task.model.TaskExecutionContext ctx =
- (com.mes.task.model.TaskExecutionContext) ctxObj;
+ if (ctxObj instanceof TaskExecutionContext) {
+ TaskExecutionContext ctx = (TaskExecutionContext) ctxObj;
List<String> batchGlassIds = batch.stream()
.map(GlassInfo::getGlassId)
.filter(Objects::nonNull)
.collect(Collectors.toList());
if (!batchGlassIds.isEmpty()) {
ctx.getSharedData().put("transferReadyGlassIds",
- new java.util.ArrayList<>(batchGlassIds));
+ new ArrayList<>(batchGlassIds));
log.info("鍗ц浆绔嬪凡杈撳嚭鎵规鐜荤拑鍒颁换鍔′笂涓嬫枃: deviceId={}, glassIds={}",
deviceConfig.getId(), batchGlassIds);
}
@@ -401,7 +399,7 @@
private DevicePlcVO.OperationResult writeBatchToPlc(
DeviceConfig deviceConfig,
List<GlassInfo> batch,
- EnhancedS7Serializer serializer,
+ PlcClient plcClient,
Map<String, Object> logicParams,
Map<String, Object> params) {
@@ -448,7 +446,7 @@
payload.put("plcRequest", 1);
try {
- plcDynamicDataService.writePlcData(deviceConfig, payload, serializer);
+ plcClient.writeData(payload);
log.info("鎵规宸插啓鍏LC: deviceId={}, glassCount={}, inPosition={}",
deviceConfig.getId(), count, inPosition);
return buildResult(deviceConfig, "writeBatchToPlc", true,
@@ -540,9 +538,9 @@
*/
private DevicePlcVO.OperationResult handleClearPlc(DeviceConfig deviceConfig) {
try {
- EnhancedS7Serializer serializer = s7SerializerProvider.getSerializer(deviceConfig);
- if (serializer == null) {
- return buildResult(deviceConfig, "clearPlc", false, "鑾峰彇PLC搴忓垪鍖栧櫒澶辫触");
+ PlcClient plcClient = getPlcClient(deviceConfig);
+ if (plcClient == null) {
+ return buildResult(deviceConfig, "clearPlc", false, "鑾峰彇PLC瀹㈡埛绔け璐�");
}
Map<String, Object> payload = new HashMap<>();
@@ -554,7 +552,7 @@
payload.put("plcRequest", 0);
payload.put("inPosition", 0);
- plcDynamicDataService.writePlcData(deviceConfig, payload, serializer);
+ plcClient.writeData(payload);
log.info("鍗ц浆绔嬩富浣撴竻绌篜LC瀛楁瀹屾垚: deviceId={}", deviceConfig.getId());
return buildResult(deviceConfig, "clearPlc", true, "宸叉竻绌哄崸杞珛涓讳綋PLC瀛楁");
} catch (Exception e) {
--
Gitblit v1.8.0