From d9271883338de97164a36ea9a1e5fc7eef73e64d Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期三, 04 十月 2023 14:38:25 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/model/LocTypeDto.java | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java index 10e71fb..7dc5c7b 100644 --- a/src/main/java/com/zy/common/model/LocTypeDto.java +++ b/src/main/java/com/zy/common/model/LocTypeDto.java @@ -1,5 +1,6 @@ package com.zy.common.model; +import com.core.exception.CoolException; import com.zy.core.model.protocol.StaProtocol; import lombok.Data; @@ -22,14 +23,10 @@ } public LocTypeDto(StaProtocol staProtocol) { -// if (staProtocol.isHigh() == staProtocol.isLow()) { -// throw new CoolException("plc楂樹綆妫�娴嬪紓甯�"); -// } -// if (staProtocol.isLow()) { -// this.locType1 = 1; // 浣庡簱浣� -// } else { -// this.locType1 = 2; // 楂樺簱浣� -// } + if (staProtocol.getLocType1() == null || staProtocol.getLocType1() == 0) { + throw new CoolException("plc楂樹綆妫�娴嬪紓甯�"); + } + this.locType1 = staProtocol.getLocType1(); } /** -- Gitblit v1.9.1