From 73024468df52927fc7fe116f9b4ba603f4b73eee Mon Sep 17 00:00:00 2001
From: cp <513960435@qq,com>
Date: 星期三, 17 一月 2024 10:49:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/LocTypeDto.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 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..d8e3e26 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -10,7 +10,7 @@
@Data
public class LocTypeDto {
- // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
+ // 楂樹綆绫诲瀷{0:鏈煡,1:杈冧綆搴撲綅,2:浣庡簱浣嶏紝3:楂樺簱浣�,4: 鐗归珮搴撲綅}
private Short locType1;
// 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
@@ -22,15 +22,39 @@
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 {
-// this.locType1 = 2; // 楂樺簱浣�
-// }
+ int trueLen = 0;
+ if (staProtocol.isHigh()) {
+ trueLen++;
+ }
+ if (staProtocol.isHigh1()) {
+ trueLen++;
+ }
+ if (staProtocol.isLow()) {
+ trueLen++;
+ }
+ if (staProtocol.isLow1()) {
+ trueLen++;
+ }
+ if (trueLen != 1) {
+ throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
+ }
+
+ if (staProtocol.isLow()) {
+ this.locType1 = 1; // 杈冧綆搴撲綅
+ } else if (staProtocol.isLow1()){
+ this.locType1 = 2; // 浣庡簱浣�
+ } else if (staProtocol.isHigh()){
+ this.locType1 = 3; // 楂樺簱浣�
+ } else if (staProtocol.isHigh1()){
+ this.locType1 = 4; // 鐗归珮搴撲綅
+ }
}
/**
--
Gitblit v1.9.1