diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/service/impl/AircraftDeviceServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/service/impl/AircraftDeviceServiceImpl.java index 8cfe6b0..45609d7 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/service/impl/AircraftDeviceServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/service/impl/AircraftDeviceServiceImpl.java @@ -65,6 +65,7 @@ public class AircraftDeviceServiceImpl extends ServiceImpl { AttachmentMaterial attachmentMaterial = new AttachmentMaterial(); BeanUtils.copyProperties(deviceImage, attachmentMaterial); + attachmentMaterial.setId(null); attachmentMaterial.setBusinessId(aircraftDevice.getId()); attachmentMaterial.setBusinessType(BUSINESS_TYPE); return attachmentMaterial; diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/service/impl/AircraftInsuranceServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/service/impl/AircraftInsuranceServiceImpl.java index 2406bd9..6d19d1e 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/service/impl/AircraftInsuranceServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/service/impl/AircraftInsuranceServiceImpl.java @@ -55,6 +55,7 @@ public class AircraftInsuranceServiceImpl extends ServiceImpl { AttachmentMaterial attachmentMaterial = new AttachmentMaterial(); BeanUtils.copyProperties(InsuranceImage, attachmentMaterial); + attachmentMaterial.setId(null); attachmentMaterial.setBusinessId(aircraftInsurance.getId()); attachmentMaterial.setBusinessType(BUSINESS_TYPE); return attachmentMaterial; diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/domain/AttachmentMaterial.java b/aircraft-system/src/main/java/com/aircraft/modules/system/domain/AttachmentMaterial.java index 8e42861..d137506 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/domain/AttachmentMaterial.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/domain/AttachmentMaterial.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.aircraft.base.BaseEntity; import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -25,7 +26,7 @@ public class AttachmentMaterial extends BaseEntity { /** * 主键ID */ - @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "主键id") private Long id; /** 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 59f75a9..00606db 100644 --- a/aircraft-tools/src/main/java/com/aircraft/rest/LocalStorageController.java +++ b/aircraft-tools/src/main/java/com/aircraft/rest/LocalStorageController.java @@ -83,7 +83,7 @@ public class LocalStorageController { if(!FileUtil.IMAGE.equals(FileUtil.getFileType(suffix))){ throw new BadRequestException("只能上传图片"); } - LocalStorage localStorage = localStorageService.create(file.getName(), file); + LocalStorage localStorage = localStorageService.create(file.getOriginalFilename(), file); LocalAttachmentMaterialDTO localAttachmentMaterialDTO = new LocalAttachmentMaterialDTO(); localAttachmentMaterialDTO.setFileType(localStorage.getSuffix()); localAttachmentMaterialDTO.setFileSize(file.getSize());