From a6720987358933753d9b90acda9103003cfb37ee Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 13 六月 2025 17:09:57 +0800
Subject: [PATCH] 更新通讯依赖版本为1.5.4，中空大理片，钢化大理片S7，modbus测试完成代码提交
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataMB.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataMB.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataMB.java
index 82f327e..56c3b8c 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataMB.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataMB.java
@@ -1,6 +1,6 @@
package com.mes.s7.entity;
-import com.github.xingshuangs.iot.protocol.common.enums.EDataType;
+import com.github.xingshuangs.iot.common.enums.EDataType;
import com.github.xingshuangs.iot.protocol.s7.serializer.S7Variable;
import lombok.Data;
@@ -13,25 +13,40 @@
public class S7DataMB {
- @S7Variable(address = "DB19.6", type = EDataType.FLOAT32)
+ @S7Variable(address = "DB323.6", type = EDataType.FLOAT32)
private Float speed;
- @S7Variable(address = "DB49.10", type = EDataType.INT32)
- private Integer width;
-
- @S7Variable(address = "DB49.2", type = EDataType.INT32)
+ @S7Variable(address = "DB324.2", type = EDataType.INT32)
private Integer toEdingId;
- @S7Variable(address = "DB49.6", type = EDataType.INT32)
+ @S7Variable(address = "DB324.6", type = EDataType.INT32)
private Integer glassId;
- @S7Variable(address = "DB49.14", type = EDataType.INT32)
+ @S7Variable(address = "DB324.10", type = EDataType.INT32)
+ private Integer width;
+
+ @S7Variable(address = "DB324.14", type = EDataType.INT32)
private Integer height;
- @S7Variable(address = "DB49.18", type = EDataType.INT16)
- private Short thickness;
+ @S7Variable(address = "DB324.18", type = EDataType.UINT16)
+ private Integer thickness;
- @S7Variable(address = "DB49.0.3", type = EDataType.BOOL)
+ @S7Variable(address = "DB324.0.3", type = EDataType.BOOL)
private Boolean mesControl;
+// @S7Variable(address = "DB49.126", type = EDataType.INT32)
+// private Integer toEdingId;
+//
+// @S7Variable(address = "DB49.130", type = EDataType.INT32)
+// private Integer glassId;
+//
+// @S7Variable(address = "DB49.134", type = EDataType.INT32)
+// private Integer width;
+//
+// @S7Variable(address = "DB49.138", type = EDataType.INT32)
+// private Integer height;
+//
+// @S7Variable(address = "DB49.142", type = EDataType.UINT16)
+// private Short thickness;
+
}
--
Gitblit v1.8.0