Index: forgon-core/src/main/java/com/forgon/networkdisk/vo/FolderAndFileVO.java
===================================================================
diff -u -r12331 -r21486
--- forgon-core/src/main/java/com/forgon/networkdisk/vo/FolderAndFileVO.java (.../FolderAndFileVO.java) (revision 12331)
+++ forgon-core/src/main/java/com/forgon/networkdisk/vo/FolderAndFileVO.java (.../FolderAndFileVO.java) (revision 21486)
@@ -21,7 +21,16 @@
private String folderId;
private String imgName;
private String attachFileId;
+ /**
+ * 附件的实际文件名
+ */
+ private String attachFileName;
+ /**
+ * 附件类型
+ * @return
+ */
+ private String attacnFileType;
public String getId() {
return id;
@@ -77,7 +86,17 @@
public void setAttachFileId(String attachFileId) {
this.attachFileId = attachFileId;
}
-
-
-
+ public String getAttachFileName() {
+ return attachFileName;
+ }
+ public void setAttachFileName(String attachFileName) {
+ this.attachFileName = attachFileName;
+ }
+ public String getAttacnFileType() {
+ return attacnFileType;
+ }
+ public void setAttacnFileType(String attacnFileType) {
+ this.attacnFileType = attacnFileType;
+ }
+
}
Index: ssts-web/src/main/webapp/knowledge/watchVideo.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/knowledge/watchVideo.jsp (revision 0)
+++ ssts-web/src/main/webapp/knowledge/watchVideo.jsp (revision 21486)
@@ -0,0 +1,103 @@
+
+
+
+
+<%
+ String fileName = request.getParameter("fileName");
+%>
+【<%=fileName %>】培训管理视频
+
+
+
+
+
+
+
+
+
+
+
Index: forgon-knowledge/src/main/java/com/forgon/knowledge/service/KnowledgeViewManagerImpl.java
===================================================================
diff -u -r15543 -r21486
--- forgon-knowledge/src/main/java/com/forgon/knowledge/service/KnowledgeViewManagerImpl.java (.../KnowledgeViewManagerImpl.java) (revision 15543)
+++ forgon-knowledge/src/main/java/com/forgon/knowledge/service/KnowledgeViewManagerImpl.java (.../KnowledgeViewManagerImpl.java) (revision 21486)
@@ -11,6 +11,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
+import com.forgon.attachfile.model.AttachFile;
import com.forgon.component.grid.GridManager;
import com.forgon.knowledge.model.KnowledgeFile;
import com.forgon.knowledge.model.KnowledgeFolder;
@@ -20,6 +21,7 @@
import com.forgon.networkdisk.vo.FolderAndFileVO;
import com.forgon.reflect.ReflectUtil;
import com.forgon.security.acls.AclHelper;
+import com.forgon.tools.db.DatabaseUtil;
import com.forgon.tools.hibernate.ObjectDao;
/**
@@ -184,8 +186,15 @@
String attachfileids = fileNode.getAttachFiles();
folderAndFileVO.setAttachFileId(attachfileids);
+ if(DatabaseUtil.isPoIdValid(attachfileids)){
+ AttachFile attachFile =
+ (AttachFile)objectDao.getByProperty(AttachFile.class.getSimpleName(), "id", Long.parseLong(attachfileids));
+ if(attachFile != null){
+ folderAndFileVO.setAttachFileName(attachFile.getUUIDFileName());
+ folderAndFileVO.setAttacnFileType(attachFile.getContentType());
+ }
+ }
-
folderAndFileVO.setLinkUrl(getParameter(folderAndFileVO, linkUrl));
folderAndFileVOList.add(folderAndFileVO);
Index: ssts-web/src/main/webapp/knowledge/viewExt.js
===================================================================
diff -u -r15795 -r21486
--- ssts-web/src/main/webapp/knowledge/viewExt.js (.../viewExt.js) (revision 15795)
+++ ssts-web/src/main/webapp/knowledge/viewExt.js (.../viewExt.js) (revision 21486)
@@ -95,14 +95,25 @@
grid.gotoFirstPage();
// grid.dwrReload();
}
-
+function playVideo(videoName,fileName){
+ var url = Ext.urlEncode({
+ videoName : videoName, //视频播放文件名
+ fileName : fileName //文件名
+ });
+ openModalWindow(WWWROOT+"/knowledge/watchVideo.jsp?"+url, "观看视频", "600", "400");
+}
function rendererImgLink(v, p, record){
var linkUrl = record.data['linkUrl'];
-
+ var attachFileType = record.data['attacnFileType'];
var attachFileId = record.data['attachFileId'];
if (!isUndefinedOrNullOrEmpty(attachFileId) && attachFileId.indexOf(",") == -1){
- linkUrl = WWWROOT + "/attachfiles/fileDownLoad?loadType='open'&id=" + attachFileId + "&moduleId=" + moduleId;
- v = '
' + v + '';
+ //判断类型是否包含video包含为视频文件
+ if(attachFileType.indexOf("video")>=0){
+ v = ' ' + v + '';
+ }else{
+ linkUrl = WWWROOT + "/attachfiles/fileDownLoad?loadType=open&id=" + attachFileId + "&moduleId=" + moduleId;
+ v = ' ' + v + '';
+ }
}
else{
//如果不为空,则目前加载的文件,要重新设置对应文件的url,如果是目前加载目录,这个url是一个js的方法
@@ -111,6 +122,7 @@
}
v = ' ' + v + '';
}
+
return v;
}
@@ -231,7 +243,9 @@
{name: 'linkUrl'},
{name: 'folderId'},
{name: 'imgName'},
- {name: 'attachFileId'}
+ {name: 'attachFileId'},
+ {name: 'attachFileName'},
+ {name: 'attacnFileType'}
];
var filters = new Ext.grid.GridFilters({filters:filterArray});