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/GridData.java | 304 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 304 insertions(+), 0 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/domain/entity/GridData.java b/src/main/kotlin/com/flightfeather/uav/domain/entity/GridData.java
index e008649..49f150b 100644
--- a/src/main/kotlin/com/flightfeather/uav/domain/entity/GridData.java
+++ b/src/main/kotlin/com/flightfeather/uav/domain/entity/GridData.java
@@ -6,6 +6,7 @@
@Table(name = "grid_data")
public class GridData {
@Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
/**
@@ -30,6 +31,71 @@
*/
@Column(name = "mix_data_id")
private String mixDataId;
+
+ /**
+ * 鎵�灞炲尯鍩燂紙璧拌埅鐩戞祴铻嶅悎缃戞牸锛�
+ */
+ private String zone;
+
+ /**
+ * 澶ф皵姹℃煋绛夌骇锛堜紭銆佽壇銆佽交搴︽薄鏌撱�佷腑搴︽薄鏌撱�侀噸搴︽薄鏌擄級
+ */
+ @Column(name = "pollution_degree")
+ private String pollutionDegree;
+
+ /**
+ * 澶ф皵姹℃煋绛夌骇缂栧彿锛堜紭銆佽壇銆佽交搴︽薄鏌撱�佷腑搴︽薄鏌撱�侀噸搴︽薄鏌擄級
+ */
+ @Column(name = "pollution_degree_index")
+ private Integer pollutionDegreeIndex;
+
+ /**
+ * 璧拌埅浠诲姟缂栧彿
+ */
+ @Column(name = "mission_code")
+ private String missionCode;
+
+ @Column(name = "province_code")
+ private String provinceCode;
+
+ @Column(name = "province_name")
+ private String provinceName;
+
+ @Column(name = "city_code")
+ private String cityCode;
+
+ @Column(name = "city_name")
+ private String cityName;
+
+ @Column(name = "district_code")
+ private String districtCode;
+
+ @Column(name = "district_name")
+ private String districtName;
+
+ @Column(name = "town_code")
+ private String townCode;
+
+ @Column(name = "town_name")
+ private String townName;
+
+ /**
+ * 鎵�澶勬瘡鏃ョ殑鏃舵锛�"鍑屾櫒 0 - 6", "鏃╀笂 6 - 9", "涓婂崍 9 - 12", "涓崍 12 - 14", "涓嬪崍 14 - 17", "鍌嶆櫄 17 - 20", "澶滈棿 20 - 0"
+ */
+ @Column(name = "day_time_period")
+ private String dayTimePeriod;
+
+ /**
+ * 鏃ユ椂娈靛紑濮嬫椂闂�
+ */
+ @Column(name = "day_time_period_start")
+ private Date dayTimePeriodStart;
+
+ /**
+ * 鏃ユ椂娈电粨鏉熸椂闂�
+ */
+ @Column(name = "day_time_period_end")
+ private Date dayTimePeriodEnd;
/**
* @return id
@@ -116,4 +182,242 @@
public void setMixDataId(String mixDataId) {
this.mixDataId = mixDataId == null ? null : mixDataId.trim();
}
+
+ /**
+ * 鑾峰彇鎵�灞炲尯鍩燂紙璧拌埅鐩戞祴铻嶅悎缃戞牸锛�
+ *
+ * @return zone - 鎵�灞炲尯鍩燂紙璧拌埅鐩戞祴铻嶅悎缃戞牸锛�
+ */
+ public String getZone() {
+ return zone;
+ }
+
+ /**
+ * 璁剧疆鎵�灞炲尯鍩燂紙璧拌埅鐩戞祴铻嶅悎缃戞牸锛�
+ *
+ * @param zone 鎵�灞炲尯鍩燂紙璧拌埅鐩戞祴铻嶅悎缃戞牸锛�
+ */
+ public void setZone(String zone) {
+ this.zone = zone == null ? null : zone.trim();
+ }
+
+ /**
+ * 鑾峰彇澶ф皵姹℃煋绛夌骇锛堜紭銆佽壇銆佽交搴︽薄鏌撱�佷腑搴︽薄鏌撱�侀噸搴︽薄鏌擄級
+ *
+ * @return pollution_degree - 澶ф皵姹℃煋绛夌骇锛堜紭銆佽壇銆佽交搴︽薄鏌撱�佷腑搴︽薄鏌撱�侀噸搴︽薄鏌擄級
+ */
+ public String getPollutionDegree() {
+ return pollutionDegree;
+ }
+
+ /**
+ * 璁剧疆澶ф皵姹℃煋绛夌骇锛堜紭銆佽壇銆佽交搴︽薄鏌撱�佷腑搴︽薄鏌撱�侀噸搴︽薄鏌擄級
+ *
+ * @param pollutionDegree 澶ф皵姹℃煋绛夌骇锛堜紭銆佽壇銆佽交搴︽薄鏌撱�佷腑搴︽薄鏌撱�侀噸搴︽薄鏌擄級
+ */
+ public void setPollutionDegree(String pollutionDegree) {
+ this.pollutionDegree = pollutionDegree == null ? null : pollutionDegree.trim();
+ }
+
+ /**
+ * 鑾峰彇澶ф皵姹℃煋绛夌骇缂栧彿锛堜紭銆佽壇銆佽交搴︽薄鏌撱�佷腑搴︽薄鏌撱�侀噸搴︽薄鏌擄級
+ *
+ * @return pollution_degree_index - 澶ф皵姹℃煋绛夌骇缂栧彿锛堜紭銆佽壇銆佽交搴︽薄鏌撱�佷腑搴︽薄鏌撱�侀噸搴︽薄鏌擄級
+ */
+ public Integer getPollutionDegreeIndex() {
+ return pollutionDegreeIndex;
+ }
+
+ /**
+ * 璁剧疆澶ф皵姹℃煋绛夌骇缂栧彿锛堜紭銆佽壇銆佽交搴︽薄鏌撱�佷腑搴︽薄鏌撱�侀噸搴︽薄鏌擄級
+ *
+ * @param pollutionDegreeIndex 澶ф皵姹℃煋绛夌骇缂栧彿锛堜紭銆佽壇銆佽交搴︽薄鏌撱�佷腑搴︽薄鏌撱�侀噸搴︽薄鏌擄級
+ */
+ public void setPollutionDegreeIndex(Integer pollutionDegreeIndex) {
+ this.pollutionDegreeIndex = pollutionDegreeIndex;
+ }
+
+ /**
+ * 鑾峰彇璧拌埅浠诲姟缂栧彿
+ *
+ * @return mission_code - 璧拌埅浠诲姟缂栧彿
+ */
+ public String getMissionCode() {
+ return missionCode;
+ }
+
+ /**
+ * 璁剧疆璧拌埅浠诲姟缂栧彿
+ *
+ * @param missionCode 璧拌埅浠诲姟缂栧彿
+ */
+ public void setMissionCode(String missionCode) {
+ this.missionCode = missionCode == null ? null : missionCode.trim();
+ }
+
+ /**
+ * @return province_code
+ */
+ public String getProvinceCode() {
+ return provinceCode;
+ }
+
+ /**
+ * @param provinceCode
+ */
+ public void setProvinceCode(String provinceCode) {
+ this.provinceCode = provinceCode == null ? null : provinceCode.trim();
+ }
+
+ /**
+ * @return province_name
+ */
+ public String getProvinceName() {
+ return provinceName;
+ }
+
+ /**
+ * @param provinceName
+ */
+ public void setProvinceName(String provinceName) {
+ this.provinceName = provinceName == null ? null : provinceName.trim();
+ }
+
+ /**
+ * @return city_code
+ */
+ public String getCityCode() {
+ return cityCode;
+ }
+
+ /**
+ * @param cityCode
+ */
+ public void setCityCode(String cityCode) {
+ this.cityCode = cityCode == null ? null : cityCode.trim();
+ }
+
+ /**
+ * @return city_name
+ */
+ public String getCityName() {
+ return cityName;
+ }
+
+ /**
+ * @param cityName
+ */
+ public void setCityName(String cityName) {
+ this.cityName = cityName == null ? null : cityName.trim();
+ }
+
+ /**
+ * @return district_code
+ */
+ public String getDistrictCode() {
+ return districtCode;
+ }
+
+ /**
+ * @param districtCode
+ */
+ public void setDistrictCode(String districtCode) {
+ this.districtCode = districtCode == null ? null : districtCode.trim();
+ }
+
+ /**
+ * @return district_name
+ */
+ public String getDistrictName() {
+ return districtName;
+ }
+
+ /**
+ * @param districtName
+ */
+ public void setDistrictName(String districtName) {
+ this.districtName = districtName == null ? null : districtName.trim();
+ }
+
+ /**
+ * @return town_code
+ */
+ public String getTownCode() {
+ return townCode;
+ }
+
+ /**
+ * @param townCode
+ */
+ public void setTownCode(String townCode) {
+ this.townCode = townCode == null ? null : townCode.trim();
+ }
+
+ /**
+ * @return town_name
+ */
+ public String getTownName() {
+ return townName;
+ }
+
+ /**
+ * @param townName
+ */
+ public void setTownName(String townName) {
+ this.townName = townName == null ? null : townName.trim();
+ }
+
+ /**
+ * 鑾峰彇鎵�澶勬瘡鏃ョ殑鏃舵锛�"鍑屾櫒 0 - 6", "鏃╀笂 6 - 9", "涓婂崍 9 - 12", "涓崍 12 - 14", "涓嬪崍 14 - 17", "鍌嶆櫄 17 - 20", "澶滈棿 20 - 0"
+ *
+ * @return day_time_period - 鎵�澶勬瘡鏃ョ殑鏃舵锛�"鍑屾櫒 0 - 6", "鏃╀笂 6 - 9", "涓婂崍 9 - 12", "涓崍 12 - 14", "涓嬪崍 14 - 17", "鍌嶆櫄 17 - 20", "澶滈棿 20 - 0"
+ */
+ public String getDayTimePeriod() {
+ return dayTimePeriod;
+ }
+
+ /**
+ * 璁剧疆鎵�澶勬瘡鏃ョ殑鏃舵锛�"鍑屾櫒 0 - 6", "鏃╀笂 6 - 9", "涓婂崍 9 - 12", "涓崍 12 - 14", "涓嬪崍 14 - 17", "鍌嶆櫄 17 - 20", "澶滈棿 20 - 0"
+ *
+ * @param dayTimePeriod 鎵�澶勬瘡鏃ョ殑鏃舵锛�"鍑屾櫒 0 - 6", "鏃╀笂 6 - 9", "涓婂崍 9 - 12", "涓崍 12 - 14", "涓嬪崍 14 - 17", "鍌嶆櫄 17 - 20", "澶滈棿 20 - 0"
+ */
+ public void setDayTimePeriod(String dayTimePeriod) {
+ this.dayTimePeriod = dayTimePeriod == null ? null : dayTimePeriod.trim();
+ }
+
+ /**
+ * 鑾峰彇鏃ユ椂娈靛紑濮嬫椂闂�
+ *
+ * @return day_time_period_start - 鏃ユ椂娈靛紑濮嬫椂闂�
+ */
+ public Date getDayTimePeriodStart() {
+ return dayTimePeriodStart;
+ }
+
+ /**
+ * 璁剧疆鏃ユ椂娈靛紑濮嬫椂闂�
+ *
+ * @param dayTimePeriodStart 鏃ユ椂娈靛紑濮嬫椂闂�
+ */
+ public void setDayTimePeriodStart(Date dayTimePeriodStart) {
+ this.dayTimePeriodStart = dayTimePeriodStart;
+ }
+
+ /**
+ * 鑾峰彇鏃ユ椂娈电粨鏉熸椂闂�
+ *
+ * @return day_time_period_end - 鏃ユ椂娈电粨鏉熸椂闂�
+ */
+ public Date getDayTimePeriodEnd() {
+ return dayTimePeriodEnd;
+ }
+
+ /**
+ * 璁剧疆鏃ユ椂娈电粨鏉熸椂闂�
+ *
+ * @param dayTimePeriodEnd 鏃ユ椂娈电粨鏉熸椂闂�
+ */
+ public void setDayTimePeriodEnd(Date dayTimePeriodEnd) {
+ this.dayTimePeriodEnd = dayTimePeriodEnd;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3