From 50363ebc3219e7be3515acb716a96e5003e11ae2 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 16 六月 2025 09:03:01 +0800
Subject: [PATCH] 大理片测试地址修改
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/s7/entity/S7DataDLPOne.java | 108 +++++++++++++++++++++++++++---------------------------
1 files changed, 54 insertions(+), 54 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 34c66eb..a99b348 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;
@@ -16,94 +16,94 @@
public class S7DataDLPOne {
- @S7Variable(address = "DB3.3118", type = EDataType.BOOL)
+ @S7Variable(address = "DB3.3118.0", type = EDataType.BOOL)
private Boolean mesControl;
- @S7Variable(address = "DB19.0", type = EDataType.INT16)
- private Short requestMes;
+ @S7Variable(address = "DB7.0", type = EDataType.UINT16)
+ private Integer requestMes;
- @S7Variable(address = "DB19.2", type = EDataType.INT16)
- private Short mesReply;
+ @S7Variable(address = "DB7.2", type = EDataType.UINT16)
+ private Integer mesReply;
- @S7Variable(address = "DB19.140", type = EDataType.INT16)
- private Short from1;
+ @S7Variable(address = "DB7.140", type = EDataType.UINT16)
+ private Integer from1;
- @S7Variable(address = "DB19.142", type = EDataType.INT16)
- private Short from2;
+ @S7Variable(address = "DB7.142", type = EDataType.UINT16)
+ private Integer from2;
- @S7Variable(address = "DB19.144", type = EDataType.INT16)
- private Short from3;
+ @S7Variable(address = "DB7.144", type = EDataType.UINT16)
+ private Integer from3;
- @S7Variable(address = "DB19.146", type = EDataType.INT16)
- private Short from4;
+ @S7Variable(address = "DB7.146", type = EDataType.UINT16)
+ private Integer from4;
- @S7Variable(address = "DB19.148", type = EDataType.INT16)
- private Short from5;
+ @S7Variable(address = "DB7.148", type = EDataType.UINT16)
+ private Integer from5;
- @S7Variable(address = "DB19.150", type = EDataType.INT16)
- private Short from6;
+ @S7Variable(address = "DB7.150", type = EDataType.UINT16)
+ private Integer from6;
- @S7Variable(address = "DB19.152", type = EDataType.INT16)
- private Short to1;
+ @S7Variable(address = "DB7.152", type = EDataType.UINT16)
+ private Integer to1;
- @S7Variable(address = "DB19.154", type = EDataType.INT16)
- private Short to2;
+ @S7Variable(address = "DB7.154", type = EDataType.UINT16)
+ private Integer to2;
- @S7Variable(address = "DB19.156", type = EDataType.INT16)
- private Short to3;
+ @S7Variable(address = "DB7.156", type = EDataType.UINT16)
+ private Integer to3;
- @S7Variable(address = "DB19.158", type = EDataType.INT16)
- private Short to4;
+ @S7Variable(address = "DB7.158", type = EDataType.UINT16)
+ private Integer to4;
- @S7Variable(address = "DB19.160", type = EDataType.INT16)
- private Short to5;
+ @S7Variable(address = "DB7.160", type = EDataType.UINT16)
+ private Integer to5;
- @S7Variable(address = "DB19.162", type = EDataType.INT16)
- private Short to6;
+ @S7Variable(address = "DB7.162", type = EDataType.UINT16)
+ private Integer to6;
- @S7Variable(address = "DB19.164", type = EDataType.INT16)
- private Short state1;
+ @S7Variable(address = "DB7.164", type = EDataType.UINT16)
+ private Integer state1;
- @S7Variable(address = "DB19.166", type = EDataType.INT16)
- private Short state2;
+ @S7Variable(address = "DB7.166", type = EDataType.UINT16)
+ private Integer state2;
- @S7Variable(address = "DB19.168", type = EDataType.INT16)
- private Short state3;
+ @S7Variable(address = "DB7.168", type = EDataType.UINT16)
+ private Integer state3;
- @S7Variable(address = "DB19.170", type = EDataType.INT16)
- private Short state4;
+ @S7Variable(address = "DB7.170", type = EDataType.UINT16)
+ private Integer state4;
- @S7Variable(address = "DB19.172", type = EDataType.INT16)
- private Short state5;
+ @S7Variable(address = "DB7.172", type = EDataType.UINT16)
+ private Integer state5;
- @S7Variable(address = "DB19.174", type = EDataType.INT16)
- private Short state6;
+ @S7Variable(address = "DB7.174", type = EDataType.UINT16)
+ private Integer state6;
- @S7Variable(address = "DB19.1246", type = EDataType.INT16)
- private Short glassCount;
+ @S7Variable(address = "DB7.1246", type = EDataType.UINT16)
+ private Integer glassCount;
- @S7Variable(address = "DB19.8", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB7.8", type = EDataType.STRING, count = 14)
private String id1;
- @S7Variable(address = "DB19.30", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB7.30", type = EDataType.STRING, count = 14)
private String id2;
- @S7Variable(address = "DB19.52", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB7.52", type = EDataType.STRING, count = 14)
private String id3;
- @S7Variable(address = "DB19.74", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB7.74", type = EDataType.STRING, count = 14)
private String id4;
- @S7Variable(address = "DB19.96", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB7.96", type = EDataType.STRING, count = 14)
private String id5;
- @S7Variable(address = "DB19.118", type = EDataType.STRING, count = 22)
+ @S7Variable(address = "DB7.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