|
|
@@ -244,7 +244,7 @@ public class ResultsServiceImpl implements ResultsService {
|
|
|
return RequestResult.error(String.format("成果分片总数(%s)与上传片文件数量(%s)不符", qxsbcg.getTotal(), fplist.size()));
|
|
|
}
|
|
|
String folder = String.format("%s旗县成果上报\\%s\\%s\\%s\\", tempfolder, user.getXzqdm(), qxsbcg.getGhlx(), md5);
|
|
|
- loginfo("准备合包:" + folder);
|
|
|
+ loginfo("ready merge:" + folder);
|
|
|
List<String> filelist = new ArrayList<>();
|
|
|
for (Qxcgsbrwfp cur : fplist) {
|
|
|
filelist.add(cur.getPath());
|
|
|
@@ -252,7 +252,7 @@ public class ResultsServiceImpl implements ResultsService {
|
|
|
String targetfilepath = folder + "" + filename;
|
|
|
try {
|
|
|
mergeZipFiles(filelist, targetfilepath);
|
|
|
- loginfo("完成合包:" + folder);
|
|
|
+ loginfo("complate merge:" + targetfilepath);
|
|
|
} catch (IOException e) {
|
|
|
e.printStackTrace();
|
|
|
// qxsbcg.setRwzt(rwzt.getHbsb());
|