From 6ee52a5f212a52b4a0d41bff3cddc519ddb66997 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 20 八月 2025 17:47:16 +0800
Subject: [PATCH] 修改bug

---
 pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java |    7 ++++++-
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdEt0.java                 |    2 ++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdEt0.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdEt0.java
index 0132327..0ba9b23 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdEt0.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdEt0.java
@@ -40,6 +40,7 @@
     /**
     * 浣滅墿澶栭敭
     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
     @Schema(description = "鎵�灞炵殑浣滅墿", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "鎵�灞炵殑浣滅墿涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
     public Long cropId;
@@ -47,6 +48,7 @@
     /**
     * 姘旇薄绔檌d
     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
     @Schema(description = "鍏宠仈鐨勬皵璞$珯", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "鍏宠仈鐨勬皵璞$珯涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
     public Long weatherId;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java
index 76cbc15..11d6c51 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java
@@ -19,6 +19,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -85,7 +86,11 @@
             if(qo.timeStart == null || qo.timeStart.trim().equals("")){
                 qo.timeStart = DateTime.lastXDay_yyyy_MM_dd(qo.timeStop, 10);
             }
-            return BaseResponseUtils.buildSuccess(sv.oneCropsSomeEt0(qo));
+            List<MdEt0> list = sv.oneCropsSomeEt0(qo) ;
+            if(list == null){
+                list = new ArrayList<>() ;
+            }
+            return BaseResponseUtils.buildSuccess(list);
         } catch (Exception e) {
             return BaseResponseUtils.buildException(e.getMessage()) ;
         }

--
Gitblit v1.8.0