From 2de4173f02cc9525949eb20e60595019b9be9a3f Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期一, 09 六月 2025 19:43:05 +0800 Subject: [PATCH] 部署服务器 --- src/main/java/com/zy/common/model/LocTypeDto.java | 11 ++++++----- 1 files changed, 6 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..a4fd352 100644 --- a/src/main/java/com/zy/common/model/LocTypeDto.java +++ b/src/main/java/com/zy/common/model/LocTypeDto.java @@ -1,6 +1,5 @@ package com.zy.common.model; -import com.core.exception.CoolException; import com.zy.core.model.protocol.StaProtocol; import lombok.Data; @@ -19,6 +18,8 @@ // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿 private Short locType3; + private Integer siteId; + public LocTypeDto() { } @@ -32,11 +33,11 @@ // if (staProtocol.isHigh() == staProtocol.isLow()) { // throw new CoolException("plc楂樹綆妫�娴嬪紓甯�"); // } - if (staProtocol.getSiteId() == 106){ - this.locType1 = 2; // 楂樺簱浣� - }else { +// if (staProtocol.isHigh()) { +// this.locType1 = 2; // 楂樺簱浣� +// } else if (staProtocol.isLow()) { this.locType1 = 1; // 浣庡簱浣� - } +// } } /** -- Gitblit v1.9.1