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/TemperingGlassModule/src/main/java/com/mes/s7/entity/S7DataGHOne.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/s7/entity/S7DataGHOne.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/s7/entity/S7DataGHOne.java
index a1f848c..66ba975 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/s7/entity/S7DataGHOne.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/s7/entity/S7DataGHOne.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;
import java.util.Arrays;
import java.util.List;
@@ -15,22 +17,24 @@
*/
@Data
@Builder
+@NoArgsConstructor
+@AllArgsConstructor
public class S7DataGHOne {
- @S7Variable(address = "DB99.0", type = EDataType.INT16)
- private Short requestInTempering;
+ @S7Variable(address = "DB99.0", type = EDataType.UINT16)
+ private Integer requestInTempering;
- @S7Variable(address = "DB99.2", type = EDataType.INT16)
- private Short requestTemperingId;
+ @S7Variable(address = "DB99.2", type = EDataType.UINT16)
+ private Integer requestTemperingId;
- @S7Variable(address = "DB99.4", type = EDataType.INT16)
- private Short placedNumber;
+ @S7Variable(address = "DB99.4", type = EDataType.UINT16)
+ private Integer placedNumber;
- @S7Variable(address = "DB99.6", type = EDataType.INT16)
- private Short responseInTempering;
+ @S7Variable(address = "DB99.6", type = EDataType.UINT16)
+ private Integer responseInTempering;
- @S7Variable(address = "DB99.8", type = EDataType.INT16)
- private Short loadTemperingId;
+ @S7Variable(address = "DB99.8", type = EDataType.UINT16)
+ private Integer loadTemperingId;
}
--
Gitblit v1.8.0