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/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPTwo.java | 74 +++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 28 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPTwo.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPTwo.java
index b796381..48c501e 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPTwo.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPTwo.java
@@ -1,8 +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.Data;
+
+import java.util.Arrays;
+import java.util.List;
/**
* @Author : zhoush
@@ -13,86 +16,101 @@
public class S7DataZKDLPTwo {
- @S7Variable(address = "DB3.8", type = EDataType.BOOL)
+ @S7Variable(address = "DB3.2992.0", type = EDataType.BOOL)
private Boolean mesControl;
- @S7Variable(address = "DB19.4", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.4", type = EDataType.UINT16)
private Integer requestMes;
- @S7Variable(address = "DB19.6", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.6", type = EDataType.UINT16)
private Integer mesReply;
- @S7Variable(address = "DB19.308", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.308", type = EDataType.UINT16)
private Integer from1;
- @S7Variable(address = "DB19.310", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.310", type = EDataType.UINT16)
private Integer from2;
- @S7Variable(address = "DB19.312", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.312", type = EDataType.UINT16)
private Integer from3;
- @S7Variable(address = "DB19.314", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.314", type = EDataType.UINT16)
private Integer from4;
- @S7Variable(address = "DB19.316", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.316", type = EDataType.UINT16)
private Integer from5;
- @S7Variable(address = "DB19.318", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.318", type = EDataType.UINT16)
private Integer from6;
- @S7Variable(address = "DB19.320", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.320", type = EDataType.UINT16)
private Integer to1;
- @S7Variable(address = "DB19.322", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.322", type = EDataType.UINT16)
private Integer to2;
- @S7Variable(address = "DB19.324", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.324", type = EDataType.UINT16)
private Integer to3;
- @S7Variable(address = "DB19.326", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.326", type = EDataType.UINT16)
private Integer to4;
- @S7Variable(address = "DB19.328", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.328", type = EDataType.UINT16)
private Integer to5;
- @S7Variable(address = "DB19.330", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.330", type = EDataType.UINT16)
private Integer to6;
- @S7Variable(address = "DB19.332", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.332", type = EDataType.UINT16)
private Integer state1;
- @S7Variable(address = "DB19.334", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.334", type = EDataType.UINT16)
private Integer state2;
- @S7Variable(address = "DB19.336", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.336", type = EDataType.UINT16)
private Integer state3;
- @S7Variable(address = "DB19.338", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.338", type = EDataType.UINT16)
private Integer state4;
- @S7Variable(address = "DB19.340", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.340", type = EDataType.UINT16)
private Integer state5;
- @S7Variable(address = "DB19.342", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.342", type = EDataType.UINT16)
private Integer state6;
- @S7Variable(address = "DB19.176", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB7.176", type = EDataType.STRING, count = 14)
private String id1;
- @S7Variable(address = "DB19.198", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB7.198", type = EDataType.STRING, count = 14)
private String id2;
- @S7Variable(address = "DB19.220", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB7.220", type = EDataType.STRING, count = 14)
private String id3;
- @S7Variable(address = "DB19.242", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB7.242", type = EDataType.STRING, count = 14)
private String id4;
- @S7Variable(address = "DB19.264", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB7.264", type = EDataType.STRING, count = 14)
private String id5;
- @S7Variable(address = "DB19.286", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB7.286", type = EDataType.STRING, count = 14)
private String id6;
+ public List<Integer> getStates() {
+ return Arrays.asList(state1, state2, state3, state4, state5, state6);
+ }
+
+ public List<String> getIds() {
+ return Arrays.asList(id1, id2, id3, id4, id5, id6);
+ }
+
+ public List<Integer> getTos() {
+ return Arrays.asList(to1, to2, to3, to4, to5, to6);
+ }
+
+ public List<Integer> getFroms() {
+ return Arrays.asList(from1, from2, from3, from4, from5, from6);
+ }
}
--
Gitblit v1.8.0