Kaynağa Gözat

增加字段

huangtf 2 yıl önce
ebeveyn
işleme
e23b878978

+ 4 - 0
blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchivesAuto.java

@@ -21,6 +21,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -144,6 +145,9 @@ public class ArchivesAuto extends BaseEntity {
 	private String mileage;
 	private Integer fileType;
 	private Integer size;
+	@ApiModelProperty("文件大小")
+	private Long fileSize;
+
 	private String treeSort;
 	private Integer isOpen;
 	private Integer ischeck;

+ 1 - 0
blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -47,6 +47,7 @@
         <result column="is_auto_file" property="isAutoFile"/>
         <result column="auto_file_sort" property="autoFileSort"/>
         <result column="filing_unit" property="filingUnit"/>
+        <result column="file_size" property="fileSize"/>
         <collection property="approvalFileList" javaType="java.util.List"
                     select="approvalFile"
                     column="{archiveId=id}">

+ 3 - 5
blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveAutoPdfServiceImpl.java

@@ -131,7 +131,7 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
         archivesAuto.setPageN(100);
         archivesAuto.setMileage("统一里程信息");
         archivesAuto.setFileType(1);
-        archivesAuto.setSize(1024);
+        archivesAuto.setFileSize(1024L);
         archivesAuto.setTreeSort("ABC");
         archivesAuto.setIsOpen(1);
         archivesAuto.setIscheck(1);
@@ -562,7 +562,6 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
         List<Map<String, Object>> fileMapList = new ArrayList<>();
 
         //todo  增加获取总大小
-        Integer size = 0;
         for (ArchiveFile file:  datas) {
             idx++;
             //设置序号
@@ -588,7 +587,6 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
         }
         //设置总页数
         archive.setPageN(iStartPage - 1);
-        archive.setSize(size);
 
         // 找出最小和最大日期
         String minDate = "";
@@ -687,8 +685,8 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
         double totalSize = fileSizes.stream()
                 .mapToDouble(FileSize::getFileSize)
                 .sum();
-        Integer total = (int) Math.round(totalSize);
-        archive.setSize(total);
+        Long total = (Long) Math.round(totalSize);
+        archive.setFileSize(total);
 
         //todo 生成相册内容,待补充
         int i = 0;