From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001
From: ynhfasrs <ynhfasrs@qq.com>
Date: 星期五, 27 六月 2025 14:23:37 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/model/LocTypeDto.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index e768cad..7506895 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -32,12 +32,15 @@
     }
 
     public LocTypeDto(StaProtocol staProtocol) {
-        if (staProtocol.locType.id.shortValue()!=1 && staProtocol.locType.id.shortValue()!=2 && staProtocol.locType.id.shortValue()!=3) {
+        if (staProtocol.isHigh() == staProtocol.isLow()) {
             throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
         }
-        this.locType1 = staProtocol.locType.id.shortValue();
+        if (staProtocol.isLow()) {
+            this.locType1 = 1; // 浣庡簱浣�
+        } else {
+            this.locType1 = 2; // 楂樺簱浣�
+        }
     }
-
     /**
      * 搴撲綅绫诲瀷瑙f瀽
      */

--
Gitblit v1.9.1