|
|
|
@ -132,7 +132,6 @@ public class FenpanService {
|
|
|
|
|
} catch (IOException e) {
|
|
|
|
|
throw new RuntimeException(e);
|
|
|
|
|
}
|
|
|
|
|
// ImageInfo imageInfo = Imaging.getImageInfo(inputFile);
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
try {
|
|
|
|
@ -162,7 +161,6 @@ public class FenpanService {
|
|
|
|
|
File file = new File(piece.getAbsolutePath());
|
|
|
|
|
File parentFile = file.getParentFile();
|
|
|
|
|
String name = parentFile.getName();
|
|
|
|
|
// System.out.println(name);
|
|
|
|
|
Roll roll = rollMap.get(name);
|
|
|
|
|
if (roll == null) {
|
|
|
|
|
roll = new Roll(name, parentFile.getAbsolutePath());
|
|
|
|
@ -176,7 +174,6 @@ public class FenpanService {
|
|
|
|
|
if (zong == null) {
|
|
|
|
|
zong = new Zong(parentFile.getParentFile().getAbsolutePath(), parentFile.getParentFile().getName());
|
|
|
|
|
}
|
|
|
|
|
// zong.put(rollMap.get(name));
|
|
|
|
|
zongMap.put(zongName, zong);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -208,20 +205,6 @@ public class FenpanService {
|
|
|
|
|
zong.put(roll);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// //填充宗
|
|
|
|
|
// for (String name : rollMap.keySet()) {
|
|
|
|
|
// Roll roll = rollMap.get(name);
|
|
|
|
|
// File file = new File(roll.getAbsolutePath());
|
|
|
|
|
// String zongName = file.getParentFile().getName();
|
|
|
|
|
// Zong zong = zongMap.get(zongName);
|
|
|
|
|
// if (zong == null) {
|
|
|
|
|
// zong = new Zong(file.getParentFile().getAbsolutePath(), file.getParentFile().getName());
|
|
|
|
|
// }
|
|
|
|
|
// zong.put(rollMap.get(name));
|
|
|
|
|
// zongMap.put(zongName, zong);
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
return zongMap;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|