韩国拆分文档处理
This commit is contained in:
+4
@@ -20,6 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
@@ -145,6 +146,9 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
|
||||
|
||||
@Override
|
||||
public List<OSSFile> getFileInfos(String id) {
|
||||
if(com.jero.modules.system.util.StringUtils.isEmpty(id)){
|
||||
return new ArrayList<>();
|
||||
}
|
||||
LambdaQueryWrapper<OSSFile> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.in(OSSFile::getId,id.split(","));
|
||||
List<OSSFile> list = this.list(wrapper);
|
||||
|
||||
+33
-27
@@ -1410,8 +1410,11 @@ public class FileSpiltService {
|
||||
treeList.add(documentTreeEO);
|
||||
|
||||
List<String> nowStart = new ArrayList<>();
|
||||
//临时保存note数据列表
|
||||
List<String> nowStartNotes = new ArrayList<>();
|
||||
//初始判断值
|
||||
nowStart.add("1.");
|
||||
nowStartNotes.add("1");
|
||||
// if (sarFileSplitInfoEO.getStartNumber()<4){
|
||||
// } else {
|
||||
// nowStart.add(String.valueOf(sarFileSplitInfoEO.getStartNumber()));
|
||||
@@ -1457,39 +1460,42 @@ public class FileSpiltService {
|
||||
paragraphString = paragraphString.replace((char) 12288, ' ');
|
||||
paragraphString = paragraphString.trim();
|
||||
}
|
||||
|
||||
if(filterFlag){
|
||||
for (String nowStartNote : nowStartNotes) {
|
||||
if(paragraphString.startsWith(nowStartNote)){
|
||||
//预测下一级内容
|
||||
nowStartNotes = getNewNowStartKmvssTable(catalogerArr,nowStartNote,menuLevel);
|
||||
break;
|
||||
}else {
|
||||
for (int i=0;i<nowStart.size();i++){
|
||||
if(paragraphString.startsWith(nowStart.get(i))){
|
||||
filterFlag = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//包含note或者notes
|
||||
if(filterList.contains(paragraphString)){
|
||||
filterFlag = true;
|
||||
}
|
||||
if(menuLevel <= 3){
|
||||
String thisLevel = catalogerArr[menuLevel];
|
||||
if (StringUtils.isNotEmpty(thisLevel)){
|
||||
String replace = thisLevel.replace(".", "").replace("(", "").replace(")", "");
|
||||
if(FileSplitUtils.hasDigit(replace)){
|
||||
int menuNumber = Integer.parseInt(replace) - 1;
|
||||
|
||||
}else {
|
||||
|
||||
}
|
||||
// menuLevel
|
||||
}
|
||||
}
|
||||
// if (StringUtils.isNotEmpty(p.getNumLevelText())&& p.getNumLevelText().indexOf(".")>0) {
|
||||
// String numberParent = p.getNumLevelText().substring(0,p.getNumLevelText().lastIndexOf("."));
|
||||
// if (numberMap.containsKey(numberParent)){
|
||||
// Integer numbernow =(Integer)numberMap.get(numberParent)+1;
|
||||
// if (messageList != null && !messageList.isEmpty() && messageList.get(messageList.size()-1).getItemsNum().equals(numberParent + "." + String.valueOf(numbernow))){
|
||||
// numberMap.put(numberParent,numbernow+1);
|
||||
// paragraphString = numberParent + "." + String.valueOf(numbernow+1)+ p.getText();
|
||||
// } else {
|
||||
// numberMap.put(numberParent,numbernow);
|
||||
// paragraphString = numberParent + "." + String.valueOf(numbernow)+ p.getText();
|
||||
// if(menuLevel <= 3){
|
||||
// String thisLevel = catalogerArr[menuLevel];
|
||||
// if (StringUtils.isNotEmpty(thisLevel)){
|
||||
// String replace = thisLevel.replace(".", "").replace("(", "").replace(")", "");
|
||||
// if(FileSplitUtils.hasDigit(replace)){
|
||||
// int menuNumber = Integer.parseInt(replace) - 1;
|
||||
//
|
||||
// }else {
|
||||
//
|
||||
// }
|
||||
// } else {
|
||||
// numberMap.put(numberParent,1);
|
||||
// paragraphString = numberParent+".1"+ p.getText();
|
||||
//// menuLevel
|
||||
// }
|
||||
// }
|
||||
//^M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$
|
||||
ptest = Pattern.compile("^[\\d.]*$");
|
||||
//定义查看是否有编号,没有编号则按照上一个编号放置数据
|
||||
boolean hasGoIf = false;
|
||||
|
||||
Reference in New Issue
Block a user