Commit 3e9d4551 authored by huyuchen's avatar huyuchen

huych-电子档案批量导入第五次提交

parent f60dee3f
package com.yifu.cloud.plus.v1.batch.constants; package com.yifu.cloud.plus.v1.batch.constants;
import sun.net.www.content.image.gif;
import sun.net.www.content.image.jpeg;
import sun.net.www.content.image.png;
/** /**
* 电子档案相关常量 * 电子档案相关常量
* *
...@@ -121,6 +125,7 @@ public interface ArchiveConstants { ...@@ -121,6 +125,7 @@ public interface ArchiveConstants {
/** /**
* 支持的文件格式 * 支持的文件格式
*/ */
String[] SUPPORTED_FILE_FORMATS = {"png", "jpg", "jpeg", "xlsx", "xls", "doc", "docx", "pdf", "ppt", "pptx", "txt"}; String[] SUPPORTED_FILE_FORMATS = {"gif", "jpg", "jpeg", "png", "bmp", "xls", "xlsx", "csv", "pdf", "docx", "doc", "m4a", "mp3", "zip", "rar", "txt"};
} }
...@@ -976,7 +976,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo ...@@ -976,7 +976,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
// 有文件格式不符,整体失败,不再处理后续文件 // 有文件格式不符,整体失败,不再处理后续文件
ArchiveFeedbackVO feedback = createFeedbackVO(detail, materialType, ArchiveFeedbackVO feedback = createFeedbackVO(detail, materialType,
ArchiveConstants.PROCESS_RESULT_FAILED, ArchiveConstants.PROCESS_RESULT_FAILED,
"文件格式不符,文件格式需为png\\jpg\\jpeg\\xlsx\\xls\\doc\\docx\\pdf\\ppt\\pptx\\txt:" + fileName); "文件格式不符,文件格式需为gif|jpg|jpeg|png|bmp|xls|xlsx|csv|pdf|docx|doc|m4a|mp3|zip|rar|txt:" + fileName);
feedbackList.add(feedback); feedbackList.add(feedback);
return; return;
} }
...@@ -1050,7 +1050,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo ...@@ -1050,7 +1050,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
String fileName = file.getName(); String fileName = file.getName();
if (checkFileFormat(fileName)) { if (checkFileFormat(fileName)) {
// 有文件格式不符,整体失败 // 有文件格式不符,整体失败
return "文件格式不符,文件格式需为png\\jpg\\jpeg\\xlsx\\xls\\doc\\docx\\pdf\\ppt\\pptx\\txt:" + fileName; return "文件格式不符,文件格式需为gif|jpg|jpeg|png|bmp|xls|xlsx|csv|pdf|docx|doc|m4a|mp3|zip|rar|txt:" + fileName;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment