From 24bcb7b420e5e1b0e6f146f22fa8b52acc8e4408 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 16 八月 2025 11:31:01 +0800
Subject: [PATCH] 完善作物po与vo
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java | 5 ++++-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java | 22 ++++++++++++++--------
2 files changed, 18 insertions(+), 9 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 9e845ff..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;
@@ -38,8 +39,10 @@
public Long id;
/**
- * 鎸囧悜鎵�璞＄珯澶栭敭
+ * 鎸囧悜姘旇薄绔欏閿�
*/
+ @Schema(description = "鍏宠仈鐨勬皵璞＄珯", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鍏宠仈鐨勬皵璞＄珯涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
public Long weatherId;
/**
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 2704449..2d69504 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,7 +4,6 @@
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;
@@ -17,9 +16,15 @@
*/
@Data
-@JsonPropertyOrder({"id", "name", "startDt", "endDt",
-
- "stopped", "stoppedStr", "remarks", "createDt"})
+@JsonPropertyOrder({"id", "weatherId",
+ "name", "startDt", "endDt",
+ "life1Start", "life1End", "life1Factor",
+ "life2Start", "life2End", "life2Factor",
+ "life3Start", "life3End", "life3Factor",
+ "life4Start", "life4End", "life4Factor",
+ "stopped", "remarks", "createDt",
+ "lifeLen", "lifeCur", "lifeFactor", "stoppedStr"
+})
public class VoCrops implements Serializable {
public static final long serialVersionUID = 202508061124001L;
@@ -29,6 +34,11 @@
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long id;
+ /**
+ * 鎸囧悜姘旇薄绔欏閿�
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long weatherId;
/**
* 浣滅墿鍚嶇О
@@ -107,10 +117,6 @@
*/
public Double life4Factor ;
- /**
- * 绾害
- */
- public Double lat;
/**
* 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
--
Gitblit v1.8.0