From f25bbbc769f14d18c39f11ba0e395a9f09431148 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期日, 11 五月 2025 12:13:06 +0800
Subject: [PATCH] #调试

---
 src/main/java/com/zy/common/model/LocTypeDto.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 92ba2b2..4ca1df1 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -19,6 +19,8 @@
     // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
     private Short locType3;
 
+    private Integer siteId;
+
     public LocTypeDto() {
     }
 
@@ -29,14 +31,19 @@
     }
 
     public LocTypeDto(StaProtocol staProtocol) {
+        if (staProtocol.isLow()) {
+            this.locType1 = 1; // 浣庡簱浣�
+        }else {
+            this.locType1 = 2; // 楂樺簱浣�
+        }
 //        if (staProtocol.isHigh() == staProtocol.isLow()) {
 //            throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
 //        }
-        if (staProtocol.getSiteId() == 106){
-            this.locType1 = 2; // 楂樺簱浣�
-        }else {
-            this.locType1 = 1; // 浣庡簱浣�
-        }
+//        if (staProtocol.getSiteId() == 106 || staProtocol.getSiteId() == 159){
+//            this.locType1 = 2; // 楂樺簱浣�
+//        }else {
+//            this.locType1 = 1; // 浣庡簱浣�
+//        }
     }
 
     /**

--
Gitblit v1.9.1