From e9152bae00b01fc80000d44f726f337084215748 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 21 五月 2025 10:19:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
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 6fbaa43..7e869bc 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -54,6 +54,8 @@
*/
public Short status;
+ public Short alarm = 0;
+
/**
* 鐘舵�佹灇涓�
*/
@@ -223,22 +225,22 @@
/**
* 鍫嗗灈鏈哄瀭鐩存晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
*/
- private Integer alarm1;
+ private Integer alarm1 = 0;
/**
* 鍫嗗灈鏈烘按骞虫晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
*/
- private Integer alarm2;
+ private Integer alarm2 = 0;;
/**
* 鍫嗗灈鏈鸿揣鍙夋晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
*/
- private Integer alarm3;
+ private Integer alarm3 = 0;;
/**
* 鍫嗗灈鏈虹姸鎬佹晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
*/
- private Integer alarm4;
+ private Integer alarm4 = 0;;
/**
* 寮傚父1
@@ -302,6 +304,14 @@
* 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
*/
public Float yDuration = 0F;
+
+ //鎸囦护ID
+ private Integer commandId;
+
+ /**
+ * 鏃ュ織閲囬泦鏃堕棿
+ */
+ private Long deviceDataLog = System.currentTimeMillis();
public void setMode(Short mode) {
this.mode = mode;
@@ -429,7 +439,7 @@
public BasCrnp toSqlModel(BasCrnp basCrnp){
- basCrnp.setCrnErr(alarm1.longValue());
+ basCrnp.setCrnErr(alarm.longValue());
basCrnp.setWrkNo(taskNo.intValue());
return basCrnp;
}
--
Gitblit v1.9.1