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/S7DataZKDLPOne.java | 59 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPOne.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPOne.java
index ade57a7..acea6fd 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPOne.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKDLPOne.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;
@@ -16,88 +16,85 @@
public class S7DataZKDLPOne {
- @S7Variable(address = "DB3.8", type = EDataType.BOOL)
+ @S7Variable(address = "DB3.2992.0", type = EDataType.BOOL)
private Boolean mesControl;
- @S7Variable(address = "DB19.0", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.0", type = EDataType.UINT16)
private Integer requestMes;
- @S7Variable(address = "DB19.2", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.2", type = EDataType.UINT16)
private Integer mesReply;
- @S7Variable(address = "DB19.140", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.140", type = EDataType.UINT16)
private Integer from1;
- @S7Variable(address = "DB19.142", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.142", type = EDataType.UINT16)
private Integer from2;
- @S7Variable(address = "DB19.144", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.144", type = EDataType.UINT16)
private Integer from3;
- @S7Variable(address = "DB19.146", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.146", type = EDataType.UINT16)
private Integer from4;
- @S7Variable(address = "DB19.148", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.148", type = EDataType.UINT16)
private Integer from5;
- @S7Variable(address = "DB19.150", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.150", type = EDataType.UINT16)
private Integer from6;
- @S7Variable(address = "DB19.152", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.152", type = EDataType.UINT16)
private Integer to1;
- @S7Variable(address = "DB19.154", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.154", type = EDataType.UINT16)
private Integer to2;
- @S7Variable(address = "DB19.156", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.156", type = EDataType.UINT16)
private Integer to3;
- @S7Variable(address = "DB19.158", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.158", type = EDataType.UINT16)
private Integer to4;
- @S7Variable(address = "DB19.160", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.160", type = EDataType.UINT16)
private Integer to5;
- @S7Variable(address = "DB19.162", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.162", type = EDataType.UINT16)
private Integer to6;
- @S7Variable(address = "DB19.164", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.164", type = EDataType.UINT16)
private Integer state1;
- @S7Variable(address = "DB19.166", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.166", type = EDataType.UINT16)
private Integer state2;
- @S7Variable(address = "DB19.168", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.168", type = EDataType.UINT16)
private Integer state3;
- @S7Variable(address = "DB19.170", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.170", type = EDataType.UINT16)
private Integer state4;
- @S7Variable(address = "DB19.172", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.172", type = EDataType.UINT16)
private Integer state5;
- @S7Variable(address = "DB19.174", type = EDataType.UINT16)
+ @S7Variable(address = "DB7.174", type = EDataType.UINT16)
private Integer state6;
- @S7Variable(address = "DB19.1246", type = EDataType.UINT16)
- private Integer glassCount;
-
- @S7Variable(address = "DB19.8", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB7.8", type = EDataType.STRING, count = 14)
private String id1;
- @S7Variable(address = "DB19.30", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB7.30", type = EDataType.STRING, count = 14)
private String id2;
- @S7Variable(address = "DB19.52", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB7.52", type = EDataType.STRING, count = 14)
private String id3;
- @S7Variable(address = "DB19.74", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB7.74", type = EDataType.STRING, count = 14)
private String id4;
- @S7Variable(address = "DB19.96", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB7.96", type = EDataType.STRING, count = 14)
private String id5;
- @S7Variable(address = "DB19.118", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB7.118", type = EDataType.STRING, count = 14)
private String id6;
@S7Variable(address = "MW1002", type = EDataType.UINT16)
--
Gitblit v1.8.0