|
|
|
@ -14,6 +14,8 @@ import java.util.Iterator;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import java.util.Set;
|
|
|
|
|
import java.util.regex.Matcher;
|
|
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import javax.servlet.ServletException;
|
|
|
|
@ -233,8 +235,16 @@ public class ExcelController extends BaseController{
|
|
|
|
|
}
|
|
|
|
|
log.info(jsonlist.size());
|
|
|
|
|
List<String> listPath = new ArrayList<String>();
|
|
|
|
|
// 末尾 含有 /
|
|
|
|
|
Pattern pattern2 = Pattern.compile("\\/$");
|
|
|
|
|
Matcher matcher2 = pattern2.matcher(Configs.FILE_UPLOAD_PATH);
|
|
|
|
|
// 加上 最后 的 /
|
|
|
|
|
String dirPath = Configs.FILE_UPLOAD_PATH;
|
|
|
|
|
if (!matcher2.find()) {
|
|
|
|
|
dirPath = dirPath+"/";
|
|
|
|
|
}
|
|
|
|
|
for (String p : jsonlist) {
|
|
|
|
|
listPath.add(Configs.FILE_UPLOAD_PATH + p);
|
|
|
|
|
listPath.add(dirPath + p);
|
|
|
|
|
}
|
|
|
|
|
Map<String, List> result = new HashMap<String, List>();
|
|
|
|
|
if (listPath.size() > 0) {
|
|
|
|
|