diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/dto/AircraftDevicePageDTO.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/dto/AircraftDevicePageDTO.java index 98b393b..8b0e330 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/dto/AircraftDevicePageDTO.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/dto/AircraftDevicePageDTO.java @@ -24,7 +24,6 @@ public class AircraftDevicePageDTO { /** * 飞行员(负责人)id */ - @NotNull @ApiModelProperty(value = "飞行员(负责人)id") private Long employeesId; diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/vo/AircraftDevicePageVO.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/vo/AircraftDevicePageVO.java index 1f2bbf3..c6cd711 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/vo/AircraftDevicePageVO.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/vo/AircraftDevicePageVO.java @@ -23,13 +23,13 @@ public class AircraftDevicePageVO extends AircraftDevice { * 区域 */ @ApiModelProperty(value = "区域") - private Long areaName; + private String areaName; /** * 景区 */ @ApiModelProperty(value = "景区") - private Long scenicName; + private String scenicName; /** * 飞行员(负责人)名称 diff --git a/aircraft-tools/src/main/java/com/aircraft/rest/LocalStorageController.java b/aircraft-tools/src/main/java/com/aircraft/rest/LocalStorageController.java index 00606db..6b25360 100644 --- a/aircraft-tools/src/main/java/com/aircraft/rest/LocalStorageController.java +++ b/aircraft-tools/src/main/java/com/aircraft/rest/LocalStorageController.java @@ -71,7 +71,7 @@ public class LocalStorageController { localAttachmentMaterialDTO.setFileSize(file.getSize()); localAttachmentMaterialDTO.setNewFileName(localStorage.getRealName()); localAttachmentMaterialDTO.setSourceFileName(localStorage.getName()); - localAttachmentMaterialDTO.setFileFullPath(localStorage.getPath()); + localAttachmentMaterialDTO.setFileFullPath("/file/" + localStorage.getType() + "/" + localStorage.getRealName()); return new ResponseEntity<>(localAttachmentMaterialDTO, HttpStatus.OK); } @@ -89,7 +89,7 @@ public class LocalStorageController { localAttachmentMaterialDTO.setFileSize(file.getSize()); localAttachmentMaterialDTO.setNewFileName(localStorage.getRealName()); localAttachmentMaterialDTO.setSourceFileName(localStorage.getName()); - localAttachmentMaterialDTO.setFileFullPath(localStorage.getPath()); + localAttachmentMaterialDTO.setFileFullPath("/file/" + localStorage.getType() + "/" + localStorage.getRealName()); return new ResponseEntity<>(localAttachmentMaterialDTO, HttpStatus.OK); }