From 06fad1864fbe3aa23edd4fd03e27904219588cfb Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期五, 13 六月 2025 10:33:10 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/model/LocTypeDto.java | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java index ccd52fc..49076c5 100644 --- a/src/main/java/com/zy/common/model/LocTypeDto.java +++ b/src/main/java/com/zy/common/model/LocTypeDto.java @@ -23,14 +23,15 @@ } public LocTypeDto(StaProtocol staProtocol) { - if (staProtocol.isHigh() == staProtocol.isLow()) { - throw new CoolException("plc楂樹綆妫�娴嬪紓甯�"); - } - if (staProtocol.isLow()) { +// if (staProtocol.isHigh() == staProtocol.isLow()) { +// throw new CoolException("plc楂樹綆妫�娴嬪紓甯�"); +// } + if (!staProtocol.isHigh()) { this.locType1 = 1; // 浣庡簱浣� } else { this.locType1 = 2; // 楂樺簱浣� } +// this.locType1 = 1; } /** @@ -38,14 +39,14 @@ */ public static LocTypeDto process(StaProtocol staProtocol) { LocTypeDto dto = new LocTypeDto(); - if (staProtocol.isHigh() == staProtocol.isLow()) { - throw new CoolException("plc楂樹綆妫�娴嬪紓甯�"); - } - if (staProtocol.isLow()) { - dto.setLocType1((short) 1); // 浣庡簱浣� - } else { - dto.setLocType1((short) 2); // 楂樺簱浣� - } +// if (staProtocol.isHigh() == staProtocol.isLow()) { +// throw new CoolException("plc楂樹綆妫�娴嬪紓甯�"); +// } +// if (staProtocol.isLow()) { +// dto.setLocType1((short) 1); // 浣庡簱浣� +// } else { +// dto.setLocType1((short) 2); // 楂樺簱浣� +// } return dto; } -- Gitblit v1.9.1