From d022fc437728829a65b74a53048a84ea17245917 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期三, 05 一月 2022 13:34:52 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 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 d804f6e..a47b9c0 100644 --- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java @@ -108,7 +108,7 @@ */ private Short alarm1; - private boolean[] temp1; + private Short temp1; private CrnTemp1 crnTemp1; @@ -235,21 +235,12 @@ this.status = CrnStatusType.get(type).id.shortValue(); } - public void setTemp1(boolean[] temp1) { + public Short getTemp1() { + return temp1; + } + + public void setTemp1(Short temp1) { this.temp1 = temp1; - this.crnTemp1 = new CrnTemp1(); - this.crnTemp1.liftLimitSwitchErr = temp1[0]; - this.crnTemp1.liftBrakeErr = temp1[1]; - this.crnTemp1.liftDiastimeterFau = temp1[2]; - this.crnTemp1.stop = temp1[3]; - this.crnTemp1.warn = temp1[4]; - this.crnTemp1.overHighErr = temp1[5]; - this.crnTemp1.leftOverWidthErr = temp1[6]; - this.crnTemp1.rightOverWidthErr = temp1[7]; - this.crnTemp1.leftOverLenErr = temp1[8]; - this.crnTemp1.rightOverLenErr = temp1[9]; - this.crnTemp1.pakinThenLoadedErr = temp1[10]; - this.crnTemp1.pakOutThenNoneErr = temp1[11]; } /** -- Gitblit v1.9.1