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 | 293 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 276 insertions(+), 17 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 4272c58..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,14 +20,67 @@
@Column(name = "end_time")
private Date endTime;
- @Column(name = "district_name")
- private String districtName;
-
/**
* 鏁版嵁鏄惁宸茬粡鎷夊彇鍏ュ簱
*/
@Column(name = "data_pulled")
private Boolean dataPulled;
+
+ @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;
+
+ /**
+ * 閲岀▼鏁帮紝鍏噷
+ */
+ private Float kilometres;
+
+ /**
+ * 璧拌埅鍥寸粫涓昏鍖哄煙
+ */
+ private String region;
+
+ /**
+ * 璧拌埅鍥寸粫涓績鍖哄煙鍗婂緞锛屽叕閲�
+ */
+ private Float radius;
+
+ /**
+ * 绌烘皵璐ㄩ噺绛夌骇
+ */
+ @Column(name = "pollution_degree")
+ private String pollutionDegree;
+
+ /**
+ * 绌烘皵璐ㄩ噺绛夌骇鎸囨暟AQI
+ */
+ private Integer aqi;
+
+ /**
+ * 棣栬姹℃煋鍥犲瓙
+ */
+ @Column(name = "main_factor")
+ private String mainFactor;
/**
* @return mission_code
@@ -100,20 +153,6 @@
}
/**
- * @return district_name
- */
- public String getDistrictName() {
- return districtName;
- }
-
- /**
- * @param districtName
- */
- public void setDistrictName(String districtName) {
- this.districtName = districtName == null ? null : districtName.trim();
- }
-
- /**
* 鑾峰彇鏁版嵁鏄惁宸茬粡鎷夊彇鍏ュ簱
*
* @return data_pulled - 鏁版嵁鏄惁宸茬粡鎷夊彇鍏ュ簱
@@ -130,4 +169,224 @@
public void setDataPulled(Boolean dataPulled) {
this.dataPulled = dataPulled;
}
+
+ /**
+ * @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();
+ }
+
+ /**
+ * 鑾峰彇閲岀▼鏁帮紝鍏噷
+ *
+ * @return kilometres - 閲岀▼鏁帮紝鍏噷
+ */
+ public Float getKilometres() {
+ return kilometres;
+ }
+
+ /**
+ * 璁剧疆閲岀▼鏁帮紝鍏噷
+ *
+ * @param kilometres 閲岀▼鏁帮紝鍏噷
+ */
+ public void setKilometres(Float kilometres) {
+ this.kilometres = kilometres;
+ }
+
+ /**
+ * 鑾峰彇璧拌埅鍥寸粫涓昏鍖哄煙
+ *
+ * @return region - 璧拌埅鍥寸粫涓昏鍖哄煙
+ */
+ public String getRegion() {
+ return 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;
+ }
+
+ /**
+ * 鑾峰彇绌烘皵璐ㄩ噺绛夌骇
+ *
+ * @return pollution_degree - 绌烘皵璐ㄩ噺绛夌骇
+ */
+ public String getPollutionDegree() {
+ return pollutionDegree;
+ }
+
+ /**
+ * 璁剧疆绌烘皵璐ㄩ噺绛夌骇
+ *
+ * @param pollutionDegree 绌烘皵璐ㄩ噺绛夌骇
+ */
+ public void setPollutionDegree(String pollutionDegree) {
+ this.pollutionDegree = pollutionDegree == null ? null : pollutionDegree.trim();
+ }
+
+ /**
+ * 鑾峰彇绌烘皵璐ㄩ噺绛夌骇鎸囨暟AQI
+ *
+ * @return aqi - 绌烘皵璐ㄩ噺绛夌骇鎸囨暟AQI
+ */
+ public Integer getAqi() {
+ return 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