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/Mission.java | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 9 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/domain/entity/Mission.java b/src/main/kotlin/com/flightfeather/uav/domain/entity/Mission.java
index e4367b9..9d045ab 100644
--- a/src/main/kotlin/com/flightfeather/uav/domain/entity/Mission.java
+++ b/src/main/kotlin/com/flightfeather/uav/domain/entity/Mission.java
@@ -20,6 +20,9 @@
@Column(name = "end_time")
private Date endTime;
+ /**
+ * 鏁版嵁鏄惁宸茬粡鎷夊彇鍏ュ簱
+ */
@Column(name = "data_pulled")
private Boolean dataPulled;
@@ -53,9 +56,14 @@
private Float kilometres;
/**
- * 鎵�灞炲尯鍩�
+ * 璧拌埅鍥寸粫涓昏鍖哄煙
*/
private String region;
+
+ /**
+ * 璧拌埅鍥寸粫涓績鍖哄煙鍗婂緞锛屽叕閲�
+ */
+ private Float radius;
/**
* 绌烘皵璐ㄩ噺绛夌骇
@@ -63,7 +71,16 @@
@Column(name = "pollution_degree")
private String pollutionDegree;
+ /**
+ * 绌烘皵璐ㄩ噺绛夌骇鎸囨暟AQI
+ */
private Integer aqi;
+
+ /**
+ * 棣栬姹℃煋鍥犲瓙
+ */
+ @Column(name = "main_factor")
+ private String mainFactor;
/**
* @return mission_code
@@ -136,14 +153,18 @@
}
/**
- * @return data_pulled
+ * 鑾峰彇鏁版嵁鏄惁宸茬粡鎷夊彇鍏ュ簱
+ *
+ * @return data_pulled - 鏁版嵁鏄惁宸茬粡鎷夊彇鍏ュ簱
*/
public Boolean getDataPulled() {
return dataPulled;
}
/**
- * @param dataPulled
+ * 璁剧疆鏁版嵁鏄惁宸茬粡鎷夊彇鍏ュ簱
+ *
+ * @param dataPulled 鏁版嵁鏄惁宸茬粡鎷夊彇鍏ュ簱
*/
public void setDataPulled(Boolean dataPulled) {
this.dataPulled = dataPulled;
@@ -280,21 +301,39 @@
}
/**
- * 鑾峰彇鎵�灞炲尯鍩�
+ * 鑾峰彇璧拌埅鍥寸粫涓昏鍖哄煙
*
- * @return region - 鎵�灞炲尯鍩�
+ * @return region - 璧拌埅鍥寸粫涓昏鍖哄煙
*/
public String getRegion() {
return region;
}
/**
- * 璁剧疆鎵�灞炲尯鍩�
+ * 璁剧疆璧拌埅鍥寸粫涓昏鍖哄煙
*
- * @param region 鎵�灞炲尯鍩�
+ * @param region 璧拌埅鍥寸粫涓昏鍖哄煙
*/
public void setRegion(String region) {
this.region = region == null ? null : region.trim();
+ }
+
+ /**
+ * 鑾峰彇璧拌埅鍥寸粫涓績鍖哄煙鍗婂緞锛屽叕閲�
+ *
+ * @return radius - 璧拌埅鍥寸粫涓績鍖哄煙鍗婂緞锛屽叕閲�
+ */
+ public Float getRadius() {
+ return radius;
+ }
+
+ /**
+ * 璁剧疆璧拌埅鍥寸粫涓績鍖哄煙鍗婂緞锛屽叕閲�
+ *
+ * @param radius 璧拌埅鍥寸粫涓績鍖哄煙鍗婂緞锛屽叕閲�
+ */
+ public void setRadius(Float radius) {
+ this.radius = radius;
}
/**
@@ -316,16 +355,38 @@
}
/**
- * @return aqi
+ * 鑾峰彇绌烘皵璐ㄩ噺绛夌骇鎸囨暟AQI
+ *
+ * @return aqi - 绌烘皵璐ㄩ噺绛夌骇鎸囨暟AQI
*/
public Integer getAqi() {
return aqi;
}
/**
- * @param aqi
+ * 璁剧疆绌烘皵璐ㄩ噺绛夌骇鎸囨暟AQI
+ *
+ * @param aqi 绌烘皵璐ㄩ噺绛夌骇鎸囨暟AQI
*/
public void setAqi(Integer aqi) {
this.aqi = aqi;
}
+
+ /**
+ * 鑾峰彇棣栬姹℃煋鍥犲瓙
+ *
+ * @return main_factor - 棣栬姹℃煋鍥犲瓙
+ */
+ public String getMainFactor() {
+ return mainFactor;
+ }
+
+ /**
+ * 璁剧疆棣栬姹℃煋鍥犲瓙
+ *
+ * @param mainFactor 棣栬姹℃煋鍥犲瓙
+ */
+ public void setMainFactor(String mainFactor) {
+ this.mainFactor = mainFactor == null ? null : mainFactor.trim();
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3