WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

文档拆分条款-图片回显

Browse Source
This commit is contained in:
liyawei
2022-04-01 13:40:34 +08:00
parent 44b79cf322
commit 5a7b7fb3d2
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+11 -6
View File
@@ -2,6 +2,7 @@ package com.jero.modules.split.service.impl;
import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ZipUtil; import cn.hutool.core.util.ZipUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@@ -147,7 +148,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
String ossFileId = valEO.getItemContent(); String ossFileId = valEO.getItemContent();
OSSFile ossFile = ossFileService.getById(ossFileId); OSSFile ossFile = ossFileService.getById(ossFileId);
String url = ossFile.getUrl(); String url = ossFile.getUrl();
String imgUrl = "uploadPath/" + url.substring(url.lastIndexOf("/")+1); // TODO 本地是反斜杠，服务器上是正斜杠？ String imgUrl = imgpath + url.substring(url.lastIndexOf("/")); // TODO 本地是反斜杠，服务器上是正斜杠？
valEO.setItemContent(imgUrl); valEO.setItemContent(imgUrl);
valContent = "<img class=\"wordImg\" src=\""+ valEO.getItemContent() +"\">"; valContent = "<img class=\"wordImg\" src=\""+ valEO.getItemContent() +"\">";
// valContent = valEO.getItemContent(); // valContent = valEO.getItemContent();
@@ -226,7 +227,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
String ossFileId = valEO.getItemContent(); String ossFileId = valEO.getItemContent();
OSSFile ossFile = ossFileService.getById(ossFileId); OSSFile ossFile = ossFileService.getById(ossFileId);
String url = ossFile.getUrl(); String url = ossFile.getUrl();
String imgUrl = "uploadPath/" + url.substring(url.lastIndexOf("/") + 1); String imgUrl = imgpath + url.substring(url.lastIndexOf("/"));
valEO.setItemContent(imgUrl); valEO.setItemContent(imgUrl);
} }
valContent = "<img class=\"wordImg\" src=\"" + valEO.getItemContent() + "\">"; valContent = "<img class=\"wordImg\" src=\"" + valEO.getItemContent() + "\">";
@@ -1145,10 +1146,13 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
int a = 0; int a = 0;
for (int y = 0; y < cellLength; y++) { for (int y = 0; y < cellLength; y++) {
if (!(row == null)) { if (!(row == null)) {
Cell cell = row.getCell(y); Cell cell = row.getCell(y); // cell 为空时会抛空指针异常
if(ObjectUtil.isNull(cell)) {
continue;
}
//设置单元格类型 //设置单元格类型
cell.setCellType(CellType.STRING); cell.setCellType(CellType.STRING);
String cellValue = null; String cellValue = null;
boolean isMerge = isMergedRegion(sheet, row.getRowNum(), cell.getColumnIndex()); boolean isMerge = isMergedRegion(sheet, row.getRowNum(), cell.getColumnIndex());
//判断是否具有合并单元格 //判断是否具有合并单元格
@@ -1168,6 +1172,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} }
} }
} }
// 当前行所有单元格均不为空时
if (a != cellLength && row != null) { if (a != cellLength && row != null) {
list.add(map); list.add(map);
} }
@@ -1595,7 +1600,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
sarFileSplitItemsEO.put("menu_id", menuId); sarFileSplitItemsEO.put("menu_id", menuId);
//添加val表数据 //添加val表数据
List<SarFileSplitItemsValEO> getValList = (List<SarFileSplitItemsValEO>) sarFileSplitItemsEO.get("itemValEOList"); // TODO List<SarFileSplitItemsValEO> getValList = (List<SarFileSplitItemsValEO>) sarFileSplitItemsEO.get("itemValEOList");
String itemConditions = ""; String itemConditions = "";
int ind = 1; int ind = 1;
if (getValList != null && !getValList.isEmpty()) { if (getValList != null && !getValList.isEmpty()) {
@@ -1605,7 +1610,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
if ("TEXT".equals(valEO.getType())) { if ("TEXT".equals(valEO.getType())) {
valContent += "<p>" + valEO.getItemContent() + "</p>"; valContent += "<p>" + valEO.getItemContent() + "</p>";
} else if ("IMG".equals(valEO.getType())) { } else if ("IMG".equals(valEO.getType())) {
// valContent += "<img class=\'wordImg\' src=\'"+ valEO.getItemContent() +"\'>"; valContent += "<img class=\"wordImg\" src=\""+ valEO.getItemContent() +"\">";
valContent += valEO.getItemContent(); valContent += valEO.getItemContent();
} else if ("TABLE".equals(valEO.getType())) { } else if ("TABLE".equals(valEO.getType())) {
valContent += valEO.getItemContent(); valContent += valEO.getItemContent();