From e1f1023dee5d094fcb1e428f36cce09211c4542a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 08 九月 2025 11:29:11 +0800
Subject: [PATCH] 蒸腾改为蒸散
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java | 121 +++++++++++++++++++++++++++++++++-------
1 files changed, 100 insertions(+), 21 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java
index 21aec32..d528900 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java
@@ -9,6 +9,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
import lombok.*;
import org.hibernate.validator.constraints.Length;
@@ -16,10 +17,9 @@
/**
* @Author: liurunyu
- * @Date: 2025/8/6 10:51
+ * @Date: 2025/8/15 15:22
* @Description
*/
-
@TableName(value="md_crops", autoResultMap = true)
@Data
@Builder
@@ -30,53 +30,132 @@
public class MdCrops implements BaseEntity {
public static final long serialVersionUID = 202508061126001L;
-
/**
- * 涓婚敭
- */
+ * 涓婚敭
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
@Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Long id;
/**
- * 浣滅墿鍚嶇О
- */
+ * 鎸囧悜姘旇薄绔欏閿�
+ */
+ @Schema(description = "鍏宠仈鐨勬皵璞＄珯", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鍏宠仈鐨勬皵璞＄珯涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+ public Long weatherId;
+
+ /**
+ * 浣滅墿鍚嶇О
+ */
@Schema(description = "浣滅墿鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "浣滅墿鍚嶇О涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
@Length(message = "浣滅墿鍚嶇О涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 50)
public String name;
/**
- * 璁＄畻寮�濮嬫棩鏈燂紙涓�骞寸敓浣滅墿鏄妞嶆椂闂存垨鍑鸿娊鏃堕棿锛夛紝濡傛灉涓虹┖鍊煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd
- */
+ * 璁＄畻寮�濮嬫棩鏈燂紙涓�骞寸敓浣滅墿鏄妞嶆椂闂存垨鍑鸿娊鏃堕棿锛夛紝濡傛灉涓虹┖鍊煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd
+ */
@Schema(description = "璁＄畻寮�濮嬫棩鏈燂紙涓�骞寸敓浣滅墿鏄妞嶆椂闂存垨鍑鸿娊鏃堕棿锛夛紝濡傛灉涓虹┖鍊煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JsonFormat(pattern = "yyyy-MM-dd")
- public Date startDt;
+ @JsonFormat(pattern = "MM-dd")
+ public String startDt;
/**
- * 璁＄畻鎴鏃ユ湡锛堜竴骞寸敓浣滅墿鏄仠姝㈢亴婧夋椂闂达級锛屽鏋滀负绌哄�煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd
- */
+ * 璁＄畻鎴鏃ユ湡锛堜竴骞寸敓浣滅墿鏄仠姝㈢亴婧夋椂闂达級锛屽鏋滀负绌哄�煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd
+ */
@Schema(description = "璁＄畻鎴鏃ユ湡锛堜竴骞寸敓浣滅墿鏄仠姝㈢亴婧夋椂闂达級锛屽鏋滀负绌哄�煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JsonFormat(pattern = "yyyy-MM-dd")
- public Date endDt;
+ @JsonFormat(pattern = "MM-dd")
+ public String endDt;
+
/**
- * 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
- */
+ * 鐢熼暱鍒濇湡寮�濮嬪ぉ鏁帮紙榛樿鏄�1锛�
+ */
+ @Schema(description = "鐢熼暱鍒濇湡寮�濮嬪ぉ鏁帮紙榛樿鏄�1锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer life1Start;
+
+ /**
+ * 鐢熼暱鍒濇湡缁撴潫澶╂暟
+ */
+ @Schema(description = "鐢熼暱鍒濇湡缁撴潫澶╂暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer life1End;
+
+ /**
+ * 鐢熼暱鍒濇湡浣滅墿绯绘暟
+ */
+ @Schema(description = "鐢熼暱鍒濇湡浣滅墿绯绘暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double life1Factor ;
+
+ /**
+ * 蹇�熺敓闀挎湡寮�濮嬪ぉ鏁帮紙榛樿鐢熼暱鍒濇湡缁撴潫澶╂暟+1锛�
+ */
+ @Schema(description = "蹇�熺敓闀挎湡寮�濮嬪ぉ鏁帮紙榛樿鐢熼暱鍒濇湡缁撴潫澶╂暟+1锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer life2Start;
+
+ /**
+ * 蹇�熺敓闀挎湡缁撴潫澶╂暟
+ */
+ @Schema(description = "蹇�熺敓闀挎湡缁撴潫澶╂暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer life2End;
+
+ /**
+ * 蹇�熺敓闀挎湡浣滅墿绯绘暟
+ */
+ @Schema(description = "蹇�熺敓闀挎湡浣滅墿绯绘暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double life2Factor ;
+
+ /**
+ * 鐢熼暱涓湡寮�濮嬪ぉ鏁帮紙榛樿蹇�熺敓闀挎湡缁撴潫澶╂暟+1锛�
+ */
+ @Schema(description = "鐢熼暱涓湡寮�濮嬪ぉ鏁帮紙榛樿蹇�熺敓闀挎湡缁撴潫澶╂暟+1锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer life3Start;
+
+ /**
+ * 鐢熼暱涓湡缁撴潫澶╂暟
+ */
+ @Schema(description = "鐢熼暱涓湡缁撴潫澶╂暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer life3End;
+
+ /**
+ * 鐢熼暱涓湡浣滅墿绯绘暟
+ */
+ @Schema(description = "鐢熼暱涓湡浣滅墿绯绘暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double life3Factor ;
+
+ /**
+ * 鐢熼暱鏈湡寮�濮嬪ぉ鏁帮紙榛樿鐢熼暱涓湡缁撴潫澶╂暟+1锛�
+ */
+ @Schema(description = "鐢熼暱鏈湡寮�濮嬪ぉ鏁帮紙榛樿鐢熼暱涓湡缁撴潫澶╂暟+1锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer life4Start;
+
+ /**
+ * 鐢熼暱鏈湡缁撴潫澶╂暟
+ */
+ @Schema(description = "鐢熼暱鏈湡缁撴潫澶╂暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer life4End;
+
+ /**
+ * 鐢熼暱鏈湡浣滅墿绯绘暟
+ */
+ @Schema(description = "鐢熼暱鏈湡浣滅墿绯绘暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double life4Factor ;
+
+ /**
+ * 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
+ */
@Schema(description = "鍋滄璁＄畻鏍囪瘑", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Byte stopped;
/**
- * 澶囨敞
- */
+ * 澶囨敞
+ */
@Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Length(message = "澶囨敞涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 100)
public String remarks;
/**
- * 鏁版嵁璁板綍鍒涘缓鏃ユ湡锛屾牸寮弝yyy-mm-dd hh:mm:ss
- */
+ * 鏁版嵁璁板綍鍒涘缓鏃ユ湡锛屾牸寮弝yyy-mm-dd hh:mm:ss
+ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date createDt;
--
Gitblit v1.8.0