From 051d84a86d86fbb71e0292a09a6d03874d4fb0e5 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 25 十一月 2025 13:51:12 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 2 +-
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 2 +-
src/main/java/com/zy/asrs/entity/BasDevp.java | 2 ++
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 6 ++++++
4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 1e3d022..7e1bf84 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -231,6 +231,8 @@
return "浣庡簱浣�";
case 2:
return "楂樺簱浣�";
+ case 5:
+ return "涓簱浣�";
default:
return String.valueOf(this.locType1);
}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index 895c754..1289f62 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -109,6 +109,8 @@
private Short temp3;
private Short temp4;
+ /*蹇冭烦*/
+ private Short heart;
/**
* 寮傚父1
@@ -240,6 +242,10 @@
this.temp1 = temp1;
}
+ public void setHeart(Short heart) {
+ this.heart = heart;
+ }
+
/**
* 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
* I:鍏ュ簱
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 274db59..5a2c3d5 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -119,7 +119,7 @@
basDevp.setLoading(loading?"Y":"N");
basDevp.setInEnable(inEnable?"Y":"N");
basDevp.setOutEnable(outEnable?"Y":"N");
- basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣�,3:涓簱浣峿
+ basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣�,5:涓簱浣峿
basDevp.setLocType2((short) 0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 68b9ebe..6b01e81 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -169,7 +169,7 @@
crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16));
crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
- crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
+ crnProtocol.setHeart(siemensNet.getByteTransform().TransInt16(result.Content, 20));
crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
--
Gitblit v1.9.1