From 6a4f68b8f99dca3a00c297cbcff82c065575212c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 16 八月 2025 11:25:20 +0800
Subject: [PATCH] 1、完善代码；2、作物去除lat属性，采用关联气象站的lat；3、project模块增加查询全部气象站的方法。

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java |   88 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
index 29521b4..2704449 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
@@ -4,6 +4,7 @@
 import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,7 +17,9 @@
  */
 
 @Data
-@JsonPropertyOrder({"id", "name", "startDt", "endDt", "stopped", "isStopped", "remarks", "createDt"})
+@JsonPropertyOrder({"id", "name", "startDt", "endDt",
+
+        "stopped", "stoppedStr", "remarks", "createDt"})
 public class VoCrops implements Serializable {
 
     public static final long serialVersionUID = 202508061124001L;
@@ -45,14 +48,74 @@
     public String endDt;
 
     /**
-     * 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
+     * 鐢熼暱鍒濇湡寮�濮嬪ぉ鏁帮紙榛樿鏄�1锛�
      */
-    public Byte stopped;
+    public Integer life1Start;
+
+    /**
+     * 鐢熼暱鍒濇湡缁撴潫澶╂暟
+     */
+    public Integer life1End;
+
+    /**
+     * 鐢熼暱鍒濇湡浣滅墿绯绘暟
+     */
+    public Double life1Factor ;
+
+    /**
+     * 蹇�熺敓闀挎湡寮�濮嬪ぉ鏁帮紙榛樿鐢熼暱鍒濇湡缁撴潫澶╂暟+1锛�
+     */
+    public Integer life2Start;
+
+    /**
+     * 蹇�熺敓闀挎湡缁撴潫澶╂暟
+     */
+    public Integer life2End;
+
+    /**
+     * 蹇�熺敓闀挎湡浣滅墿绯绘暟
+     */
+    public Double life2Factor ;
+
+    /**
+     * 鐢熼暱涓湡寮�濮嬪ぉ鏁帮紙榛樿蹇�熺敓闀挎湡缁撴潫澶╂暟+1锛�
+     */
+    public Integer life3Start;
+
+    /**
+     * 鐢熼暱涓湡缁撴潫澶╂暟
+     */
+    public Integer life3End;
+
+    /**
+     * 鐢熼暱涓湡浣滅墿绯绘暟
+     */
+    public Double life3Factor ;
+
+    /**
+     * 鐢熼暱鏈湡寮�濮嬪ぉ鏁帮紙榛樿鐢熼暱涓湡缁撴潫澶╂暟+1锛�
+     */
+    public Integer life4Start;
+
+    /**
+     * 鐢熼暱鏈湡缁撴潫澶╂暟
+     */
+    public Integer life4End;
+
+    /**
+     * 鐢熼暱鏈湡浣滅墿绯绘暟
+     */
+    public Double life4Factor ;
+
+    /**
+     * 绾害
+     */
+    public Double lat;
 
     /**
      * 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
      */
-    public String stoppedStr;
+    public Byte stopped;
 
     /**
      * 澶囨敞
@@ -65,4 +128,21 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     public Date createDt;
 
+    /**
+     * 宸茬粡鐢熸垚鏃堕暱锛堝ぉ锛�
+     */
+    public Integer lifeLen;
+    /**
+     * 褰撳墠鐢熼暱闃舵
+     */
+    public String lifeCur ;
+    /**
+     * 瀵瑰簲浣滅墿鐢熼暱闃舵鐨勭郴鏁�
+     */
+    public Double lifeFactor ;
+    /**
+     * 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
+     */
+    public String stoppedStr;
+
 }

--
Gitblit v1.8.0