From ab86c5e1ad56841b8a8f832440e261fca5634800 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 八月 2025 11:48:45 +0800
Subject: [PATCH] 水肥机数据Vo对象增加数值字段对应字符串字段的映射

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoManure.java  |   99 +++++++++++++++++++++++++++++++++++++++++++++++++
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWeather.java |    1 
 2 files changed, 99 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoManure.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoManure.java
index cf0fcc0..7d82e77 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoManure.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoManure.java
@@ -20,7 +20,10 @@
         "stirRunning1", "stirRunning2", "stirRunning3", "stirRunning4",
         "injectRunning", "irrRunning",
         "manureFlow", "manureTime", "stirTime",
-        "stirDuration", "injectDuration"
+        "stirDuration", "injectDuration",
+        "alarmStr",
+        "stirRunning1Str", "stirRunning2Str", "stirRunning3Str", "stirRunning4Str",
+        "injectRunningStr", "irrRunningStr"
 })
 public class VoManure  {
     public static final long serialVersionUID = 202506251634001L;
@@ -125,4 +128,98 @@
     @Schema(description = "娉ㄨ偉璁惧畾鏃堕棿(绉�)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     public Integer injectDuration;
 
+
+    @Schema(hidden = true)
+    @JSONField(name = "alarmStr") // 鎸囧畾 JSON 涓殑瀛楁鍚�
+    public String getAlarmStr() {
+        String str = "" ;
+        if(this.alarm != null){
+            if(this.alarm == 1){
+                str = "鏁呴殰" ;
+            }else if(this.alarm == 0){
+                str = "姝ｅ父" ;
+            }
+        }
+        return str ;
+    }
+    @Schema(hidden = true)
+    @JSONField(name = "stirRunning1Str") // 鎸囧畾 JSON 涓殑瀛楁鍚�
+    public String getStirRunning1Str() {
+        String str = "" ;
+        if(this.stirRunning1 != null){
+            if(this.stirRunning1 == 1){
+                str = "鍚姩" ;
+            }else if(this.stirRunning1 == 0){
+                str = "鍋滄" ;
+            }
+        }
+        return str ;
+    }
+    @Schema(hidden = true)
+    @JSONField(name = "stirRunning2Str") // 鎸囧畾 JSON 涓殑瀛楁鍚�
+    public String getStirRunning2Str() {
+        String str = "" ;
+        if(this.stirRunning2 != null){
+            if(this.stirRunning2 == 1){
+                str = "鍚姩" ;
+            }else if(this.stirRunning2 == 0){
+                str = "鍋滄" ;
+            }
+        }
+        return str ;
+    }
+    @Schema(hidden = true)
+    @JSONField(name = "stirRunning3Str") // 鎸囧畾 JSON 涓殑瀛楁鍚�
+    public String getStirRunning3Str() {
+        String str = "" ;
+        if(this.stirRunning3 != null){
+            if(this.stirRunning3 == 1){
+                str = "鍚姩" ;
+            }else if(this.stirRunning3 == 0){
+                str = "鍋滄" ;
+            }
+        }
+        return str ;
+    }
+    @Schema(hidden = true)
+    @JSONField(name = "stirRunning4Str") // 鎸囧畾 JSON 涓殑瀛楁鍚�
+    public String getStirRunning4Str() {
+        String str = "" ;
+        if(this.stirRunning4 != null){
+            if(this.stirRunning4 == 1){
+                str = "鍚姩" ;
+            }else if(this.stirRunning4 == 0){
+                str = "鍋滄" ;
+            }
+        }
+        return str ;
+    }
+    @Schema(hidden = true)
+    @JSONField(name = "injectRunningStr") // 鎸囧畾 JSON 涓殑瀛楁鍚�
+    public String getInjectRunningStr() {
+        String str = "" ;
+        if(this.injectRunning != null){
+            if(this.injectRunning == 1){
+                str = "鍚姩" ;
+            }else if(this.injectRunning == 0){
+                str = "鍋滄" ;
+            }
+        }
+        return str ;
+    }
+    @Schema(hidden = true)
+    @JSONField(name = "irrRunningStr") // 鎸囧畾 JSON 涓殑瀛楁鍚�
+    public String getIrrRunningStr() {
+        String str = "" ;
+        if(this.irrRunning != null){
+            if(this.irrRunning == 1){
+                str = "鍚姩" ;
+            }else if(this.irrRunning == 0){
+                str = "鍋滄" ;
+            }
+        }
+        return str ;
+    }
+
+
 }
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWeather.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWeather.java
index 58e82b1..dd8dbfc 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWeather.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWeather.java
@@ -122,6 +122,7 @@
      瑗垮寳锛圢W锛�	146掳~169掳	 157.5掳
      鍖楋紙N锛�	    169掳~191掳	 180掳
      */
+    @Schema(hidden = true)
     @JSONField(name = "windDirectionStr") // 鎸囧畾 JSON 涓殑瀛楁鍚�
     public String getWindDirectionStr() {
         String str = "" ;

--
Gitblit v1.8.0