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-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/manure/ManureDto.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/manure/ManureDto.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/manure/ManureDto.java
index 251a613..3293151 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/manure/ManureDto.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/manure/ManureDto.java
@@ -3,6 +3,7 @@
 import com.dy.pipIrrGlobal.pojoPr.PrStManure;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 /**
@@ -20,6 +21,12 @@
     public String id;
 
     /**
+     * 姘磋偉鏈篎Box搴忓垪鍙�
+     */
+    @NotEmpty(message = "姘磋偉鏈篎Box搴忓垪鍙�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    public String fboxId;
+
+    /**
      * 姘磋偉鏈哄悕绉�
      */
     @NotEmpty(message = "姘磋偉鏈哄悕绉颁笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
@@ -27,7 +34,7 @@
     /**
      * 姘磋偉鏈虹紪鍙�
      */
-    @NotEmpty(message = "姘磋偉鏈虹紪鍙蜂笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+    @NotNull(message = "姘磋偉鏈虹紪鍙蜂笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
     public Integer no;
 
 
@@ -48,6 +55,7 @@
 
     public PrStManure toNewPo(){
         PrStManure po = new PrStManure();
+        po.fboxId = this.fboxId;
         po.name = this.name;
         po.no = this.no;
         po.lng = this.lng;

--
Gitblit v1.8.0