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/S7DataMBExtra.java | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataMBExtra.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataMBExtra.java
index 2da8eb1..0178d45 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataMBExtra.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/s7/entity/S7DataMBExtra.java
@@ -1,9 +1,11 @@
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.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* @Author : zhoush
@@ -12,43 +14,45 @@
*/
@Data
@Builder
+@NoArgsConstructor
+@AllArgsConstructor
public class S7DataMBExtra {
- @S7Variable(address = "DB49.0", type = EDataType.INT16)
- private Short requestOne;
+ @S7Variable(address = "DB49.0", type = EDataType.UINT16)
+ private Integer requestOne;
- @S7Variable(address = "DB49.46", type = EDataType.INT16)
- private Short widthOne;
+ @S7Variable(address = "DB49.46", type = EDataType.UINT16)
+ private Integer widthOne;
- @S7Variable(address = "DB49.48", type = EDataType.INT16)
- private Short heightOne;
+ @S7Variable(address = "DB49.48", type = EDataType.UINT16)
+ private Integer heightOne;
- @S7Variable(address = "DB49.50", type = EDataType.INT16)
- private Short thicknessOne;
+ @S7Variable(address = "DB49.50", type = EDataType.UINT16)
+ private Integer thicknessOne;
- @S7Variable(address = "DB49.52", type = EDataType.INT16)
- private Short requestTwo;
+ @S7Variable(address = "DB49.52", type = EDataType.UINT16)
+ private Integer requestTwo;
- @S7Variable(address = "DB49.98", type = EDataType.INT16)
- private Short widthTwo;
+ @S7Variable(address = "DB49.98", type = EDataType.UINT16)
+ private Integer widthTwo;
- @S7Variable(address = "DB49.100", type = EDataType.INT16)
- private Short heightTwo;
+ @S7Variable(address = "DB49.100", type = EDataType.UINT16)
+ private Integer heightTwo;
- @S7Variable(address = "DB49.102", type = EDataType.INT16)
- private Short thicknessTwo;
+ @S7Variable(address = "DB49.102", type = EDataType.UINT16)
+ private Integer thicknessTwo;
- @S7Variable(address = "DB49.2", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB49.2", type = EDataType.STRING, count = 14)
private String plcGlassIdOne;
- @S7Variable(address = "DB49.24", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB49.24", type = EDataType.STRING, count = 14)
private String mesGlassIdOne;
- @S7Variable(address = "DB49.54", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB49.54", type = EDataType.STRING, count = 14)
private String plcGlassIdTwo;
- @S7Variable(address = "DB49.76", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB49.76", type = EDataType.STRING, count = 14)
private String mesglassIdTwo;
}
--
Gitblit v1.8.0