sugus/aircraft-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:类型转换；文件上传路径

Browse Source
This commit is contained in:
sugus 2025-07-20 16:38:27 +08:00
parent b72fbd3b55
commit ee70a7d6a3
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/dto/AircraftDevicePageDTO.java
View File

@ -24,7 +24,6 @@ public class AircraftDevicePageDTO {
/** /**
* 飞行员（负责人）id * 飞行员（负责人）id
*/ */
@NotNull
@ApiModelProperty(value = "飞行员（负责人）id") @ApiModelProperty(value = "飞行员（负责人）id")
private Long employeesId; private Long employeesId;

4
aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/vo/AircraftDevicePageVO.java
View File

@ -23,13 +23,13 @@ public class AircraftDevicePageVO extends AircraftDevice {
* 区域 * 区域
*/ */
@ApiModelProperty(value = "区域") @ApiModelProperty(value = "区域")
private Long areaName; private String areaName;
/** /**
* 景区 * 景区
*/ */
@ApiModelProperty(value = "景区") @ApiModelProperty(value = "景区")
private Long scenicName; private String scenicName;
/** /**
* 飞行员（负责人）名称 * 飞行员（负责人）名称

4
aircraft-tools/src/main/java/com/aircraft/rest/LocalStorageController.java
View File

@ -71,7 +71,7 @@ public class LocalStorageController {
localAttachmentMaterialDTO.setFileSize(file.getSize()); localAttachmentMaterialDTO.setFileSize(file.getSize());
localAttachmentMaterialDTO.setNewFileName(localStorage.getRealName()); localAttachmentMaterialDTO.setNewFileName(localStorage.getRealName());
localAttachmentMaterialDTO.setSourceFileName(localStorage.getName()); localAttachmentMaterialDTO.setSourceFileName(localStorage.getName());
localAttachmentMaterialDTO.setFileFullPath(localStorage.getPath()); localAttachmentMaterialDTO.setFileFullPath("/file/" + localStorage.getType() + "/" + localStorage.getRealName());
return new ResponseEntity<>(localAttachmentMaterialDTO, HttpStatus.OK); return new ResponseEntity<>(localAttachmentMaterialDTO, HttpStatus.OK);
} }
@ -89,7 +89,7 @@ public class LocalStorageController {
localAttachmentMaterialDTO.setFileSize(file.getSize()); localAttachmentMaterialDTO.setFileSize(file.getSize());
localAttachmentMaterialDTO.setNewFileName(localStorage.getRealName()); localAttachmentMaterialDTO.setNewFileName(localStorage.getRealName());
localAttachmentMaterialDTO.setSourceFileName(localStorage.getName()); localAttachmentMaterialDTO.setSourceFileName(localStorage.getName());
localAttachmentMaterialDTO.setFileFullPath(localStorage.getPath()); localAttachmentMaterialDTO.setFileFullPath("/file/" + localStorage.getType() + "/" + localStorage.getRealName());
return new ResponseEntity<>(localAttachmentMaterialDTO, HttpStatus.OK); return new ResponseEntity<>(localAttachmentMaterialDTO, HttpStatus.OK);
} }