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/CacheVerticalGlassModule/src/main/java/com/mes/s7/entity/S7DataDLPOne.java | 106 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/s7/entity/S7DataDLPOne.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/s7/entity/S7DataDLPOne.java
index 0d4ee2a..d5718aa 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/s7/entity/S7DataDLPOne.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/s7/entity/S7DataDLPOne.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;
@@ -19,91 +19,91 @@
@S7Variable(address = "DB3.3118.0", type = EDataType.BOOL)
private Boolean mesControl;
- @S7Variable(address = "DB19.0", type = EDataType.INT16)
- private Short requestMes;
+ @S7Variable(address = "DB8.0", type = EDataType.UINT16)
+ private Integer requestMes;
- @S7Variable(address = "DB19.2", type = EDataType.INT16)
- private Short mesReply;
+ @S7Variable(address = "DB8.2", type = EDataType.UINT16)
+ private Integer mesReply;
- @S7Variable(address = "DB19.140", type = EDataType.INT16)
- private Short from1;
+ @S7Variable(address = "DB8.140", type = EDataType.UINT16)
+ private Integer from1;
- @S7Variable(address = "DB19.142", type = EDataType.INT16)
- private Short from2;
+ @S7Variable(address = "DB8.142", type = EDataType.UINT16)
+ private Integer from2;
- @S7Variable(address = "DB19.144", type = EDataType.INT16)
- private Short from3;
+ @S7Variable(address = "DB8.144", type = EDataType.UINT16)
+ private Integer from3;
- @S7Variable(address = "DB19.146", type = EDataType.INT16)
- private Short from4;
+ @S7Variable(address = "DB8.146", type = EDataType.UINT16)
+ private Integer from4;
- @S7Variable(address = "DB19.148", type = EDataType.INT16)
- private Short from5;
+ @S7Variable(address = "DB8.148", type = EDataType.UINT16)
+ private Integer from5;
- @S7Variable(address = "DB19.150", type = EDataType.INT16)
- private Short from6;
+ @S7Variable(address = "DB8.150", type = EDataType.UINT16)
+ private Integer from6;
- @S7Variable(address = "DB19.152", type = EDataType.INT16)
- private Short to1;
+ @S7Variable(address = "DB8.152", type = EDataType.UINT16)
+ private Integer to1;
- @S7Variable(address = "DB19.154", type = EDataType.INT16)
- private Short to2;
+ @S7Variable(address = "DB8.154", type = EDataType.UINT16)
+ private Integer to2;
- @S7Variable(address = "DB19.156", type = EDataType.INT16)
- private Short to3;
+ @S7Variable(address = "DB8.156", type = EDataType.UINT16)
+ private Integer to3;
- @S7Variable(address = "DB19.158", type = EDataType.INT16)
- private Short to4;
+ @S7Variable(address = "DB8.158", type = EDataType.UINT16)
+ private Integer to4;
- @S7Variable(address = "DB19.160", type = EDataType.INT16)
- private Short to5;
+ @S7Variable(address = "DB8.160", type = EDataType.UINT16)
+ private Integer to5;
- @S7Variable(address = "DB19.162", type = EDataType.INT16)
- private Short to6;
+ @S7Variable(address = "DB8.162", type = EDataType.UINT16)
+ private Integer to6;
- @S7Variable(address = "DB19.164", type = EDataType.INT16)
- private Short state1;
+ @S7Variable(address = "DB8.164", type = EDataType.UINT16)
+ private Integer state1;
- @S7Variable(address = "DB19.166", type = EDataType.INT16)
- private Short state2;
+ @S7Variable(address = "DB8.166", type = EDataType.UINT16)
+ private Integer state2;
- @S7Variable(address = "DB19.168", type = EDataType.INT16)
- private Short state3;
+ @S7Variable(address = "DB8.168", type = EDataType.UINT16)
+ private Integer state3;
- @S7Variable(address = "DB19.170", type = EDataType.INT16)
- private Short state4;
+ @S7Variable(address = "DB8.170", type = EDataType.UINT16)
+ private Integer state4;
- @S7Variable(address = "DB19.172", type = EDataType.INT16)
- private Short state5;
+ @S7Variable(address = "DB8.172", type = EDataType.UINT16)
+ private Integer state5;
- @S7Variable(address = "DB19.174", type = EDataType.INT16)
- private Short state6;
+ @S7Variable(address = "DB8.174", type = EDataType.UINT16)
+ private Integer state6;
- @S7Variable(address = "DB19.1246", type = EDataType.INT16)
- private Short glassCount;
+ @S7Variable(address = "DB8.1246", type = EDataType.UINT16)
+ private Integer glassCount;
- @S7Variable(address = "DB19.8", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB8.8", type = EDataType.STRING, count = 14)
private String id1;
- @S7Variable(address = "DB19.30", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB8.30", type = EDataType.STRING, count = 14)
private String id2;
- @S7Variable(address = "DB19.52", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB8.52", type = EDataType.STRING, count = 14)
private String id3;
- @S7Variable(address = "DB19.74", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB8.74", type = EDataType.STRING, count = 14)
private String id4;
- @S7Variable(address = "DB19.96", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB8.96", type = EDataType.STRING, count = 14)
private String id5;
- @S7Variable(address = "DB19.118", type = EDataType.STRING, count = 20)
+ @S7Variable(address = "DB8.118", type = EDataType.STRING, count = 14)
private String id6;
- @S7Variable(address = "MW1002", type = EDataType.INT16)
- private Short alramSignal;
+ @S7Variable(address = "MW1002", type = EDataType.UINT16)
+ private Integer alarmSignal;
- public List<Short> getStates() {
+ public List<Integer> getStates() {
return Arrays.asList(state1, state2, state3, state4, state5, state6);
}
@@ -111,7 +111,7 @@
return Arrays.asList(id1, id2, id3, id4, id5, id6);
}
- public List<Short> getTos() {
+ public List<Integer> getTos() {
return Arrays.asList(to1, to2, to3, to4, to5, to6);
}
--
Gitblit v1.8.0