add 文档拆分 附录
This commit is contained in:
+48
-286
@@ -1,5 +1,8 @@
|
|||||||
package com.jero.modules.split.service.impl;
|
package com.jero.modules.split.service.impl;
|
||||||
|
|
||||||
|
import cn.hutool.core.lang.RegexPool;
|
||||||
|
import cn.hutool.core.util.ReUtil;
|
||||||
|
import cn.hutool.core.util.StrUtil;
|
||||||
import cn.hutool.http.Header;
|
import cn.hutool.http.Header;
|
||||||
import cn.hutool.http.HttpRequest;
|
import cn.hutool.http.HttpRequest;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
@@ -393,7 +396,9 @@ public class FileSpiltService {
|
|||||||
SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(), nowStart.get(i), itemName, clauseContent);
|
SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(), nowStart.get(i), itemName, clauseContent);
|
||||||
|
|
||||||
String[] numberStr = nowStart.get(i).split("\\.");
|
String[] numberStr = nowStart.get(i).split("\\.");
|
||||||
if (Integer.valueOf(numberStr[0]) > sarFileSplitInfoEO.getStopNumber()) {
|
String numberStr0 = numberStr[0];
|
||||||
|
//如果是数字,判断数量,字母正常
|
||||||
|
if (ReUtil.isMatch(RegexPool.NUMBERS,numberStr0) && Integer.parseInt(numberStr0) > sarFileSplitInfoEO.getStopNumber()) {
|
||||||
menuCanAdd = false;
|
menuCanAdd = false;
|
||||||
} else {
|
} else {
|
||||||
// 增加一条数据,需要在数结构中加一条数据
|
// 增加一条数据,需要在数结构中加一条数据
|
||||||
@@ -431,7 +436,8 @@ public class FileSpiltService {
|
|||||||
message.setMenuId(sarFileSplitMenuEO.getId());
|
message.setMenuId(sarFileSplitMenuEO.getId());
|
||||||
message.setApplicableComponents(partName);
|
message.setApplicableComponents(partName);
|
||||||
messageList.add(message);
|
messageList.add(message);
|
||||||
nowStart = new ArrayList<>();
|
String group0 = ReUtil.getGroup0(RegexPool.WORD, paragraphString);
|
||||||
|
nowStart = getNewNowStart(group0);
|
||||||
} else {
|
} else {
|
||||||
if (!paragraphString.equals("")) {
|
if (!paragraphString.equals("")) {
|
||||||
addItermsConditionsText(messageList.get(messageList.size() - 1), itemValList, paragraphString, alignment);
|
addItermsConditionsText(messageList.get(messageList.size() - 1), itemValList, paragraphString, alignment);
|
||||||
@@ -512,17 +518,37 @@ public class FileSpiltService {
|
|||||||
// List<String> nowStartList = new ArrayList<>();
|
// List<String> nowStartList = new ArrayList<>();
|
||||||
List<String> nowResultStartList = new ArrayList<>();
|
List<String> nowResultStartList = new ArrayList<>();
|
||||||
String[] numberStr = nowStart.split("\\.");
|
String[] numberStr = nowStart.split("\\.");
|
||||||
String startnumber = "";
|
StringBuilder startnumber = new StringBuilder();
|
||||||
|
//判断是否附录
|
||||||
|
boolean isAppendix = ReUtil.isMatch(RegexPool.WORD, numberStr[0]);
|
||||||
for (int i = 0; i < numberStr.length; i++) {
|
for (int i = 0; i < numberStr.length; i++) {
|
||||||
if (i == 0) {
|
if (isAppendix){
|
||||||
startnumber = "";
|
char letter = numberStr[0].charAt(0);
|
||||||
} else if (i == 1) {
|
if (i == 0) {
|
||||||
startnumber = numberStr[0];
|
startnumber = new StringBuilder();
|
||||||
} else {
|
letter++;
|
||||||
startnumber = startnumber + "." + numberStr[i - 1];
|
char lastnumber = (char) letter;
|
||||||
|
nowResultStartList.add(lastnumber + "");
|
||||||
|
continue;
|
||||||
|
} else if (i == 1) {
|
||||||
|
startnumber = new StringBuilder(letter + "");
|
||||||
|
} else {
|
||||||
|
startnumber.append(".").append(numberStr[i - 1]);
|
||||||
|
}
|
||||||
|
int lastnumber = Integer.parseInt(numberStr[i]) + 1;
|
||||||
|
nowResultStartList.add(("".equals(startnumber.toString()) ? "" : (startnumber + ".")) + lastnumber);
|
||||||
|
}else {
|
||||||
|
if (i == 0) {
|
||||||
|
startnumber = new StringBuilder();
|
||||||
|
} else if (i == 1) {
|
||||||
|
startnumber = new StringBuilder(numberStr[0]);
|
||||||
|
} else {
|
||||||
|
startnumber.append(".").append(numberStr[i - 1]);
|
||||||
|
}
|
||||||
|
int lastnumber = Integer.parseInt(numberStr[i]) + 1;
|
||||||
|
nowResultStartList.add(("".equals(startnumber.toString()) ? "" : (startnumber + ".")) + lastnumber);
|
||||||
}
|
}
|
||||||
Integer lastnumber = Integer.valueOf(numberStr[i]) + 1;
|
|
||||||
nowResultStartList.add((startnumber.equals("") ? "" : (startnumber + ".")) + lastnumber);
|
|
||||||
}
|
}
|
||||||
nowResultStartList.add(nowStart + ".1");
|
nowResultStartList.add(nowStart + ".1");
|
||||||
return nowResultStartList;
|
return nowResultStartList;
|
||||||
@@ -545,7 +571,6 @@ public class FileSpiltService {
|
|||||||
documentTreeEO.setDisplaySeq(treeListDisplay);
|
documentTreeEO.setDisplaySeq(treeListDisplay);
|
||||||
documentTreeEO.setName(name);
|
documentTreeEO.setName(name);
|
||||||
documentTreeEO.setValidFlag(0);
|
documentTreeEO.setValidFlag(0);
|
||||||
|
|
||||||
// 用现在得name 和之前得name 做比较,确定,parentId
|
// 用现在得name 和之前得name 做比较,确定,parentId
|
||||||
// List<String> pIdList = new ArrayList<>();
|
// List<String> pIdList = new ArrayList<>();
|
||||||
boolean oneFlag = false;
|
boolean oneFlag = false;
|
||||||
@@ -553,288 +578,29 @@ public class FileSpiltService {
|
|||||||
boolean threeFlag = false;
|
boolean threeFlag = false;
|
||||||
a:
|
a:
|
||||||
for (SarFileSplitMenuEO forDocumentTree : treeList) {
|
for (SarFileSplitMenuEO forDocumentTree : treeList) {
|
||||||
|
String treeName = forDocumentTree.getName();
|
||||||
|
String numberStr = treeName.substring(treeName.length()-1);
|
||||||
|
//判断是否附录
|
||||||
|
|
||||||
|
boolean isAppendix = ReUtil.isMatch(RegexPool.WORD, numberStr);
|
||||||
|
if (isAppendix){
|
||||||
|
treeName = numberStr;
|
||||||
|
}
|
||||||
switch (enumByValue) {
|
switch (enumByValue) {
|
||||||
case GB:
|
case GB:
|
||||||
case GBT:
|
case GBT:
|
||||||
case EU:
|
|
||||||
case US:
|
|
||||||
case GSO:
|
|
||||||
if (name.indexOf(".") >= 0) {
|
if (name.indexOf(".") >= 0) {
|
||||||
if (name.substring(0, name.lastIndexOf(".")).equals(forDocumentTree.getName())) {
|
if (name.substring(0, name.lastIndexOf(".")).equals(treeName)) {
|
||||||
documentTreeEO.setPId(forDocumentTree.getId());
|
documentTreeEO.setPId(forDocumentTree.getId());
|
||||||
// pIdList.add(forDocumentTree.getId());
|
|
||||||
break a;
|
break a;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
documentTreeEO.setPId(generalCatalogueId);
|
documentTreeEO.setPId(generalCatalogueId);
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
|
||||||
// case EU:
|
|
||||||
// if (name.indexOf(".") >= 0) {
|
|
||||||
// if (name.substring(0, name.lastIndexOf(".") - 1).equals(forDocumentTree.getName())) {
|
|
||||||
// documentTreeEO.setPId(forDocumentTree.getId());
|
|
||||||
//// pIdList.add(forDocumentTree.getId());
|
|
||||||
// break a;
|
|
||||||
// }
|
|
||||||
// } else {
|
|
||||||
// documentTreeEO.setPId(generalCatalogueId);
|
|
||||||
//// pIdList.add(generalCatalogueId);
|
|
||||||
// }
|
|
||||||
// break;
|
|
||||||
case JPN_ATTACHMENT:
|
|
||||||
if (name.contains(".")) {
|
|
||||||
if (name.indexOf(".") >= 0) {
|
|
||||||
if (name.substring(0, name.lastIndexOf(".")).equals(forDocumentTree.getName())) {
|
|
||||||
documentTreeEO.setPId(forDocumentTree.getId());
|
|
||||||
// pIdList.add(forDocumentTree.getId());
|
|
||||||
break a;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
documentTreeEO.setPId(generalCatalogueId);
|
|
||||||
// pIdList.add(generalCatalogueId);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (name.indexOf("–") >= 0) {
|
|
||||||
if (name.substring(0, name.lastIndexOf("–")).equals(forDocumentTree.getName())
|
|
||||||
|| (name.substring(0, name.lastIndexOf("–")) + ".").equals(forDocumentTree.getName())) {
|
|
||||||
documentTreeEO.setPId(forDocumentTree.getId());
|
|
||||||
// pIdList.add(forDocumentTree.getId());
|
|
||||||
break a;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
documentTreeEO.setPId(generalCatalogueId);
|
|
||||||
// pIdList.add(generalCatalogueId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case JPN_ARTICLE:
|
|
||||||
if (name.indexOf("=") >= 0) {
|
|
||||||
String[] nameSplit = name.split("=");
|
|
||||||
|
|
||||||
//获取name值
|
|
||||||
String firstNameTemp = nameSplit[0];
|
|
||||||
String secondTemp = nameSplit[1];
|
|
||||||
String nameTemp = nameSplit[2];
|
|
||||||
|
|
||||||
if (FileSplitUtils.hasDigit(nameTemp) && nameTemp.contains(".")) {
|
|
||||||
//包含数字且.
|
|
||||||
documentTreeEO.setName(nameTemp);
|
|
||||||
} else if (FileSplitUtils.hasDigit(nameTemp) && nameTemp.contains(")")) {
|
|
||||||
//包含数字且包含括号
|
|
||||||
if (StringUtils.isNotEmpty(firstNameTemp)) {
|
|
||||||
String firstStr = firstNameTemp.replaceAll("\\.", "");
|
|
||||||
int firstNumber = Integer.parseInt(firstStr) - 1;
|
|
||||||
firstNameTemp = firstNumber + ".";
|
|
||||||
}
|
|
||||||
if (firstNameTemp.equals(forDocumentTree.getName())) {
|
|
||||||
documentTreeEO.setName(nameTemp);
|
|
||||||
documentTreeEO.setPId(forDocumentTree.getId());
|
|
||||||
// pIdList.add(forDocumentTree.getId());
|
|
||||||
break a;
|
|
||||||
}
|
|
||||||
} else if (FileSplitUtils.judgeContainsStr(nameTemp)) {
|
|
||||||
//包含数字且包含括号
|
|
||||||
|
|
||||||
//先找一级目录
|
|
||||||
if (StringUtils.isNotEmpty(firstNameTemp)) {
|
|
||||||
String firstStr = firstNameTemp.replaceAll("\\.", "");
|
|
||||||
int firstNumber = Integer.parseInt(firstStr) - 1;
|
|
||||||
firstNameTemp = firstNumber + ".";
|
|
||||||
}
|
|
||||||
if ((!oneFlag) && firstNameTemp.equals(forDocumentTree.getName())) {
|
|
||||||
oneFlag = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
//再找二级目录
|
|
||||||
if (StringUtils.isNotEmpty(secondTemp)) {
|
|
||||||
String firstStr = secondTemp.replace("(", "").replace(")", "");
|
|
||||||
int firstNumber = Integer.parseInt(firstStr) - 1;
|
|
||||||
secondTemp = "(" + firstNumber + ")";
|
|
||||||
}
|
|
||||||
if (oneFlag && secondTemp.equals(forDocumentTree.getName())) {
|
|
||||||
documentTreeEO.setName(nameTemp);
|
|
||||||
documentTreeEO.setPId(forDocumentTree.getId());
|
|
||||||
// pIdList.add(forDocumentTree.getId());
|
|
||||||
break a;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
documentTreeEO.setPId(generalCatalogueId);
|
|
||||||
// pIdList.add(generalCatalogueId);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case KMVSS_ARTICLE:
|
|
||||||
if (name.indexOf("=") >= 0) {
|
|
||||||
String[] nameSplit = name.split("=");
|
|
||||||
|
|
||||||
//获取name值
|
|
||||||
String firstNameTemp = nameSplit[0];
|
|
||||||
String nameTemp = nameSplit[1];
|
|
||||||
|
|
||||||
if (FileSplitUtils.hasDigit(nameTemp) && nameTemp.contains(")")) {
|
|
||||||
//包含数字且.
|
|
||||||
documentTreeEO.setName(nameTemp);
|
|
||||||
} else if (FileSplitUtils.hasDigit(nameTemp) && nameTemp.contains(".")) {
|
|
||||||
//包含数字且包含括号
|
|
||||||
if (StringUtils.isNotEmpty(firstNameTemp)) {
|
|
||||||
String firstStr = firstNameTemp.replace("(", "").replace(")", "");
|
|
||||||
int firstNumber = Integer.parseInt(firstStr) - 1;
|
|
||||||
firstNameTemp = "(" + firstNumber + ")";
|
|
||||||
}
|
|
||||||
if (firstNameTemp.equals(forDocumentTree.getName())) {
|
|
||||||
documentTreeEO.setName(nameTemp);
|
|
||||||
documentTreeEO.setPId(forDocumentTree.getId());
|
|
||||||
// pIdList.add(forDocumentTree.getId());
|
|
||||||
break a;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
documentTreeEO.setPId(generalCatalogueId);
|
|
||||||
// pIdList.add(generalCatalogueId);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case KMVSS_TABLE:
|
|
||||||
if (name.indexOf("=") >= 0) {
|
|
||||||
String[] nameSplit = name.split("=");
|
|
||||||
|
|
||||||
//获取name值
|
|
||||||
String firstNameTemp = nameSplit[1];
|
|
||||||
String secondTemp = nameSplit[2];
|
|
||||||
String threeTemp = nameSplit[3];
|
|
||||||
String fourTemp = nameSplit[4];
|
|
||||||
String nameTemp = nameSplit[5];
|
|
||||||
|
|
||||||
if (FileSplitUtils.hasDigit(nameTemp) && nameTemp.contains(".")) {
|
|
||||||
//第一级:1. 2. 3. 4. 等
|
|
||||||
documentTreeEO.setName(nameTemp);
|
|
||||||
} else if (FileSplitUtils.judgeContainsStr(nameTemp) && nameTemp.contains(".")) {
|
|
||||||
//第二级:A. B. C. D. 等
|
|
||||||
if (StringUtils.isNotEmpty(firstNameTemp)) {
|
|
||||||
String firstStr = firstNameTemp.replaceAll("\\.", "");
|
|
||||||
int firstNumber = Integer.parseInt(firstStr) - 1;
|
|
||||||
firstNameTemp = firstNumber + ".";
|
|
||||||
}
|
|
||||||
if (firstNameTemp.equals(forDocumentTree.getName())) {
|
|
||||||
documentTreeEO.setName(nameTemp);
|
|
||||||
documentTreeEO.setPId(forDocumentTree.getId());
|
|
||||||
// pIdList.add(forDocumentTree.getId());
|
|
||||||
break a;
|
|
||||||
}
|
|
||||||
} else if (FileSplitUtils.hasDigit(nameTemp) && nameTemp.contains(")") && (!nameTemp.contains("("))) {
|
|
||||||
//第三级:1) 2) 3) 4) 等
|
|
||||||
|
|
||||||
//先找一级目录
|
|
||||||
if (StringUtils.isNotEmpty(firstNameTemp)) {
|
|
||||||
String firstStr = firstNameTemp.replaceAll("\\.", "");
|
|
||||||
int firstNumber = Integer.parseInt(firstStr) - 1;
|
|
||||||
firstNameTemp = firstNumber + ".";
|
|
||||||
}
|
|
||||||
if ((!oneFlag) && firstNameTemp.equals(forDocumentTree.getName())) {
|
|
||||||
oneFlag = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
//再找二级目录
|
|
||||||
if (oneFlag && StringUtils.isNotEmpty(secondTemp)) {
|
|
||||||
String firstStr = secondTemp.replace(".", "");
|
|
||||||
String nextUpEn = FileSplitUtils.getLastEn(firstStr);
|
|
||||||
secondTemp = nextUpEn + ".";
|
|
||||||
}
|
|
||||||
if (oneFlag && secondTemp.equals(forDocumentTree.getName())) {
|
|
||||||
documentTreeEO.setName(nameTemp);
|
|
||||||
documentTreeEO.setPId(forDocumentTree.getId());
|
|
||||||
// pIdList.add(forDocumentTree.getId());
|
|
||||||
break a;
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (FileSplitUtils.judgeContainsStr(nameTemp) && nameTemp.contains(")")) {
|
|
||||||
//第四级:A) B) C) D) 等
|
|
||||||
|
|
||||||
//先找一级目录
|
|
||||||
if (StringUtils.isNotEmpty(firstNameTemp)) {
|
|
||||||
String firstStr = firstNameTemp.replaceAll("\\.", "");
|
|
||||||
int firstNumber = Integer.parseInt(firstStr) - 1;
|
|
||||||
firstNameTemp = firstNumber + ".";
|
|
||||||
}
|
|
||||||
if ((!oneFlag) && firstNameTemp.equals(forDocumentTree.getName())) {
|
|
||||||
oneFlag = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
//再找二级目录
|
|
||||||
if (oneFlag && StringUtils.isNotEmpty(secondTemp)) {
|
|
||||||
String firstStr = secondTemp.replace(".", "");
|
|
||||||
String nextUpEn = FileSplitUtils.getLastEn(firstStr);
|
|
||||||
secondTemp = nextUpEn + ".";
|
|
||||||
}
|
|
||||||
if ((!twoFlag) && secondTemp.equals(forDocumentTree.getName())) {
|
|
||||||
twoFlag = true;
|
|
||||||
}
|
|
||||||
//再找三级目录
|
|
||||||
if (oneFlag && twoFlag && StringUtils.isNotEmpty(threeTemp)) {
|
|
||||||
String numberStr = threeTemp.replace(")", "");
|
|
||||||
Integer lastnumber = Integer.valueOf(numberStr) - 1;
|
|
||||||
threeTemp = lastnumber + ")";
|
|
||||||
}
|
|
||||||
if (oneFlag && twoFlag && threeTemp.equals(forDocumentTree.getName())) {
|
|
||||||
documentTreeEO.setName(nameTemp);
|
|
||||||
documentTreeEO.setPId(forDocumentTree.getId());
|
|
||||||
// pIdList.add(forDocumentTree.getId());
|
|
||||||
break a;
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (FileSplitUtils.hasDigit(nameTemp) && nameTemp.contains("(") && nameTemp.contains(")")) {
|
|
||||||
//第五级:(1) (2) (3) (4) 等
|
|
||||||
|
|
||||||
//先找一级目录
|
|
||||||
if (StringUtils.isNotEmpty(firstNameTemp)) {
|
|
||||||
String firstStr = firstNameTemp.replaceAll("\\.", "");
|
|
||||||
int firstNumber = Integer.parseInt(firstStr) - 1;
|
|
||||||
firstNameTemp = firstNumber + ".";
|
|
||||||
}
|
|
||||||
if ((!oneFlag) && firstNameTemp.equals(forDocumentTree.getName())) {
|
|
||||||
oneFlag = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
//再找二级目录
|
|
||||||
if (oneFlag && StringUtils.isNotEmpty(secondTemp)) {
|
|
||||||
String firstStr = secondTemp.replace(".", "");
|
|
||||||
String nextUpEn = FileSplitUtils.getLastEn(firstStr);
|
|
||||||
secondTemp = nextUpEn + ".";
|
|
||||||
}
|
|
||||||
if ((!twoFlag) && secondTemp.equals(forDocumentTree.getName())) {
|
|
||||||
twoFlag = true;
|
|
||||||
}
|
|
||||||
//再找三级目录
|
|
||||||
if (oneFlag && twoFlag && StringUtils.isNotEmpty(threeTemp)) {
|
|
||||||
String numberStr = threeTemp.replace(")", "");
|
|
||||||
Integer lastnumber = Integer.valueOf(numberStr) - 1;
|
|
||||||
threeTemp = lastnumber + ")";
|
|
||||||
}
|
|
||||||
if ((!threeFlag) && threeTemp.equals(forDocumentTree.getName())) {
|
|
||||||
threeFlag = true;
|
|
||||||
}
|
|
||||||
//再找四级目录
|
|
||||||
if (oneFlag && twoFlag && threeFlag && StringUtils.isNotEmpty(fourTemp)) {
|
|
||||||
String numberStr = fourTemp.replace(")", "");
|
|
||||||
String nextUpEn = FileSplitUtils.getLastEn(numberStr);
|
|
||||||
fourTemp = nextUpEn + ")";
|
|
||||||
}
|
|
||||||
if (oneFlag && twoFlag && threeFlag && fourTemp.equals(forDocumentTree.getName())) {
|
|
||||||
documentTreeEO.setName(nameTemp);
|
|
||||||
documentTreeEO.setPId(forDocumentTree.getId());
|
|
||||||
// pIdList.add(forDocumentTree.getId());
|
|
||||||
break a;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
documentTreeEO.setPId(generalCatalogueId);
|
|
||||||
// pIdList.add(generalCatalogueId);
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (name.indexOf(".") >= 0) {
|
if (name.indexOf(".") >= 0) {
|
||||||
if (name.substring(0, name.lastIndexOf(".")).equals(forDocumentTree.getName())) {
|
if (name.substring(0, name.lastIndexOf(".")).equals(treeName)) {
|
||||||
documentTreeEO.setPId(forDocumentTree.getId());
|
documentTreeEO.setPId(forDocumentTree.getId());
|
||||||
// pIdList.add(forDocumentTree.getId());
|
// pIdList.add(forDocumentTree.getId());
|
||||||
break a;
|
break a;
|
||||||
@@ -847,10 +613,6 @@ public class FileSpiltService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (CollectionUtils.isNotEmpty(pIdList)) {
|
|
||||||
// documentTreeEO.setPId(pIdList.get(pIdList.size()-1)); // 拿最后一个
|
|
||||||
// }
|
|
||||||
return documentTreeEO;
|
return documentTreeEO;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1283,7 +1045,7 @@ public class FileSpiltService {
|
|||||||
//\p{Punct} 标点符号:!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
|
//\p{Punct} 标点符号:!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
|
||||||
//\p{Space} 空白字符:[ \t\n\x0B\f\r]
|
//\p{Space} 空白字符:[ \t\n\x0B\f\r]
|
||||||
//\p{Digit} 十进制数字:[0-9]
|
//\p{Digit} 十进制数字:[0-9]
|
||||||
String regex="[^\\p{Punct}\\p{Space}\\p{Digit}]"; // TODO
|
String regex="[^\\p{Punct}\\p{Space}\\p{Digit}\\p{Alpha}]"; // TODO
|
||||||
|
|
||||||
Matcher matcher;
|
Matcher matcher;
|
||||||
matcher = Pattern.compile(regex).matcher(arr);
|
matcher = Pattern.compile(regex).matcher(arr);
|
||||||
|
|||||||
Reference in New Issue
Block a user