文件删除文件类型及文件大小

ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultFileDto.java

@@ -25,18 +25,8 @@ public class EbikeFaultFileDto {
      */
     private String fileName;
 
-    /**
-     * 文件类型
-     */
-    private String fileType;
-
     /**
      * 文件地址
      */
     private String fileUrl;
-
-    /**
-     * 文件大小
-     */
-    private Long fileSize;
 }

ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeRefundFileDto.java

@@ -22,18 +22,8 @@ public class EbikeRefundFileDto {
      */
     private String fileName;
 
-    /**
-     * 文件类型
-     */
-    private String fileType;
-
     /**
      * 文件地址
      */
     private String fileUrl;
-
-    /**
-     * 文件大小
-     */
-    private Long fileSize;
 }

ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeFaultFile.java

@@ -45,21 +45,11 @@ public class EbikeFaultFile implements Serializable {
      */
     private String fileName;
 
-    /**
-     * 文件类型
-     */
-    private String fileType;
-
     /**
      * 文件地址
      */
     private String fileUrl;
 
-    /**
-     * 文件大小
-     */
-    private Long fileSize;
-
     /**
      * 创建人
      */

ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeRefundFile.java

@@ -45,21 +45,11 @@ public class EbikeRefundFile implements Serializable {
      */
     private String fileName;
 
-    /**
-     * 文件类型
-     */
-    private String fileType;
-
     /**
      * 文件地址
      */
     private String fileUrl;
 
-    /**
-     * 文件大小
-     */
-    private Long fileSize;
-
     /**
      * 创建人
      */

ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeFaultFileVo.java

@@ -25,19 +25,9 @@ public class EbikeFaultFileVo implements Serializable {
      */
     private String fileName;
 
-    /**
-     * 文件类型
-     */
-    private String fileType;
-
     /**
      * 文件地址
      */
     private String fileUrl;
 
-    /**
-     * 文件大小
-     */
-    private Long fileSize;
-
 }

ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultReportServiceImpl.java

@@ -89,9 +89,7 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
                     .map(dto -> EbikeFaultFile.builder()
                             .reportId(reportId)
                             .fileName(dto.getFileName())
-                            .fileType(dto.getFileType())
                             .fileUrl(dto.getFileUrl())
-                            .fileSize(dto.getFileSize())
                             .createBy(ebikeFaultReportDto.getUserId())
                             .build())
                     .collect(Collectors.toList());
@@ -117,7 +115,6 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
         }
         try {
             InputStream inputStream = multipartFile.getInputStream();
-            String fileType = fileName.substring(fileName.lastIndexOf("."));
             String saveFileName = UUID.randomUUID() + fileName.substring(fileName.lastIndexOf("."));
             // 文件上传
             minioUtil.uploadFile(EbikeFileTypeEnum.FAULT_ATTACHMENT, inputStream, saveFileName);
@@ -125,8 +122,6 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
             return EbikeFaultFileVo.builder()
                     .fileName(saveFileName)
                     .fileUrl(fileUrl)
-                    .fileSize(multipartFile.getSize())
-                    .fileType(fileType)
                     .build();
         } catch (Exception e) {
             throw new EbikeException("上传文件失败!");
@@ -206,9 +201,7 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
                     EbikeFaultFile newFile = EbikeFaultFile.builder()
                             .reportId(ebikeFaultReportDto.getReportId())
                             .fileName(dto.getFileName())
-                            .fileType(dto.getFileType())
                             .fileUrl(dto.getFileUrl())
-                            .fileSize(dto.getFileSize())
                             //.createBy(userId)
                             .build();
                     filesToInsert.add(newFile);
@@ -270,9 +263,7 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
                 .map(file -> EbikeFaultFileDto.builder()
                         .fileId(file.getFileId())
                         .fileName(file.getFileName())
-                        .fileType(file.getFileType())
                         .fileUrl(file.getFileUrl())
-                        .fileSize(file.getFileSize())
                         .build())
                 .collect(Collectors.toList());
         // 获取损坏部件
@@ -333,9 +324,7 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
                     .map(file -> EbikeFaultFileDto.builder()
                             .fileId(file.getFileId())
                             .fileName(file.getFileName())
-                            .fileType(file.getFileType())
                             .fileUrl(file.getFileUrl())
-                            .fileSize(file.getFileSize())
                             .build())
                     .collect(Collectors.toList());
 

ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeRefundServiceImpl.java

@@ -124,9 +124,7 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
                     .map(dto -> EbikeRefundFile.builder()
                             .refundId(refundId)
                             .fileName(dto.getFileName())
-                            .fileType(dto.getFileType())
                             .fileUrl(dto.getFileUrl())
-                            .fileSize(dto.getFileSize())
                             .build())
                     .toList();
             ebikeRefundFileMapper.insertBatch(ebikeRefundFiles);
@@ -398,7 +396,6 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
         }
         try {
             InputStream inputStream = multipartFile.getInputStream();
-            String fileType = fileName.substring(fileName.lastIndexOf("."));
             String saveFileName = UUID.randomUUID() + fileName.substring(fileName.lastIndexOf("."));
             // 文件上传
             minioUtil.uploadFile(EbikeFileTypeEnum.USER_REFUND, inputStream, saveFileName);
@@ -406,8 +403,6 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
             return EbikeFaultFileVo.builder()
                     .fileName(saveFileName)
                     .fileUrl(fileUrl)
-                    .fileSize(multipartFile.getSize())
-                    .fileType(fileType)
                     .build();
         } catch (Exception e) {
             throw new EbikeException("上传文件失败!");

ebike-user/src/main/resources/db/init.sql

@@ -391,9 +391,7 @@ CREATE TABLE "public"."ebike_refund_file" (
           "refund_file_id" int8 NOT NULL DEFAULT nextval('ebike_refund_file_file_id_seq'::regclass),
           "refund_id" int8 NOT NULL,
           "file_name" varchar(100) COLLATE "pg_catalog"."default",
-          "file_type" varchar(10) COLLATE "pg_catalog"."default",
           "file_url" varchar(500) COLLATE "pg_catalog"."default",
-          "file_size" int8,
           "create_by" int8,
           "create_time" timestamp(6) DEFAULT CURRENT_TIMESTAMP,
           "update_by" int8,
@@ -403,9 +401,7 @@ CREATE TABLE "public"."ebike_refund_file" (
 COMMENT ON COLUMN "public"."ebike_refund_file"."file_id" IS '主键ID';
 COMMENT ON COLUMN "public"."ebike_refund_file"."refund_id" IS '退款主键id';
 COMMENT ON COLUMN "public"."ebike_refund_file"."file_name" IS '附件文件名';
-COMMENT ON COLUMN "public"."ebike_refund_file"."file_type" IS '附件类型';
 COMMENT ON COLUMN "public"."ebike_refund_file"."file_url" IS '附件地址';
-COMMENT ON COLUMN "public"."ebike_refund_file"."file_size" IS '附件大小';
 COMMENT ON COLUMN "public"."ebike_refund_file"."create_by" IS '创建人ID';
 COMMENT ON COLUMN "public"."ebike_refund_file"."create_time" IS '创建时间';
 COMMENT ON COLUMN "public"."ebike_refund_file"."update_by" IS '最后修改人ID';
@@ -482,9 +478,7 @@ CREATE TABLE "public"."ebike_fault_file" (
           "file_id" int8 NOT NULL DEFAULT nextval('ebike_attachment_file_file_id_seq'::regclass),
           "report_id" int8 NOT NULL,
           "file_name" varchar(100) COLLATE "pg_catalog"."default",
-          "file_type" varchar(10) COLLATE "pg_catalog"."default",
           "file_url" varchar(500) COLLATE "pg_catalog"."default",
-          "file_size" int8,
           "create_by" int8,
           "create_time" timestamp(6) DEFAULT CURRENT_TIMESTAMP,
           "update_by" int8,
@@ -494,9 +488,7 @@ CREATE TABLE "public"."ebike_fault_file" (
 COMMENT ON COLUMN "public"."ebike_fault_file"."file_id" IS '主键ID';
 COMMENT ON COLUMN "public"."ebike_fault_file"."report_id" IS '报告id';
 COMMENT ON COLUMN "public"."ebike_fault_file"."file_name" IS '附件文件名';
-COMMENT ON COLUMN "public"."ebike_fault_file"."file_type" IS '附件类型';
 COMMENT ON COLUMN "public"."ebike_fault_file"."file_url" IS '附件地址';
-COMMENT ON COLUMN "public"."ebike_fault_file"."file_size" IS '附件大小';
 COMMENT ON COLUMN "public"."ebike_fault_file"."create_by" IS '创建人ID';
 COMMENT ON COLUMN "public"."ebike_fault_file"."create_time" IS '创建时间';
 COMMENT ON COLUMN "public"."ebike_fault_file"."update_by" IS '最后修改人ID';