From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001
From: ynhfasrs <ynhfasrs@qq.com>
Date: 星期五, 27 六月 2025 14:23:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 da02598..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,7 +54,7 @@
*/
public Short status;
- public Short alarm;
+ public Short alarm = 0;
/**
* 鐘舵�佹灇涓�
@@ -308,6 +308,11 @@
//鎸囦护ID
private Integer commandId;
+ /**
+ * 鏃ュ織閲囬泦鏃堕棿
+ */
+ private Long deviceDataLog = System.currentTimeMillis();
+
public void setMode(Short mode) {
this.mode = mode;
this.modeType = CrnModeType.get(mode);
@@ -434,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