From 186432933336d96c19402c5aee61064df4a7390a Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 16 七月 2025 16:43:09 +0800
Subject: [PATCH] 完成调试
---
src/main/java/com/zy/common/model/LocTypeDto.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index bf782d9..6044c53 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -19,17 +19,29 @@
// 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
private Short locType3;
+ private Integer siteId;
+
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 {
+ if (staProtocol.isHigh() && !staProtocol.isLow()) {
+ this.locType1 = 2;
+ } else if (!staProtocol.isHigh() && staProtocol.isLow()) {
+ this.locType1 = 1;
+ } else {
+ throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
+ }
+// if (staProtocol.getSiteId() == 106 || staProtocol.getSiteId() == 159){
// this.locType1 = 2; // 楂樺簱浣�
+// }else {
+// this.locType1 = 1; // 浣庡簱浣�
// }
}
--
Gitblit v1.9.1