From b72fbd3b55661f7f875a8c21d84f1e647ec73666 Mon Sep 17 00:00:00 2001
From: sugus <1020570875@qq.com>
Date: Sun, 20 Jul 2025 15:14:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9D=90=E6=96=99=E8=A1=A8ID=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aircraft/service/impl/AircraftDeviceServiceImpl.java       | 1 +
 .../aircraft/service/impl/AircraftInsuranceServiceImpl.java    | 1 +
 .../com/aircraft/modules/system/domain/AttachmentMaterial.java | 3 ++-
 .../main/java/com/aircraft/rest/LocalStorageController.java    | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

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<AircraftDeviceMapper,
                 .map(deviceImage -> {
                     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<AircraftInsuranceM
                 .map(InsuranceImage -> {
                     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());