From 849442e4f63a5fd7ae154ef6bc77c967a82f40b8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 26 六月 2025 08:46:01 +0800
Subject: [PATCH] 删除改S7通讯时注释的原opc代码
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcEdgTask.java | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcEdgTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcEdgTask.java
index 286fab4..5e10814 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcEdgTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcEdgTask.java
@@ -51,8 +51,6 @@
private void startEdgTaskChild(String cell) throws Exception {
S7DataMBExtra s7DataMBExtra = s7SerializerMBExtra.read(S7DataMBExtra.class);
log.info("MB04璇诲彇鏁版嵁{}", s7DataMBExtra);
-// ReadWriteEntity request = miloService.readFromOpcUa("MB04.MB04.request" + cell);
-// if (null == request || "0".equals(request.getValue() + "")) {
String request = "";
String glassIdEntity = "";
if ("01".equals(cell)) {
@@ -66,23 +64,14 @@
log.info("鏈敹鍒扮幓鐠冭姹傦紝缁撴潫鏈浠诲姟");
return;
}
-// ReadWriteEntity glassIdEntity = miloService.readFromOpcUa("MB04.MB04.plc_glass_id_" + cell);
-// if (null == glassIdEntity || StringUtils.isEmpty(glassIdEntity.getValue() + "")) {
if (null == glassIdEntity || StringUtils.isEmpty(glassIdEntity)) {
log.info("鏈夎姹備絾鐜荤拑id涓虹┖锛岀粨鏉熸湰娆′换鍔�");
return;
}
-// String glassId = glassIdEntity.getValue() + "";
String glassId = glassIdEntity;
log.info("鑾峰彇鍒皗}绾跨殑鐜荤拑id:{}", cell, glassId);
GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId).last("limit 1"));
-// List<ReadWriteEntity> ualist = new ArrayList<>();
-// ualist.add(generateReadWriteEntity("MB04.MB04.width" + cell, (int) Math.max(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10)));
-// ualist.add(generateReadWriteEntity("MB04.MB04.height" + cell, (int) Math.min(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10)));
-// ualist.add(generateReadWriteEntity("MB04.MB04.thickness" + cell, (int) glassInfo.getThickness() * 10));
-// miloService.writeToOpcWord(ualist);
-// miloService.writeToOpcUa(generateReadWriteEntity("MB04.MB04.mes_glass_Id_" + cell, glassId));
log.info("{}绾垮彂閫佸昂瀵镐俊鎭锛歿}锛岄珮锛歿}锛屽帤搴︼細{}", cell, Math.max(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10), Math.min(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10), glassInfo.getThickness() * 10);
if ("01".equals(cell)) {
s7SerializerMBExtra.write(
--
Gitblit v1.8.0