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 | 114 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 91 insertions(+), 23 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 8b0235d..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", "isStopped", "remarks", "createDt"})
+@JsonPropertyOrder({"id", "name", "startDt", "endDt",
+
+ "stopped", "stoppedStr", "remarks", "createDt"})
public class VoCrops implements Serializable {
public static final long serialVersionUID = 202508061124001L;
@@ -33,27 +36,86 @@
public String name;
/**
- * 璁＄畻寮�濮嬫棩鏈燂紙涓�骞寸敓浣滅墿鏄妞嶆椂闂存垨鍑鸿娊鏃堕棿锛夛紝濡傛灉涓虹┖鍊煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd
+ * 璁＄畻寮�濮嬫棩鏈燂紙涓�骞寸敓浣滅墿鏄妞嶆椂闂存垨鍑鸿娊鏃堕棿锛夛紝濡傛灉涓虹┖鍊煎垯涓洪暱涔呰绠楋紝鏍煎紡mm-dd
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- public Date startDt;
+ @JsonFormat(pattern = "MM-dd")
+ public String startDt;
/**
- * 璁＄畻鎴鏃ユ湡锛堜竴骞寸敓浣滅墿鏄仠姝㈢亴婧夋椂闂达級锛屽鏋滀负绌哄�煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd
+ * 璁＄畻鎴鏃ユ湡锛堜竴骞寸敓浣滅墿鏄仠姝㈢亴婧夋椂闂达級锛屽鏋滀负绌哄�煎垯涓洪暱涔呰绠楋紝鏍煎紡mm-dd
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- public Date endDt;
+ @JsonFormat(pattern = "MM-dd")
+ public String endDt;
+
+ /**
+ * 鐢熼暱鍒濇湡寮�濮嬪ぉ鏁帮紙榛樿鏄�1锛�
+ */
+ 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鍚�
*/
- @JSONField(serialize = false)
public Byte stopped;
-
- /**
- * 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
- */
- public String isStopped;
/**
* 澶囨敞
@@ -66,15 +128,21 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date createDt;
- public String getIsStopped() {
- if (this.stopped != null) {
- if(this.stopped == 0){
- return "鍚�";
- }else{
- return "鏄�";
- }
- }
- return "" ;
- }
+ /**
+ * 宸茬粡鐢熸垚鏃堕暱锛堝ぉ锛�
+ */
+ public Integer lifeLen;
+ /**
+ * 褰撳墠鐢熼暱闃舵
+ */
+ public String lifeCur ;
+ /**
+ * 瀵瑰簲浣滅墿鐢熼暱闃舵鐨勭郴鏁�
+ */
+ public Double lifeFactor ;
+ /**
+ * 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
+ */
+ public String stoppedStr;
}
--
Gitblit v1.8.0