base/file-online-preview
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* tif图片预览，根据反馈的意见，已经全部修改

Browse Source 
1、配置文件、配置项默认值已改回image、tif
2、去掉了静态工具类上的@component 注解
3、修改OnlinePreview处理，在切换image方式预览时url中加入参数previewType=image，加入对应的处理，兼容在pdf预览模式下切换到JPG方式预览
This commit is contained in:
zhangzhen1979
2021-12-09 17:19:15 +08:00
committed by kl
parent 6dce47e47f
commit 6387ac21c9
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/cn/keking/config/ConfigConstants.java
View File

@ -53,7 +53,7 @@ public class ConfigConstants {
public static final String DEFAULT_TRUST_HOST = "default";
public static final String DEFAULT_PDF_DOWNLOAD_DISABLE = "true";
public static final String DEFAULT_FILE_UPLOAD_DISABLE = "false";
public static final String DEFAULT_TIF_PREVIEW_TYPE = "jpg";
public static final String DEFAULT_TIF_PREVIEW_TYPE = "tif";
public static Boolean isCacheEnabled() {
return cacheEnabled;

10
server/src/main/java/cn/keking/service/impl/TiffFilePreviewImpl.java
View File

@ -41,6 +41,7 @@ public class TiffFilePreviewImpl implements FilePreview {
public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
String tifPreviewType = ConfigConstants.getTifPreviewType();
String priveiwType = String.valueOf(model.getAttribute("previewType"));
if("tif".equalsIgnoreCase(tifPreviewType)){
@ -71,15 +72,14 @@ public class TiffFilePreviewImpl implements FilePreview {
if(fileJpg.exists()){
// 转换后的tif没用了，可以删掉了
fileTiff.delete();
if(fileTiff.exists()){
fileTiff.delete();
}
String baseUrl = BaseUrlFilter.getBaseUrl();
if("pdf".equalsIgnoreCase(tifPreviewType)){
if("pdf".equalsIgnoreCase(tifPreviewType) && !"image".equalsIgnoreCase(priveiwType)){
File filePdf = ConvertPicUtil.convertJpg2Pdf(fileDir + uuid + ".jpg", fileDir + uuid + ".pdf");
if(filePdf.exists()){
// 转换后的jpg没用了，可以删掉了
fileJpg.delete();
String pdfUrl = baseUrl + uuid + ".pdf";
model.addAttribute("pdfUrl", pdfUrl);

2
server/src/main/java/cn/keking/utils/ConvertPicUtil.java
View File

@ -8,13 +8,11 @@ import com.lowagie.text.pdf.PdfWriter;
import com.sun.media.jai.codec.ImageCodec;
import com.sun.media.jai.codec.ImageEncoder;
import com.sun.media.jai.codec.JPEGEncodeParam;
import org.springframework.stereotype.Component;
import javax.media.jai.JAI;
import javax.media.jai.RenderedOp;
import java.io.*;
@Component
public class ConvertPicUtil {
/**

4
server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java
View File

@ -70,6 +70,10 @@ public class OnlinePreviewController {
}
FileAttribute fileAttribute = fileHandlerService.getFileAttribute(fileUrl, req);
model.addAttribute("file", fileAttribute);
String previewType = req.getParameter("previewType");
model.addAttribute("previewType", previewType);
FilePreview filePreview = previewFactory.get(fileAttribute);
logger.info("预览文件url：{}，previewType：{}", fileUrl, fileAttribute.getType());
return filePreview.filePreviewHandle(fileUrl, model, fileAttribute);