QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(87338): 文档拆分--编辑--导入拆分结果，阻塞

Browse Source
This commit is contained in:
yjz
2024-07-29 10:59:07 +08:00
parent 3c3dad7753
commit f77b7b2971
11 changed files with 349 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/oss/controller/SplitFileController.java
+3 -3
View File
@@ -32,14 +32,14 @@ public class SplitFileController {
@ResponseBody @ResponseBody
@GetMapping("/getImage") @GetMapping("/getImage")
public void queryPageList(@RequestParam("fileName") String fileName, HttpServletResponse response, HttpServletRequest request) { public void queryPageList(@RequestParam("fileName") String fileName, HttpServletResponse response, HttpServletRequest request) {
String fileUrl = "/" + filePathCos + "\\" + fileName; String fileUrl = ("temp\\" + fileName).replace("\\\\", "\\");
response.setHeader("Content-Disposition", response.setHeader("Content-Disposition",
"attachment; filename=\"" + SplitFileUtils.encodeFileName(fileName, request) + "\""); "attachment; filename=\"" + SplitFileUtils.encodeFileName(fileName, request) + "\"");
response.setContentType("application/force-download"); response.setContentType("application/force-download");
// if (MinioUtil.doesObjectExist(fileUrl)) { // if (MinioUtil.doesObjectExist(fileUrl)) {
try (OutputStream os = response.getOutputStream(); try (OutputStream os = response.getOutputStream();
// InputStream fis = MinioUtil.download(fileUrl)) { // InputStream fis = MinioUtil.download(fileUrl)) {
InputStream fis = ObsBootUtil.getOssFile(fileUrl)) { InputStream fis = ObsBootUtil.getOssFile(fileUrl)) {
int len = 0; int len = 0;
while ((len = fis.read()) != -1) { while ((len = fis.read()) != -1) {
os.write(len); os.write(len);
laws-modules/pom.xml
+3 -2
View File
@@ -175,8 +175,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15to18</artifactId> <artifactId>bcprov-jdk15on</artifactId>
<version>1.64</version> <version>1.56</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
+2 -1
View File
@@ -303,7 +303,8 @@ public class DocumentSplitController {
@GetMapping("/queryItemsValList") @GetMapping("/queryItemsValList")
@ApiOperationSupport(order = 12) @ApiOperationSupport(order = 12)
public Result<List<SarFileSplitItemsValEO>> queryItemsValList(String id) { public Result<List<SarFileSplitItemsValEO>> queryItemsValList(String id) {
return Result.OK(documentSplitService.queryItemsValList(id)); List<SarFileSplitItemsValEO> data = documentSplitService.queryItemsValList(id);
return Result.OK(data);
} }
/** /**
laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+1 -2
View File
@@ -969,8 +969,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
for (SarFileSplitItemsValEO sarFileSplitItemsValEO : sarFileSplitItemsValEOS) { for (SarFileSplitItemsValEO sarFileSplitItemsValEO : sarFileSplitItemsValEOS) {
String imgPath = sarFileSplitItemsValEO.getItemContent(); String imgPath = sarFileSplitItemsValEO.getItemContent();
if (DocumentSplitCommon.IMG.equals(sarFileSplitItemsValEO.getType()) && org.apache.commons.lang.StringUtils.isNotEmpty(imgPath)) { if (DocumentSplitCommon.IMG.equals(sarFileSplitItemsValEO.getType()) && org.apache.commons.lang.StringUtils.isNotEmpty(imgPath)) {
String imgName = imgPath.substring(imgPath.lastIndexOf("/") + 1); sarFileSplitItemsValEO.setImgName(imgPath);
sarFileSplitItemsValEO.setImgName(imgName);
} }
if (DocumentSplitCommon.TEXT.equals(sarFileSplitItemsValEO.getType()) && org.apache.commons.lang.StringUtils.isNotEmpty(imgPath)){ if (DocumentSplitCommon.TEXT.equals(sarFileSplitItemsValEO.getType()) && org.apache.commons.lang.StringUtils.isNotEmpty(imgPath)){
sarFileSplitItemsValEO.setItemContent(HtmlUtils.htmlUnescape(sarFileSplitItemsValEO.getItemContent())); sarFileSplitItemsValEO.setItemContent(HtmlUtils.htmlUnescape(sarFileSplitItemsValEO.getItemContent()));
laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java
+10
View File
@@ -2,7 +2,9 @@ package com.jero.modules.split.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.documenttool.service.IDocumentSplitService; import com.jero.modules.laws.documenttool.service.IDocumentSplitService;
import com.jero.modules.split.entity.SarFileSplitMenuEO; import com.jero.modules.split.entity.SarFileSplitMenuEO;
import com.jero.modules.split.mapper.SarFileSplitMenuEOMapper; import com.jero.modules.split.mapper.SarFileSplitMenuEOMapper;
@@ -66,6 +68,14 @@ public class SarFileSplitMenuEOController extends JeroController<SarFileSplitMen
return Result.OK("修改成功",sarFileSplitMenuEO); return Result.OK("修改成功",sarFileSplitMenuEO);
} }
@ApiOperation(value = "标准拆分条款目录-修改层级")
@GetMapping("/updateMenuLevel")
// @RequiresPermissions("split:sarFileSplitMenu:updateMenuLevel")
public Result<SarFileSplitMenuEO> updateMenuLevel(String id, String parentId) {
sarFileSplitMenuEOService.updateMenuLevel(id, parentId);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
@ApiOperation(value = "标准拆分条款目录-向上或向下移动") @ApiOperation(value = "标准拆分条款目录-向上或向下移动")
@PostMapping("/moveUpOrDown") @PostMapping("/moveUpOrDown")
@RequiresPermissions(value = {"split:sarFileSplitMenu:moveUp","split:sarFileSplitMenu:moveDown"}, logical = Logical.OR) @RequiresPermissions(value = {"split:sarFileSplitMenu:moveUp","split:sarFileSplitMenu:moveDown"}, logical = Logical.OR)
laws-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java
+8
View File
@@ -25,6 +25,8 @@ public interface SarFileSplitMenuEOMapper extends BaseMapper<SarFileSplitMenuEO>
int updateDisplaySeqCut(SarFileSplitMenuEO sarFileSplitMenuEO); int updateDisplaySeqCut(SarFileSplitMenuEO sarFileSplitMenuEO);
List<SarFileSplitMenuEO> queryByPidAndSelf(SarFileSplitMenuEO sarFileSplitMenuEO);
List<SarFileSplitMenuEO> queryByPidExcpetSelf(SarFileSplitMenuEO sarFileSplitMenuEO); List<SarFileSplitMenuEO> queryByPidExcpetSelf(SarFileSplitMenuEO sarFileSplitMenuEO);
int deleteByPId(@Param("idList") List<String> idList); int deleteByPId(@Param("idList") List<String> idList);
@@ -71,4 +73,10 @@ public interface SarFileSplitMenuEOMapper extends BaseMapper<SarFileSplitMenuEO>
List<SarFileSplitMenuEO> selectBatchIds(@Param("idList") List<String> idList); List<SarFileSplitMenuEO> selectBatchIds(@Param("idList") List<String> idList);
SarFileSplitMenuEO findById(String id); SarFileSplitMenuEO findById(String id);
SarFileSplitMenuEO findLastByParentId(String parentId);
List<SarFileSplitMenuEO> queryByGTDisplaySeq(@Param("infoId") String infoId, @Param("displaySeq") Long displaySeq);
List<SarFileSplitMenuEO> findByParentId(String pId);
} }
laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml
+26
View File
@@ -260,6 +260,14 @@
where display_seq &lt;= #{displaySeqEnd} and display_seq &gt; #{displaySeqStart} and valid_flag = 0 and info_id = #{infoId} where display_seq &lt;= #{displaySeqEnd} and display_seq &gt; #{displaySeqStart} and valid_flag = 0 and info_id = #{infoId}
</update> </update>
<select id="queryByPidAndSelf" resultMap="BaseResultMap">
select m.*
from SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querySplitMenuChildren (#{id})) AS pids ) t
WHERE
FIND_IN_SET( m.id, t.pids )
AND valid_flag = '0'
</select>
<select id="queryByPidExcpetSelf" resultMap="BaseResultMap" parameterType="com.jero.modules.split.entity.SarFileSplitMenuEO"> <select id="queryByPidExcpetSelf" resultMap="BaseResultMap" parameterType="com.jero.modules.split.entity.SarFileSplitMenuEO">
select m.* select m.*
from SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querySplitMenuChildren (#{id})) AS pids ) t from SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querySplitMenuChildren (#{id})) AS pids ) t
@@ -360,4 +368,22 @@
where id = #{id} where id = #{id}
</select> </select>
<select id="findLastByParentId" resultMap="BaseResultMap">
select * from SAR_FILE_SPLIT_MENU
where parent_id = #{parentId} AND valid_flag = '0'
order by display_seq desc
limit 1
</select>
<select id="queryByGTDisplaySeq" resultMap="BaseResultMap">
select * from SAR_FILE_SPLIT_MENU
where display_seq &gt; #{displaySeq} and info_id = #{infoId}
AND valid_flag = '0'
</select>
<select id="findByParentId" resultMap="BaseResultMap">
select * from SAR_FILE_SPLIT_MENU
where parent_id = #{parentId} AND valid_flag = '0'
order by display_seq asc
</select>
</mapper> </mapper>
laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java
+2
View File
@@ -57,4 +57,6 @@ public interface ISarFileSplitMenuEOService extends IService<SarFileSplitMenuEO>
List<SarFileSplitMenuEO> queryByInfoId(String infoId); List<SarFileSplitMenuEO> queryByInfoId(String infoId);
Result moveUpOrDown(JSONObject json); Result moveUpOrDown(JSONObject json);
void updateMenuLevel(String id, String parentId);
} }
laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
+32 -32
View File
@@ -2,6 +2,8 @@ package com.jero.modules.split.service.impl;
import cn.hutool.core.lang.RegexPool; import cn.hutool.core.lang.RegexPool;
import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.ReUtil;
import cn.hutool.http.Header;
import cn.hutool.http.HttpRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
@@ -39,6 +41,8 @@ import org.openxmlformats.schemas.drawingml.x2006.main.CTGraphicalObject;
import org.openxmlformats.schemas.drawingml.x2006.picture.CTPicture; import org.openxmlformats.schemas.drawingml.x2006.picture.CTPicture;
import org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.CTAnchor; import org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.CTAnchor;
import org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.CTInline; import org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.CTInline;
import org.openxmlformats.schemas.officeDocument.x2006.math.CTOMath;
import org.openxmlformats.schemas.officeDocument.x2006.math.CTOMathPara;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDrawing; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDrawing;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTLevelText; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTLevelText;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
@@ -218,34 +222,34 @@ public class FileSpiltService {
// //处理段落中的文本以及图片 // //处理段落中的文本以及图片
// handleParagraphRun(content, (XWPFRun) child, imageParser); // handleParagraphRun(content, (XWPFRun) child, imageParser);
//} else //} else
// if (child instanceof CTOMath) { if (child instanceof CTOMath) {
// CTOMath ctoMath = (CTOMath) child; CTOMath ctoMath = (CTOMath) child;
// String xmlText = ctoMath.xmlText().replaceAll("xml-fragment","m:oMath"); String xmlText = ctoMath.xmlText().replaceAll("xml-fragment","m:oMath");
// Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
// map.put("encode", xmlText); map.put("encode", xmlText);
// String post = HttpRequest.post(mathToImgUrl) String post = HttpRequest.post(mathToImgUrl)
// .header(Header.CONTENT_TYPE, "application/json") .header(Header.CONTENT_TYPE, "application/json")
// .body(xmlText) .body(xmlText)
// .execute().body(); .execute().body();
// //String post = HttpUtil.post(mathToImgUrl, map); //String post = HttpUtil.post(mathToImgUrl, map);
// if (messageList.size() > 0) { if (messageList.size() > 0) {
// addItermsMathImage(messageList.get(messageList.size() - 1), itemValList, post); addItermsMathImage(messageList.get(messageList.size() - 1), itemValList, post);
// } }
// } }
// else if (child instanceof CTOMathPara) { else if (child instanceof CTOMathPara) {
// CTOMathPara ctoMathPara = (CTOMathPara) child; CTOMathPara ctoMathPara = (CTOMathPara) child;
// String xmlText = ctoMathPara.xmlText().replaceAll("xml-fragment","m:oMath");; String xmlText = ctoMathPara.xmlText().replaceAll("xml-fragment","m:oMath");;
// Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
// map.put("encode",xmlText); map.put("encode",xmlText);
// String post = HttpRequest.post(mathToImgUrl) String post = HttpRequest.post(mathToImgUrl)
// .header(Header.CONTENT_TYPE, "application/json") .header(Header.CONTENT_TYPE, "application/json")
// .body(xmlText) .body(xmlText)
// .execute().body(); .execute().body();
// //String post = HttpUtil.post(mathToImgUrl, map); //String post = HttpUtil.post(mathToImgUrl, map);
// if (messageList.size() > 0) { if (messageList.size() > 0) {
// addItermsMathImage(messageList.get(messageList.size() - 1), itemValList, post); addItermsMathImage(messageList.get(messageList.size() - 1), itemValList, post);
// } }
// } }
} }
for (XWPFRun xwrun : p.getRuns()) { for (XWPFRun xwrun : p.getRuns()) {
@@ -1040,10 +1044,6 @@ public class FileSpiltService {
return startDigitList; return startDigitList;
} }
public static void main(String[] args) {
getOneStartDigit("Scope", SplitFileTypeTypeEnum.UN);
}
public static String getOneStartDigit(String arr, SplitFileTypeTypeEnum enumByValue) { public static String getOneStartDigit(String arr, SplitFileTypeTypeEnum enumByValue) {
//\p{Punct} 标点符号：!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~ //\p{Punct} 标点符号：!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
//\p{Space} 空白字符：[ \t\n\x0B\f\r] //\p{Space} 空白字符：[ \t\n\x0B\f\r]
laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+205 -39
View File
@@ -24,6 +24,7 @@ import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServi
import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.document.enums.FieldTypeEnum;
import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.document.service.IBussDocumentLibraryEOService;
import com.jero.modules.laws.common.mapper.LawsCommonMapper; import com.jero.modules.laws.common.mapper.LawsCommonMapper;
import com.jero.modules.laws.documenttool.common.DirectoryComparator;
import com.jero.modules.laws.documenttool.mapper.DocumentSplitMapper; import com.jero.modules.laws.documenttool.mapper.DocumentSplitMapper;
import com.jero.modules.laws.documenttool.service.IDocumentSplitService; import com.jero.modules.laws.documenttool.service.IDocumentSplitService;
import com.jero.modules.laws.labeldatabase.entity.LawsLabelDatabase; import com.jero.modules.laws.labeldatabase.entity.LawsLabelDatabase;
@@ -94,6 +95,7 @@ import sun.misc.BASE64Decoder;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
import java.math.BigDecimal;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.nio.file.StandardOpenOption; import java.nio.file.StandardOpenOption;
@@ -1468,20 +1470,37 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
// if (fileTypeStr.contains(fileSuffix)) { // if (fileTypeStr.contains(fileSuffix)) {
// state = "1"; // state = "1";
// } // }
OSSFile oSSFile = ossFileService.uploadLocalForSplit(multipartFile, "",state,null); // OSSFile oSSFile = ossFileService.uploadLocalForSplit(multipartFile, "",state,null);
if(oSSFile!=null){ // if(oSSFile!=null){
// oSSFile = ossFileService.getById(oSSFile.getId()); // oSSFile = ossFileService.getById(oSSFile.getId());
isText = false; isText = false;
// BASE64Encoder base64Encoder = new BASE64Encoder(); //// BASE64Encoder base64Encoder = new BASE64Encoder();
// String encode = base64Encoder.encode(oSSFile.getUrl().getBytes(StandardCharsets.UTF_8)); //// String encode = base64Encoder.encode(oSSFile.getUrl().getBytes(StandardCharsets.UTF_8));
String path = oSSFile.getUrl(); // String path = oSSFile.getUrl();
// String path = imgpath + oSSFile.getUrl().substring(oSSFile.getUrl().lastIndexOf(File.separator)+1); //// String path = imgpath + oSSFile.getUrl().substring(oSSFile.getUrl().lastIndexOf(File.separator)+1);
// String imgCon = "<img class=\"wordImg\" src=\"" + path + "\">"; //// String imgCon = "<img class=\"wordImg\" src=\"" + path + "\">";
valEO.setType("IMG"); // valEO.setType("IMG");
// valEO.setItemContent(imgCon); //// valEO.setItemContent(imgCon);
valEO.setItemContent(path); // valEO.setItemContent(path);
} //
// String imageName = UUIDUtils.randomUUID10() + multipartFile.getName();
// String filepathandname = uploadCospath + "/" + imageName;
try {
// String paths = splitUrl+imageName;
// MinioUtil.uploadByte(bytev, filepathandname);
String upload = ObsBootUtil.upload(multipartFile, "temp");
OSSFile ossFile = new OSSFile();
ossFile.setId(String.valueOf(SnowflakeUtils.snowflake()));
ossFile.setFileName(multipartFile.getName());
ossFile.setUrl(upload);
ossFileService.save(ossFile);
valEO.setType("IMG");
valEO.setItemContent(splitUrl+upload.replace("temp\\", ""));
} catch (Exception e) {
e.printStackTrace();
}
// }
} }
if (isText) { if (isText) {
valEO.setType("TEXT"); valEO.setType("TEXT");
@@ -1518,20 +1537,34 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
// state = "1"; // state = "1";
// } // }
// OSSFile oSSFile = ossFileService.uploadLocalOfCos(multipartFile, "", state,null); // OSSFile oSSFile = ossFileService.uploadLocalOfCos(multipartFile, "", state,null);
OSSFile oSSFile = ossFileService.uploadLocalForSplit(multipartFile, "",state,null); // OSSFile oSSFile = ossFileService.uploadLocalForSplit(multipartFile, "",state,null);
// oSSFile = ossFileService.getById(oSSFile.getId()); // oSSFile = ossFileService.getById(oSSFile.getId());
if (oSSFile != null) { // if (oSSFile != null) {
// oSSFile = ossFileService.getById(oSSFile.getId()); // oSSFile = ossFileService.getById(oSSFile.getId());
isText = false; isText = false;
// BASE64Encoder base64Encoder = new BASE64Encoder(); //// BASE64Encoder base64Encoder = new BASE64Encoder();
// String encode = base64Encoder.encode(oSSFile.getUrl().getBytes(StandardCharsets.UTF_8)); //// String encode = base64Encoder.encode(oSSFile.getUrl().getBytes(StandardCharsets.UTF_8));
String path = oSSFile.getUrl(); // String path = oSSFile.getUrl();
// String path = imgpath + oSSFile.getUrl().substring(oSSFile.getUrl().lastIndexOf(File.separator)+1); //// String path = imgpath + oSSFile.getUrl().substring(oSSFile.getUrl().lastIndexOf(File.separator)+1);
// String imgCon = "<img class=\"wordImg\" src=\"" + path + "\">"; //// String imgCon = "<img class=\"wordImg\" src=\"" + path + "\">";
// valEO.setType("IMG");
//// valEO.setItemContent(imgCon);
// valEO.setItemContent(path);
// }
try {
// String paths = splitUrl+imageName;
// MinioUtil.uploadByte(bytev, filepathandname);
String upload = ObsBootUtil.upload(multipartFile, "temp");
OSSFile ossFile = new OSSFile();
ossFile.setId(String.valueOf(SnowflakeUtils.snowflake()));
ossFile.setFileName(multipartFile.getName());
ossFile.setUrl(upload);
ossFileService.save(ossFile);
valEO.setType("IMG"); valEO.setType("IMG");
// valEO.setItemContent(imgCon); valEO.setItemContent(splitUrl+upload.replace("temp\\", ""));
valEO.setItemContent(path); } catch (Exception e) {
e.printStackTrace();
} }
} }
if (isText) { if (isText) {
@@ -1567,19 +1600,33 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
MultipartFile multipartFile = createMfileByPath(url); MultipartFile multipartFile = createMfileByPath(url);
String state = "0"; String state = "0";
// OSSFile oSSFile = ossFileService.uploadLocalOfCos(multipartFile, "", state,null); // OSSFile oSSFile = ossFileService.uploadLocalOfCos(multipartFile, "", state,null);
OSSFile oSSFile = ossFileService.uploadLocalForSplit(multipartFile, "",state,null); // OSSFile oSSFile = ossFileService.uploadLocalForSplit(multipartFile, "",state,null);
// oSSFile = ossFileService.getById(oSSFile.getId()); //// oSSFile = ossFileService.getById(oSSFile.getId());
if (oSSFile != null) { // if (oSSFile != null) {
isText = false; isText = false;
// BASE64Encoder base64Encoder = new BASE64Encoder(); //// BASE64Encoder base64Encoder = new BASE64Encoder();
// String encode = base64Encoder.encode(oSSFile.getUrl().getBytes(StandardCharsets.UTF_8)); //// String encode = base64Encoder.encode(oSSFile.getUrl().getBytes(StandardCharsets.UTF_8));
String path = oSSFile.getUrl(); // String path = oSSFile.getUrl();
// String path = imgpath + oSSFile.getUrl().substring(oSSFile.getUrl().lastIndexOf(File.separator)+1); //// String path = imgpath + oSSFile.getUrl().substring(oSSFile.getUrl().lastIndexOf(File.separator)+1);
// String imgCon = "<img class=\"wordImg\" src=\"" + path + "\">"; //// String imgCon = "<img class=\"wordImg\" src=\"" + path + "\">";
// valEO.setType("IMG");
//// valEO.setItemContent(imgCon);
// valEO.setItemContent(path);
// }
try {
// String paths = splitUrl+imageName;
// MinioUtil.uploadByte(bytev, filepathandname);
String upload = ObsBootUtil.upload(multipartFile, "temp");
OSSFile ossFile = new OSSFile();
ossFile.setId(String.valueOf(SnowflakeUtils.snowflake()));
ossFile.setFileName(multipartFile.getName());
ossFile.setUrl(upload);
ossFileService.save(ossFile);
valEO.setType("IMG"); valEO.setType("IMG");
// valEO.setItemContent(imgCon); valEO.setItemContent(splitUrl+upload.replace("temp\\", ""));
valEO.setItemContent(path); } catch (Exception e) {
e.printStackTrace();
} }
} }
if (isText) { if (isText) {
@@ -2080,11 +2127,22 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
continue; continue;
} }
String cellValue = null; String cellValue = null;
if (!(CellType.NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell))) { if (!(CellType.NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell))) {
//设置单元格类型 //设置单元格类型
if (y == 0){
// 条文号精度丢失问题
try {
double numericCellValue = cell.getNumericCellValue();
BigDecimal bigDecimal = BigDecimal.valueOf(numericCellValue);
String str = String.valueOf(bigDecimal);
if (str.endsWith(".0")){
str = str.substring(0, str.length() - 2);
}
cell.setCellValue(str);
} catch (Exception e) {
}
}
cell.setCellType(CellType.STRING); cell.setCellType(CellType.STRING);
} }
boolean isMerge = isMergedRegion(sheet, row.getRowNum(), cell.getColumnIndex()); boolean isMerge = isMergedRegion(sheet, row.getRowNum(), cell.getColumnIndex());
//判断是否具有合并单元格 //判断是否具有合并单元格
@@ -2097,7 +2155,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
// 进行格式转换 // 进行格式转换
DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
cellValue = df.format(d); cellValue = df.format(d);
} else { }else {
cellValue = cell.getStringCellValue(); cellValue = cell.getStringCellValue();
} }
} }
@@ -2729,8 +2787,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
String[] treePathList = value.split(","); String[] treePathList = value.split(",");
for (String treePath : treePathList) { for (String treePath : treePathList) {
List<SysDictItem> path = List<SysDictItem> path =
sysDictItemList.stream().filter(o -> treePath.equals(o.getLevelPath()) sysDictItemList.stream().filter(o -> treePath.equals(o.getLevelPath()))
|| treePath.equals(o.getItemText()))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (!path.isEmpty()){ if (!path.isEmpty()){
if (path.size() > 1) { if (path.size() > 1) {
@@ -2934,6 +2991,13 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
insertInfo2(finalSarFileSplitItemsEO,id,"import"); // 添加条款 insertInfo2(finalSarFileSplitItemsEO,id,"import"); // 添加条款
} }
/**
* 外部标准用
* @param addItemsEOList
* @param treeListDisplay
* @param menuId
* @return
*/
private List<SarFileSplitMenuTreeNode> buildTree(List<Map<String, Object>> addItemsEOList, Long treeListDisplay, String menuId){ private List<SarFileSplitMenuTreeNode> buildTree(List<Map<String, Object>> addItemsEOList, Long treeListDisplay, String menuId){
//排序 //排序
Collections.sort(addItemsEOList, new Comparator<Map<String, Object>>() { Collections.sort(addItemsEOList, new Comparator<Map<String, Object>>() {
@@ -2948,10 +3012,105 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
for (Map<String, Object> itemEO : addItemsEOList) { for (Map<String, Object> itemEO : addItemsEOList) {
String itemNum = itemEO.get("item_num").toString(); String itemNum = itemEO.get("item_num").toString();
// if(itemNum.matches(regex) || itemNum.contains("附录")) { // TODO 解除条款号格式限制 // if(itemNum.matches(regex) || itemNum.contains("附录")) { // TODO 解除条款号格式限制
SarFileSplitMenuTreeNode treeNode = new SarFileSplitMenuTreeNode();
treeNode.setId(UUIDUtils.randomUUID20());
treeNode.setName(itemNum);
if(itemNum.matches(regex)) {
//父级是 总目录时，不做处理
if(itemNum.contains(".")) {
String parentName = itemNum.substring(0, itemNum.lastIndexOf("."));
treeNode.setParentName(parentName);
List<SarFileSplitMenuTreeNode> p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(p)) {
//其他节点
treeNode.setParentId(p.get(0).getId());
}else{
//一级节点
treeNode.setParentId(menuId);
}
}else{
treeNode.setParentId(menuId);
}
}else{
treeNode.setParentId(menuId);
}
++treeListDisplay;
treeNode.setOrderNum(treeListDisplay);
treeNode.setItemName(itemEO.get("item_title").toString());
treeNode.setItemId(itemEO.get("id").toString());
treeNodeList.add(treeNode);
// }
}
//其他节点
/*for (SarFileSplitItemsEO itemEO : addItemsEOList) {
String itemNum = itemEO.getItemsNum();
if (itemNum.matches(regex)) {
SarFileSplitMenuTreeNode treeNode = new SarFileSplitMenuTreeNode(); SarFileSplitMenuTreeNode treeNode = new SarFileSplitMenuTreeNode();
String parentName = itemNum.substring(0, itemNum.lastIndexOf("."));
List<SarFileSplitMenuTreeNode> p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(p)) {
treeNode.setParentId(p.get(0).getId());
}
treeNode.setId(UUIDUtils.randomUUID20()); treeNode.setId(UUIDUtils.randomUUID20());
treeNode.setName(itemNum); treeNode.setName(itemNum);
if(itemNum.matches(regex)) { treeNode.setParentName(parentName);
//判断格式
if (itemNum.lastIndexOf(".") + 1 < itemNum.length()) {
// treeNode.setOrderNum(Long.valueOf(itemNum.substring(itemNum.lastIndexOf(".") + 1, itemNum.length())));
treeNode.setOrderNum(p.get(0).getOrderNum() + Long.valueOf(itemNum.substring(itemNum.lastIndexOf(".") + 1, itemNum.length())));
}
treeNode.setItemName(itemEO.getItemsName());
treeNode.setItemId(itemEO.getId());
treeNodeList.add(treeNode);
}
}*/
return treeNodeList;
}
/**
* 欧标用
* @param addItemsEOList
* @param treeListDisplay
* @param menuId
* @return
*/
private List<SarFileSplitMenuTreeNode> buildTree2(List<Map<String, Object>> addItemsEOList, Long treeListDisplay, String menuId){
// 过滤出 非正常编号的数据
String regexs = "^[0-9]{0}([0-9]|[.])+$";
List<Map<String, Object>> otherList =
addItemsEOList.stream()
.filter(v -> !String.valueOf(v.get("item_num")).matches(regexs))
.collect(Collectors.toList());
otherList.stream().map(v -> v.get("item_num"))
.collect(Collectors.toList()).forEach(v -> {
System.out.println(v);
});
// 排序
addItemsEOList.removeAll(otherList);
addItemsEOList.sort(new DirectoryComparator());
addItemsEOList.addAll(otherList);
List<SarFileSplitMenuTreeNode> treeNodeList = new ArrayList<>();
List<String> dotList = new ArrayList<>();
String regex = "^[0-9]{0}([0-9]|[.])+$"; //TODO 待优化：数字和点必须交替
for (Map<String, Object> itemEO : addItemsEOList) {
String itemNum = itemEO.get("item_num").toString();
// if(itemNum.matches(regex) || itemNum.contains("附录")) { // TODO 解除条款号格式限制
SarFileSplitMenuTreeNode treeNode = new SarFileSplitMenuTreeNode();
treeNode.setId(UUIDUtils.randomUUID20());
if (itemNum.endsWith(".")){
// 处理末尾为小数点的数据
itemNum = itemNum.substring(0, itemNum.length() - 1);
dotList.add(treeNode.getId());
}
treeNode.setName(itemNum);
// if(itemNum.matches(regex)) {
//父级是 总目录时，不做处理 //父级是 总目录时，不做处理
if(itemNum.contains(".")) { if(itemNum.contains(".")) {
String parentName = itemNum.substring(0, itemNum.lastIndexOf(".")); String parentName = itemNum.substring(0, itemNum.lastIndexOf("."));
@@ -2967,9 +3126,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
}else{ }else{
treeNode.setParentId(menuId); treeNode.setParentId(menuId);
} }
}else{ // }else{
treeNode.setParentId(menuId); // treeNode.setParentId(menuId);
} // }
++treeListDisplay; ++treeListDisplay;
treeNode.setOrderNum(treeListDisplay); treeNode.setOrderNum(treeListDisplay);
treeNode.setItemName(itemEO.get("item_title").toString()); treeNode.setItemName(itemEO.get("item_title").toString());
@@ -2977,6 +3136,13 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
treeNodeList.add(treeNode); treeNodeList.add(treeNode);
// } // }
} }
// 补回小数点
for (SarFileSplitMenuTreeNode sarFileSplitMenuTreeNode : treeNodeList) {
if (dotList.contains(sarFileSplitMenuTreeNode.getId())) {
sarFileSplitMenuTreeNode.setName(sarFileSplitMenuTreeNode.getName() + ".");
}
}
//其他节点 //其他节点
/*for (SarFileSplitItemsEO itemEO : addItemsEOList) { /*for (SarFileSplitItemsEO itemEO : addItemsEOList) {
String itemNum = itemEO.getItemsNum(); String itemNum = itemEO.getItemsNum();
laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
+56
View File
@@ -370,4 +370,60 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
} }
return Result.OK(); return Result.OK();
} }
@Override
public void updateMenuLevel(String id, String parentId) {
// 获取要移动到的层级的最后一个 的排序值
SarFileSplitMenuEO lastMenu = getLastMenu(parentId);
// 查询当前节点和当前节点所有子集
SarFileSplitMenuEO sarFileSplitMenuEO1 = baseMapper.findById(id);
List<SarFileSplitMenuEO> sarFileSplitMenuEO1List = new ArrayList<>();
sarFileSplitMenuEO1List.add(sarFileSplitMenuEO1);
List<SarFileSplitMenuEO> allList = new ArrayList<>();
getChildren(allList, sarFileSplitMenuEO1List);
// 获取要移动节点的数量
int childCount = allList.size();
// 更新下节点排序
SarFileSplitMenuEO parentSarFileSplitMenu = baseMapper.findById(parentId);
List<SarFileSplitMenuEO> sarFileSplitMenuEOList =
baseMapper.queryByGTDisplaySeq(parentSarFileSplitMenu.getInfoId(), lastMenu.getDisplaySeq());
for (SarFileSplitMenuEO fileSplitMenuEO : sarFileSplitMenuEOList) {
// 更新排序
fileSplitMenuEO.setDisplaySeq(fileSplitMenuEO.getDisplaySeq() + childCount);
baseMapper.updateByPrimaryKeySelective(fileSplitMenuEO);
}
// 更新要移动节点的排序
for (int i = 0; i <allList.size(); i++) {
SarFileSplitMenuEO sarFileSplitMenuEO2 = allList.get(i);
sarFileSplitMenuEO2.setDisplaySeq(lastMenu.getDisplaySeq() + i + 1);
baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO2);
}
SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO();
sarFileSplitMenuEO.setId(id);
sarFileSplitMenuEO.setPId(parentId);
baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
}
private void getChildren(List<SarFileSplitMenuEO> allList, List<SarFileSplitMenuEO> sarFileSplitMenuEOList) {
for (SarFileSplitMenuEO sarFileSplitMenuEO : sarFileSplitMenuEOList) {
allList.add(sarFileSplitMenuEO);
List<SarFileSplitMenuEO> childrenList = baseMapper.findByParentId(sarFileSplitMenuEO.getId());
if (CollectionUtils.isNotEmpty(childrenList)){
getChildren(allList, childrenList);
}
}
}
private SarFileSplitMenuEO getLastMenu(String parentId) {
SarFileSplitMenuEO sarFileSplitMenuEO1 = baseMapper.findLastByParentId(parentId);
if(sarFileSplitMenuEO1 != null){
getLastMenu(sarFileSplitMenuEO1.getId());
}
return sarFileSplitMenuEO1;
}
} }