From 54dfbd08110bd233d2e7519e4cb9b1ecc533649c Mon Sep 17 00:00:00 2001 From: sugus <1020570875@qq.com> Date: Mon, 20 Oct 2025 16:14:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=A3=9E=E8=A1=8C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=8E=A5=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aircraft/controller/AircraftLogController.java | 2 +- .../modules/aircraft/domain/AircraftDevice.java | 7 +++++++ .../modules/aircraft/domain/FNZZAircraftLog.java | 2 +- .../aircraft/domain/dto/AircraftLogPageDTO.java | 5 ++--- .../impl/AbstractAircraftLogServiceImpl.java | 12 ++++++------ .../service/impl/AircraftDeviceServiceImpl.java | 14 +++++++------- .../service/impl/FNZZAircraftLogServiceImpl.java | 2 +- .../com/aircraft/modules/order/biz/OrderBiz.java | 1 + .../modules/order/domain/vo/OrderTaskDetailVO.java | 6 ++++++ .../mapper/aircraft/AircraftDeviceMapper.xml | 1 + 10 files changed, 33 insertions(+), 19 deletions(-) diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/controller/AircraftLogController.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/controller/AircraftLogController.java index 7158589..ae4fa16 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/controller/AircraftLogController.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/controller/AircraftLogController.java @@ -46,7 +46,7 @@ public class AircraftLogController { AircraftDevice aircraftDevice = aircraftDeviceService.getById(dto.getId()); PageResult pageVOPageResult = new PageResult(); if (null != aircraftDevice) { - dto.setModel(aircraftDevice.getModel()); + dto.setDeviceCode(aircraftDevice.getDeviceCode()); pageVOPageResult = aircraftLogStrategyFactory.getAllStrategies() .stream() .filter(aircraftLogService -> aircraftLogService.support(AircraftDeviceBrandEnum.find(aircraftDevice.getBrand()))) diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/AircraftDevice.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/AircraftDevice.java index 49417f2..35376f0 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/AircraftDevice.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/AircraftDevice.java @@ -48,6 +48,13 @@ public class AircraftDevice extends BaseEntity { @ApiModelProperty(value = "设备型号") private String model; + /** + * 设备码 + */ + @NotBlank + @ApiModelProperty(value = "设备码") + private String deviceCode; + /** * 品牌（DJI，SF） */ diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/FNZZAircraftLog.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/FNZZAircraftLog.java index b1a5e54..04e6417 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/FNZZAircraftLog.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/FNZZAircraftLog.java @@ -115,7 +115,7 @@ public class FNZZAircraftLog extends AbstractAircraftTextLog implements Serializ private String latitude; @ApiModelProperty(value = "无人机经度坐标") - private String Stringitude; + private String longitude; @ApiModelProperty(value = "无人机俯仰角度") private String pitch; diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/dto/AircraftLogPageDTO.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/dto/AircraftLogPageDTO.java index 25b7d29..8b352af 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/dto/AircraftLogPageDTO.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/dto/AircraftLogPageDTO.java @@ -30,9 +30,8 @@ public class AircraftLogPageDTO { @ApiModelProperty("结束时间 yyyy-MM-dd HH:mm:mm") private String createTimeEnd; - @JSONField(serialize = false) - @ApiModelProperty(value = "设备型号") - private String model; + @ApiModelProperty(value = "设备码") + private String deviceCode; } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/service/impl/AbstractAircraftLogServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/service/impl/AbstractAircraftLogServiceImpl.java index aeaf6c3..3cc8c0e 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/service/impl/AbstractAircraftLogServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/service/impl/AbstractAircraftLogServiceImpl.java @@ -41,9 +41,9 @@ public abstract class AbstractAircraftLogServiceImpl getEntityClass(); /** - * 获取设备型号字段名 + * 获取设备码字段名 */ - protected abstract String getModelKey(); + protected abstract String getDeviceCodeKey(); /** * 获取时间字段名 @@ -61,7 +61,7 @@ public abstract class AbstractAircraftLogServiceImpl page(AircraftLogPageDTO dto) { try { - Query query = buildQuery(dto, getModelKey(), getTimeKey()); + Query query = buildQuery(dto, getDeviceCodeKey(), getTimeKey()); // 获取总数 long total = mongotemplate.count(query, getEntityClass()); @@ -85,7 +85,7 @@ public abstract class AbstractAircraftLogServiceImpl(resultList, total); } catch (Exception e) { log.error("分页查询无人机日志失败 - model: {}, page: {}, size: {}", - dto.getModel(), dto.getPage(), dto.getSize(), e); + dto.getDeviceCode(), dto.getPage(), dto.getSize(), e); throw new RuntimeException("查询无人机日志失败", e); } } @@ -94,7 +94,7 @@ public abstract class AbstractAircraftLogServiceImpl aircraftLogService.support(AircraftDeviceBrandEnum.find(item.getBrand()))) .findFirst() - .map(service -> service.getStateByTextLog(AircraftLogPageDTO.builder().model(item.getModel()).build())) + .map(service -> service.getStateByTextLog(AircraftLogPageDTO.builder().deviceCode(item.getDeviceCode()).build())) .ifPresent(item::setState); }); } @@ -84,8 +84,8 @@ public class AircraftDeviceServiceImpl extends ServiceImpl deviceImages = aircraftDevice.getDeviceImages() @@ -104,7 +104,7 @@ public class AircraftDeviceServiceImpl extends ServiceImpl deviceImages = aircraftDevice.getDeviceImages() @@ -161,16 +161,16 @@ public class AircraftDeviceServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); if (null != aircraftDevice.getId()) { queryWrapper.ne(AircraftDevice::getId, aircraftDevice.getId()); } queryWrapper.eq(AircraftDevice::getBrand, aircraftDevice.getBrand()) - .eq(AircraftDevice::getModel, aircraftDevice.getModel()); + .eq(AircraftDevice::getDeviceCode, aircraftDevice.getDeviceCode()); int count = this.count(queryWrapper); if (count > 0) { - throw new BadRequestException("设备型号重复"); + throw new BadRequestException("设备码重复"); } } } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/service/impl/FNZZAircraftLogServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/service/impl/FNZZAircraftLogServiceImpl.java index 4c035e8..a7d6607 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/service/impl/FNZZAircraftLogServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/service/impl/FNZZAircraftLogServiceImpl.java @@ -35,7 +35,7 @@ public class FNZZAircraftLogServiceImpl extends AbstractAircraftLogServiceImpl select d.id, d.name, + d.device_code, d.model, d.brand, d.use_type,