From ecb93482982b82008b37de0ec67d2afa9cb60b13 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期三, 26 六月 2024 16:58:41 +0800
Subject: [PATCH] 而且回退修改，led显示
---
src/main/java/com/zy/common/model/LocTypeDto.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 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..01f9018 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;
@@ -22,15 +21,34 @@
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()) {
+ System.out.println("----------"+staProtocol.getSiteId()+"搴撲綅妫�娴嬪師濮嬫暟鎹负:"+staProtocol.isWeight()+"------------");
+// if (staProtocol.isHigh() == staProtocol.isLow() == staProtocol.isMedium() == staProtocol.isMedium_high()) {
// throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
// }
-// if (staProtocol.isLow()) {
-// this.locType1 = 1; // 浣庡簱浣�
-// } else {
-// this.locType1 = 2; // 楂樺簱浣�
-// }
+
+ if (staProtocol.isLow()) {
+ this.locType1 = 1; // 浣庡簱浣�
+ } else if (staProtocol.isHigh()){
+ this.locType1 = 2; // 涓簱浣�
+ } else if (staProtocol.isMedium()) {
+ this.locType1 = 3; // 涓珮搴撲綅
+ } else if (staProtocol.isMedium_high()) {
+ this.locType1 = 4; // 楂樺簱浣�
+ }
+ if (staProtocol.isWeight() && staProtocol.getSiteId() == 204 || staProtocol.getSiteId() == 104) {
+ this.locType1 = 2;
+ } else {
+ this.locType1 = 1;
+ }
+ System.out.println("----------"+staProtocol.getSiteId()+"搴撲綅妫�娴嬪鐞嗕负鏁版嵁涓�:"+this.locType1+"------------");
+
}
/**
--
Gitblit v1.9.1