From db9da52e04e95cf0b3c4f196ce5e1baf7a58832d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 19 十二月 2025 16:49:20 +0800
Subject: [PATCH] led相关功能完善
---
src/main/java/com/zy/common/model/LocTypeDto.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index c751fe7..319e4f4 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -1,6 +1,7 @@
package com.zy.common.model;
import com.zy.core.model.protocol.StaProtocol;
+import com.zy.utils.News;
import lombok.Data;
/**
@@ -30,7 +31,27 @@
}
public LocTypeDto(StaProtocol staProtocol) {
- this.locType1 = staProtocol.getGoodsHeight();
+ // todo 楂樹綆搴撲綅鏆傛椂涓嶆娴�
+// if (staProtocol.isHigh() == staProtocol.isLow() || staProtocol.isChang() == staProtocol.isDuan()) {
+// News.error("plc楂樹綆/闀跨煭妫�娴嬪紓甯�,high:{},low:{}锛宑hang:{},duan:{}",staProtocol.isHigh(),staProtocol.isLow(),staProtocol.isChang(),staProtocol.isDuan());
+// return;
+// }
+ if (staProtocol.isChang() == staProtocol.isDuan()) {
+ News.error("plc闀跨煭妫�娴嬪紓甯�,high:{},low:{}锛宑hang:{},duan:{}",staProtocol.isHigh(),staProtocol.isLow(),staProtocol.isChang(),staProtocol.isDuan());
+ return;
+ }
+
+ if (staProtocol.isHigh()) {
+ this.locType1 = 2;
+ } else {
+ this.locType1 = 1;
+ }
+
+ if (staProtocol.isChang()) {
+ this.locType2 = 2; // 闀垮簱浣�
+ } else {
+ this.locType2 = 1; // 鐭簱浣�
+ }
}
/**
--
Gitblit v1.9.1