|
|
@ -98,8 +98,12 @@ public class FileInfo extends AbstractEntity {
|
|
|
|
* @param fileInfo FileInfo
|
|
|
|
* @param fileInfo FileInfo
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public void setInfo(FileInfo fileInfo) {
|
|
|
|
public void setInfo(FileInfo fileInfo) {
|
|
|
|
|
|
|
|
fileInfo.setInfoType(infoType);
|
|
|
|
|
|
|
|
fileInfo.setInfoKey(infoKey);
|
|
|
|
|
|
|
|
/*
|
|
|
|
fileInfo.setInfoType(Assert.notEmpty(infoType, "infoType"));
|
|
|
|
fileInfo.setInfoType(Assert.notEmpty(infoType, "infoType"));
|
|
|
|
fileInfo.setInfoKey(Assert.notEmpty(infoKey, "infoKey"));
|
|
|
|
fileInfo.setInfoKey(Assert.notEmpty(infoKey, "infoKey"));
|
|
|
|
|
|
|
|
*/
|
|
|
|
fileInfo.setSubType(subType);
|
|
|
|
fileInfo.setSubType(subType);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -190,7 +194,8 @@ public class FileInfo extends AbstractEntity {
|
|
|
|
if (file == null) continue;
|
|
|
|
if (file == null) continue;
|
|
|
|
|
|
|
|
|
|
|
|
FileInfo info = new FileInfo();
|
|
|
|
FileInfo info = new FileInfo();
|
|
|
|
relation.setInfo(info);
|
|
|
|
if (relation != null)
|
|
|
|
|
|
|
|
relation.setInfo(info);
|
|
|
|
String filename = file.getName();
|
|
|
|
String filename = file.getName();
|
|
|
|
info.setName(filename);
|
|
|
|
info.setName(filename);
|
|
|
|
InputStream input = new FileInputStream(file);
|
|
|
|
InputStream input = new FileInputStream(file);
|
|
|
@ -240,7 +245,9 @@ public class FileInfo extends AbstractEntity {
|
|
|
|
if (holder == null) continue;
|
|
|
|
if (holder == null) continue;
|
|
|
|
|
|
|
|
|
|
|
|
FileInfo info = new FileInfo();
|
|
|
|
FileInfo info = new FileInfo();
|
|
|
|
holder.getRelation().setInfo(info);
|
|
|
|
Relation relation = holder.getRelation();
|
|
|
|
|
|
|
|
if (relation != null)
|
|
|
|
|
|
|
|
relation.setInfo(info);
|
|
|
|
String filename = holder.getFilename();
|
|
|
|
String filename = holder.getFilename();
|
|
|
|
info.setName(filename);
|
|
|
|
info.setName(filename);
|
|
|
|
InputStream input = new ByteArrayInputStream(holder.data);
|
|
|
|
InputStream input = new ByteArrayInputStream(holder.data);
|
|
|
|