diff --git a/SC-boot/linkage-common/src/main/java/jnpf/util/StringUtil.java b/SC-boot/linkage-common/src/main/java/jnpf/util/StringUtil.java index 509bf778..0cfb75c0 100644 --- a/SC-boot/linkage-common/src/main/java/jnpf/util/StringUtil.java +++ b/SC-boot/linkage-common/src/main/java/jnpf/util/StringUtil.java @@ -27,6 +27,39 @@ public class StringUtil extends StringUtils /** 星号 */ private static final String START = "*"; + /** 获取字符串前几位的数字 **/ + public static String getCharStr(String str){ + StringBuffer stringBuffer = new StringBuffer(); + char[] bytes = str.toCharArray(); + for (int i = 0; i < bytes.length; i++) { + char aByte = bytes[i]; + boolean isNumber=false; + switch (aByte){ + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + isNumber=true; + break; + default: + isNumber=false; + break; + } + if (isNumber){ + stringBuffer.append(aByte); + }else { + break; + } + } + return stringBuffer.toString(); + } + /** * 获取参数不为空值 * diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java b/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java index 00d7e732..bdfdd156 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java @@ -9,6 +9,7 @@ import jnpf.controller.UtilsController; import jnpf.model.UploaderVO; import jnpf.util.FilePathUtil; import jnpf.util.JsonUtil; +import jnpf.util.StringUtil; import jnpf.util.context.SpringContext; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; @@ -65,9 +66,12 @@ public class FileCopy { String indexString = name.substring(0, name.lastIndexOf(".")); String parent = file.getParent(); String parentName = parent.substring(parent.lastIndexOf("\\") + 1, parent.length()); - if (parentName.contains("-")){ - parentName=parentName.substring(0,parentName.lastIndexOf("-")); - } + + + parentName= StringUtil.getCharStr(parentName); +// if (parentName.contains("-")){ +// parentName=parentName.substring(0,parentName.lastIndexOf("-")); +// } String substring = name.substring(name.lastIndexOf(".") + 1, name.length()); if (substring.contains("xls") || substring.contains("xlsx")) { // 进行word操作