From 7400211f1ceecea0048ff3f5adfeeb8fe975bc7a Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 19 三月 2025 11:01:53 +0800
Subject: [PATCH] #初始化地图
---
src/main/java/com/zy/common/model/LocTypeDto.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 76c51eb..4ca1df1 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -19,18 +19,31 @@
// 杞婚噸绫诲瀷{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 {
+ }else {
this.locType1 = 2; // 楂樺簱浣�
}
+// if (staProtocol.isHigh() == staProtocol.isLow()) {
+// throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
+// }
+// if (staProtocol.getSiteId() == 106 || staProtocol.getSiteId() == 159){
+// this.locType1 = 2; // 楂樺簱浣�
+// }else {
+// this.locType1 = 1; // 浣庡簱浣�
+// }
}
/**
--
Gitblit v1.9.1