From f55ba9203e378212ca3be9710b85cb91f04e7ca7 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 15 三月 2023 16:21:44 +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 ccd52fc..4cb4b14 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -22,6 +22,12 @@
     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楂樹綆妫�娴嬪紓甯�");
@@ -38,14 +44,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