Przeglądaj źródła

model继承baseModel

lengfaqiang 2 lat temu
rodzic
commit
2595761d25

+ 5 - 0
sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/common/StringConstant.java

@@ -21,6 +21,11 @@ public final class StringConstant {
     public static final String G = "G";
     public static final String GB = "GB";
 
+    public static final String ENCODING_UTF_EIGHT = "UTF-8";
+    public static final String ENCODING_UTF_SIXTEEN = "UTF-16";
+    public static final String ENCODING_GBK = "GBK";
+    public static final String ENCODING_ISO = "ISO8859-1";
+
     public StringConstant() {
     }
 }

+ 0 - 30
sckw-modules/sckw-file/src/main/java/com/sckw/file/model/FileInfo.java

@@ -19,7 +19,6 @@ public class FileInfo extends BaseModel {
 
     private static final long serialVersionUID = 8295075842951977226L;
 
-    private Long id;
     /**
      * 文件存储方式(OSS)
      */
@@ -53,33 +52,4 @@ public class FileInfo extends BaseModel {
      * 文件服务器存储相对路径
      */
     private String filePath;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 状态:0正常/1锁定
-     */
-//    private String status = "0";
-    /**
-     * 创建人
-     */
-//    private String createBy;
-    /**
-     * 创建时间
-     */
-//    private LocalDateTime createTime;
-    /**
-     * 更新人
-     */
-//    private String updateBy;
-    /**
-     * 更新时间
-     */
-//    private LocalDateTime updateTime;
-    /**
-     * 删除标识(0正常/1删除)
-     */
-//    private Integer delFlag = 0;
-
 }

+ 5 - 4
sckw-modules/sckw-file/src/main/java/com/sckw/file/service/FileService.java

@@ -115,7 +115,7 @@ public class FileService {
         if (!ObjectUtils.isEmpty(file) && file.length > 0) {
             List<MultipartFile> multipartFiles = Arrays.asList(file);
             for (MultipartFile multipartFile : multipartFiles) {
-                Map<String, Object> map = new HashMap<>();
+                Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
                 //文件大小
                 String fileSize = FileUtils.getFileSize(multipartFile);
                 //文件名称
@@ -204,10 +204,11 @@ public class FileService {
             zos.close();
             String header = request.getHeader("User-Agent").toUpperCase();
             if (header.contains("MSIE") || header.contains("TRIDENT") || header.contains("EDGE")) {
-                momentFileName = URLEncoder.encode(momentFileName, "utf-8");
-                momentFileName = momentFileName.replace("+", "%20");    //IE下载文件名空格变+号问题
+                momentFileName = URLEncoder.encode(momentFileName, StringConstant.ENCODING_UTF_EIGHT);
+                //IE下载文件名空格变+号问题
+                momentFileName = momentFileName.replace("+", "%20");
             } else {
-                momentFileName = new String(momentFileName.getBytes(), "ISO8859-1");
+                momentFileName = new String(momentFileName.getBytes(), StringConstant.ENCODING_ISO);
             }
             response.reset();
             response.setContentType("text/plain");