From 7f76ee82f932af805ed8cc5f12d9a9c02da00077 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 24 五月 2025 08:25:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/LocTypeDto.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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..6044c53 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,18 @@
}
public LocTypeDto(StaProtocol staProtocol) {
-// if (staProtocol.isHigh() == staProtocol.isLow()) {
-// throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
-// }
- if (staProtocol.getSiteId() == 106){
- this.locType1 = 2; // 楂樺簱浣�
- }else {
- this.locType1 = 1; // 浣庡簱浣�
+ 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