From 0cd7adb27af908b7d0ce0db697f9567d77bcbeb2 Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期五, 30 八月 2024 13:44:56 +0800 Subject: [PATCH] 对照协议调整 --- src/main/java/com/zy/common/model/LocTypeDto.java | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java index bf782d9..4cb4b14 100644 --- a/src/main/java/com/zy/common/model/LocTypeDto.java +++ b/src/main/java/com/zy/common/model/LocTypeDto.java @@ -22,15 +22,21 @@ public LocTypeDto() { } + public LocTypeDto(Short locType1, Short locType2, Short locType3) { + this.locType1 = locType1; + this.locType2 = locType2; + this.locType3 = locType3; + } + public LocTypeDto(StaProtocol staProtocol) { -// if (staProtocol.isHigh() == staProtocol.isLow()) { -// throw new CoolException("plc楂樹綆妫�娴嬪紓甯�"); -// } -// if (staProtocol.isLow()) { -// this.locType1 = 1; // 浣庡簱浣� -// } else { -// this.locType1 = 2; // 楂樺簱浣� -// } + if (staProtocol.isHigh() == staProtocol.isLow()) { + throw new CoolException("plc楂樹綆妫�娴嬪紓甯�"); + } + if (staProtocol.isLow()) { + this.locType1 = 1; // 浣庡簱浣� + } else { + this.locType1 = 2; // 楂樺簱浣� + } } /** -- Gitblit v1.9.1