Browse Source

附件更新接口修改,更新附件及替换附件

o2sword 5 years ago
parent
commit
2433c6b096

+ 1 - 1
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionFileUpdate.java

@@ -192,7 +192,7 @@ public class ActionFileUpdate extends BaseAction {
 				}
 				
 				//文件存储				
-				attachment.saveContent( mapping, bytes, fileName );
+				attachment.updateContent( mapping, bytes, fileName );
 				//完成替换逻辑
 				attachment = fileInfoServiceAdv.updateAttachment( docId, old_attId, attachment, mapping );
 //				

+ 1 - 1
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionFileUpdateCallback.java

@@ -124,7 +124,7 @@ public class ActionFileUpdateCallback extends BaseAction {
 							attachment.getText());
 				}
 				
-				attachment.saveContent(mapping, bytes, fileName);
+				attachment.updateContent(mapping, bytes, fileName);
 				attachment = fileInfoServiceAdv.updateAttachment( docId, old_attId, attachment, mapping );
 //				
 //				List<String> keys = new ArrayList<>();

+ 2 - 1
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/FileInfoServiceAdv.java

@@ -243,7 +243,7 @@ public class FileInfoServiceAdv {
 				Document document = emc.find( docId, Document.class );
 				FileInfo old_fileInfo = emc.find( old_attId, FileInfo.class );
 				if( document != null ){
-					emc.beginTransaction( FileInfo.class );				
+					emc.beginTransaction( FileInfo.class );
 					old_fileInfo.setLastUpdateTime( new Date() );
 					old_fileInfo.setExtension( attachment.getExtension() );
 					old_fileInfo.setName( attachment.getName() );
@@ -260,6 +260,7 @@ public class FileInfoServiceAdv {
 					old_fileInfo.setFilePath( attachment.getFilePath() );
 					old_fileInfo.setType( attachment.getType() );
 					old_fileInfo.setText( attachment.getText() );
+					old_fileInfo.setLength( attachment.getLength() );
 					emc.check( old_fileInfo, CheckPersistType.all );
 					emc.commit();
 				}