From c2867200b720bc27d84195f649e1ae23039133f3 Mon Sep 17 00:00:00 2001 From: sdy Date: Wed, 24 Jun 2026 15:28:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=88=AA=E7=BA=BF=E5=AF=BC=E5=85=A5=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/multictrl/modules/business/dto/RouteDTO.java | 6 +++--- .../multictrl/modules/business/dto/UploadRouteDTO.java | 7 +++---- .../multictrl/modules/business/entity/RouteEntity.java | 4 ++-- .../modules/business/q20/dto/Q20RouteUploadDTO.java | 6 +++--- .../business/q20/service/impl/Q20RouteServiceImpl.java | 4 ++-- .../business/service/impl/RouteServiceImpl.java | 10 ++++++---- prj-deploy/file/pgsql/init.sql | 4 ++-- 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/admin/src/main/java/com/multictrl/modules/business/dto/RouteDTO.java b/admin/src/main/java/com/multictrl/modules/business/dto/RouteDTO.java index 1b56946..0748ebc 100644 --- a/admin/src/main/java/com/multictrl/modules/business/dto/RouteDTO.java +++ b/admin/src/main/java/com/multictrl/modules/business/dto/RouteDTO.java @@ -123,9 +123,9 @@ public class RouteDTO implements Serializable { private String expectFlightTime; @JsonProperty(required = true) - @NotNull(message = "{route.is.accurate.import.require}", groups = {AddGroup.class, UpdateGroup.class}) - @Schema(description = "是否精准导入") - private Boolean isAccurateImport; + @NotNull(message = "{route.is.accurate.import.require}", groups = {UpdateGroup.class}) + @Schema(description = "导入类型 0不是导入 1普通导入 2精准导入") + private Integer importType; @Schema(description = "更新时间") @JsonProperty(access = JsonProperty.Access.READ_ONLY) diff --git a/admin/src/main/java/com/multictrl/modules/business/dto/UploadRouteDTO.java b/admin/src/main/java/com/multictrl/modules/business/dto/UploadRouteDTO.java index 41cd11c..f397e51 100644 --- a/admin/src/main/java/com/multictrl/modules/business/dto/UploadRouteDTO.java +++ b/admin/src/main/java/com/multictrl/modules/business/dto/UploadRouteDTO.java @@ -26,9 +26,8 @@ public class UploadRouteDTO { // @Schema(description = "机库SN") private String dockSn; - @NotNull(message = "是否精准导入不能为空") -// @Schema(description = "是否精准导入 true false") - private Boolean accurateImport; + @NotNull(message = "导入类型 1普通导入 2精准导入") + private Integer importType; // @Schema(description = "返航高度") private Double globalRthHeight; @@ -41,7 +40,7 @@ public class UploadRouteDTO { @Schema(hidden = true) @AssertTrue(message = "返航高度不能为空") public boolean isGlobalRthHeightValid() { - if (accurateImport) { + if (importType == 2) { return globalRthHeight != null; } return true; diff --git a/admin/src/main/java/com/multictrl/modules/business/entity/RouteEntity.java b/admin/src/main/java/com/multictrl/modules/business/entity/RouteEntity.java index ba7774e..7a2ffcb 100644 --- a/admin/src/main/java/com/multictrl/modules/business/entity/RouteEntity.java +++ b/admin/src/main/java/com/multictrl/modules/business/entity/RouteEntity.java @@ -102,9 +102,9 @@ public class RouteEntity extends BaseEntity { */ private String expectFlightTime; /** - * 是否精准导入 + * 导入类型 0不是导入 1普通导入 2精准导入 */ - private Boolean isAccurateImport; + private Integer importType; /** * 删除标志 */ diff --git a/admin/src/main/java/com/multictrl/modules/business/q20/dto/Q20RouteUploadDTO.java b/admin/src/main/java/com/multictrl/modules/business/q20/dto/Q20RouteUploadDTO.java index f3b70ff..9bac970 100644 --- a/admin/src/main/java/com/multictrl/modules/business/q20/dto/Q20RouteUploadDTO.java +++ b/admin/src/main/java/com/multictrl/modules/business/q20/dto/Q20RouteUploadDTO.java @@ -24,9 +24,9 @@ public class Q20RouteUploadDTO { @JsonProperty(value = "flight_height", access = WRITE_ONLY) private Float flightHeight; - @Schema(description = "是否精准导入，仅本地存储用，不下发给设备") - @JsonProperty(value = "accurate_import", access = WRITE_ONLY) - private Boolean accurateImport; + @Schema(description = "导入类型 0不是导入 1普通导入 2精准导入") + @JsonProperty(value = "import_type", access = WRITE_ONLY) + private Integer importType; @Schema(description = "航线ID（存储用）") private String wayline; diff --git a/admin/src/main/java/com/multictrl/modules/business/q20/service/impl/Q20RouteServiceImpl.java b/admin/src/main/java/com/multictrl/modules/business/q20/service/impl/Q20RouteServiceImpl.java index ed17eee..1fa1e02 100644 --- a/admin/src/main/java/com/multictrl/modules/business/q20/service/impl/Q20RouteServiceImpl.java +++ b/admin/src/main/java/com/multictrl/modules/business/q20/service/impl/Q20RouteServiceImpl.java @@ -442,7 +442,7 @@ public class Q20RouteServiceImpl implements Q20RouteService { // 前端传入的可选覆盖字段 if (dto.getFlightHeight() != null) route.setFlightHeight(dto.getFlightHeight().doubleValue()); - if (dto.getAccurateImport() != null) route.setIsAccurateImport(dto.getAccurateImport()); + if (dto.getImportType() != null) route.setImportType(dto.getImportType()); // 补全 NOT NULL 字段默认值 if (route.getFlightHeight() == null) route.setFlightHeight(100.0); @@ -454,7 +454,7 @@ public class Q20RouteServiceImpl implements Q20RouteService { if (route.getFlyToWaylineMode() == null) route.setFlyToWaylineMode("safely"); if (route.getTotalDistance() == null) route.setTotalDistance(0.0); if (route.getExpectFlightTime() == null) route.setExpectFlightTime("0"); - if (route.getIsAccurateImport() == null) route.setIsAccurateImport(false); + if (route.getImportType() == null) route.setImportType(0); routeDao.insert(route); Long routeId = route.getId(); diff --git a/admin/src/main/java/com/multictrl/modules/business/service/impl/RouteServiceImpl.java b/admin/src/main/java/com/multictrl/modules/business/service/impl/RouteServiceImpl.java index bec6372..e5e455a 100644 --- a/admin/src/main/java/com/multictrl/modules/business/service/impl/RouteServiceImpl.java +++ b/admin/src/main/java/com/multictrl/modules/business/service/impl/RouteServiceImpl.java @@ -106,6 +106,7 @@ public class RouteServiceImpl extends CrudServiceImpl kmzInfo = KmzUtils.extractKmzAsBytes(file.getInputStream()); byte[] template = kmzInfo.get("template.kml"); - routeDTO = WpmlKmlParser.parseKmlFile(template, dto.getAccurateImport()); + routeDTO = WpmlKmlParser.parseKmlFile(template, importType == 2); byte[] waylines = kmzInfo.get("waylines.wpml"); - WpmlKmlParser.parseWpmlFile(waylines, routeDTO, dto.getAccurateImport()); + WpmlKmlParser.parseWpmlFile(waylines, routeDTO, importType == 2); log.debug("解析结果：{}", JsonUtils.toJsonString(routeDTO)); } catch (Exception e) { @@ -251,7 +253,7 @@ public class RouteServiceImpl extends CrudServiceImpl