From 4cfee88fa7fad14de4908e1776ebd044d0c4e87f Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 09 八月 2024 16:37:08 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/model/LocTypeDto.java |   23 +++++++++++++++--------
 1 files changed, 15 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 76c51eb..20382a2 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -22,15 +22,22 @@
     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; // 楂樺簱浣�
+//        }
+        this.locType1 = 1;
     }
 
     /**

--
Gitblit v1.9.1