From 975823f4d07c91a67162f553be9ff4ac25f3d47d Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期四, 06 十一月 2025 13:41:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/czkhasrs' into czkhasrs
---
src/main/java/com/zy/common/model/LocTypeDto.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 08c9f1b..8fc9892 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -13,7 +13,7 @@
@Data
public class LocTypeDto {
- // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
+ // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,5:楂樺簱浣�,2:涓簱浣�,6:瓒呴珮搴撲綅}
private Short locType1;
// 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
@@ -30,9 +30,13 @@
throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
}
if (basDevp.getLocType1() == 1) {
- this.locType1 = 1; // 灏忓簱浣�
- } else {
- this.locType1 = 2; // 澶у簱浣�
+ this.locType1 = 1; // 浣庡簱浣�
+ } else if (basDevp.getLocType1() ==2){
+ this.locType1 = 2; // 涓簱浣�
+ } else if (basDevp.getLocType1() == 5){
+ this.locType1 = 5; // 楂樺簱浣�
+ }else if (basDevp.getLocType1() == 6){
+ this.locType1 = 6;//瓒呴珮搴撲綅
}
log.info(JSON.toJSONString(this));
}
--
Gitblit v1.9.1