liurunyu
2025-08-16 24bcb7b420e5e1b0e6f146f22fa8b52acc8e4408
完善作物po与vo
2个文件已修改
27 ■■■■■ 已修改文件
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
    /**
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否