From eb3dd00b0b7fcda477229d518d250f9c842b790b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 21 十月 2025 17:45:44 +0800
Subject: [PATCH] 2025.10.21 1. 走航季度报告相关数据计算逻辑调整

---
 src/main/kotlin/com/flightfeather/uav/domain/entity/GridDataDetail.java |  234 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 227 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/com/flightfeather/uav/domain/entity/GridDataDetail.java b/src/main/kotlin/com/flightfeather/uav/domain/entity/GridDataDetail.java
index 4545740..710ec06 100644
--- a/src/main/kotlin/com/flightfeather/uav/domain/entity/GridDataDetail.java
+++ b/src/main/kotlin/com/flightfeather/uav/domain/entity/GridDataDetail.java
@@ -5,6 +5,7 @@
 @Table(name = "grid_data_detail")
 public class GridDataDetail {
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
 
     /**
@@ -25,10 +26,47 @@
     @Column(name = "cell_id")
     private Integer cellId;
 
+    private Integer rank;
+
+    @Column(name = "NO2")
+    private Float no2;
+
+    @Column(name = "CO")
+    private Float co;
+
+    @Column(name = "H2S")
+    private Float h2s;
+
+    @Column(name = "SO2")
+    private Float so2;
+
+    @Column(name = "O3")
+    private Float o3;
+
     @Column(name = "PM25")
     private Float pm25;
 
-    private Integer rank;
+    @Column(name = "PM10")
+    private Float pm10;
+
+    private Float temperature;
+
+    private Float humidity;
+
+    @Column(name = "VOC")
+    private Float voc;
+
+    @Column(name = "NOI")
+    private Float noi;
+
+    @Column(name = "NO")
+    private Float no;
+
+    @Column(name = "wind_speed")
+    private Float windSpeed;
+
+    @Column(name = "wind_direction")
+    private Float windDirection;
 
     /**
      * @return id
@@ -99,6 +137,90 @@
     }
 
     /**
+     * @return rank
+     */
+    public Integer getRank() {
+        return rank;
+    }
+
+    /**
+     * @param rank
+     */
+    public void setRank(Integer rank) {
+        this.rank = rank;
+    }
+
+    /**
+     * @return NO2
+     */
+    public Float getNo2() {
+        return no2;
+    }
+
+    /**
+     * @param no2
+     */
+    public void setNo2(Float no2) {
+        this.no2 = no2;
+    }
+
+    /**
+     * @return CO
+     */
+    public Float getCo() {
+        return co;
+    }
+
+    /**
+     * @param co
+     */
+    public void setCo(Float co) {
+        this.co = co;
+    }
+
+    /**
+     * @return H2S
+     */
+    public Float getH2s() {
+        return h2s;
+    }
+
+    /**
+     * @param h2s
+     */
+    public void setH2s(Float h2s) {
+        this.h2s = h2s;
+    }
+
+    /**
+     * @return SO2
+     */
+    public Float getSo2() {
+        return so2;
+    }
+
+    /**
+     * @param so2
+     */
+    public void setSo2(Float so2) {
+        this.so2 = so2;
+    }
+
+    /**
+     * @return O3
+     */
+    public Float getO3() {
+        return o3;
+    }
+
+    /**
+     * @param o3
+     */
+    public void setO3(Float o3) {
+        this.o3 = o3;
+    }
+
+    /**
      * @return PM25
      */
     public Float getPm25() {
@@ -113,16 +235,114 @@
     }
 
     /**
-     * @return rank
+     * @return PM10
      */
-    public Integer getRank() {
-        return rank;
+    public Float getPm10() {
+        return pm10;
     }
 
     /**
-     * @param rank
+     * @param pm10
      */
-    public void setRank(Integer rank) {
-        this.rank = rank;
+    public void setPm10(Float pm10) {
+        this.pm10 = pm10;
+    }
+
+    /**
+     * @return temperature
+     */
+    public Float getTemperature() {
+        return temperature;
+    }
+
+    /**
+     * @param temperature
+     */
+    public void setTemperature(Float temperature) {
+        this.temperature = temperature;
+    }
+
+    /**
+     * @return humidity
+     */
+    public Float getHumidity() {
+        return humidity;
+    }
+
+    /**
+     * @param humidity
+     */
+    public void setHumidity(Float humidity) {
+        this.humidity = humidity;
+    }
+
+    /**
+     * @return VOC
+     */
+    public Float getVoc() {
+        return voc;
+    }
+
+    /**
+     * @param voc
+     */
+    public void setVoc(Float voc) {
+        this.voc = voc;
+    }
+
+    /**
+     * @return NOI
+     */
+    public Float getNoi() {
+        return noi;
+    }
+
+    /**
+     * @param noi
+     */
+    public void setNoi(Float noi) {
+        this.noi = noi;
+    }
+
+    /**
+     * @return NO
+     */
+    public Float getNo() {
+        return no;
+    }
+
+    /**
+     * @param no
+     */
+    public void setNo(Float no) {
+        this.no = no;
+    }
+
+    /**
+     * @return wind_speed
+     */
+    public Float getWindSpeed() {
+        return windSpeed;
+    }
+
+    /**
+     * @param windSpeed
+     */
+    public void setWindSpeed(Float windSpeed) {
+        this.windSpeed = windSpeed;
+    }
+
+    /**
+     * @return wind_direction
+     */
+    public Float getWindDirection() {
+        return windDirection;
+    }
+
+    /**
+     * @param windDirection
+     */
+    public void setWindDirection(Float windDirection) {
+        this.windDirection = windDirection;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3