diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index 43572e07..f7a4c2f7 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java index e4aa0381..1de022ac 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java @@ -1,6 +1,8 @@ package com.actionsoft.apps.coe.pal; import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -45,6 +47,8 @@ import com.actionsoft.bpms.util.UUIDGener; import com.actionsoft.bpms.util.UtilString; import com.actionsoft.exception.ExceptionUtil; import com.actionsoft.i18n.I18nRes; +import com.actionsoft.sdk.local.SDK; +import com.actionsoft.sdk.local.api.AppAPI; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -2601,6 +2605,31 @@ public class CoEPALController { } else if ("control.policy".equals(methodId) ||"process.scheme".equals(methodId) || "engineering.standard".equals(methodId)) { return PALRepositoryQueryAPIManager.getInstance().createOutputReportZd(wsId, me.getUID(), teamId, fileId); } + + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String nowDate=sdf.format(new Date()); + // 调用App + String sourceAppId = "com.awspaas.user.apps.browsing_data"; + // aslp服务地址 + String aslp = "aslp://com.awspaas.user.apps.browsing_data/RecordDownloadAlsp"; + // 参数定义列表 + Map alspparams = new HashMap(); + alspparams.put("sid", me.getSessionId()); + alspparams.put("uid", me.getUID()); + alspparams.put("username", me.getUserName()); + alspparams.put("modelId", fileId); + alspparams.put("modelName", model.getName()); + alspparams.put("downloadTime", nowDate); + alspparams.put("fileName", model.getName()); + alspparams.put("downloadType", "doc"); + alspparams.put("recordSource", "PAL画布-导出手册"); + alspparams.put("downloadsource", "PAL画布"); + AppAPI appAPI = SDK.getAppAPI(); + //根据上传的文件进行更新相关的excel或者ppt + ResponseObject alsp_ro = appAPI.callASLP(appAPI.getAppContext(sourceAppId), aslp, alspparams); + + return PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, me.getUID(), teamId, fileId); } diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java index e6d3652b..ac45413b 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java @@ -496,7 +496,7 @@ public class UpfileWeb extends ActionWeb { try { long times = System.currentTimeMillis(); - final String zipName = "批量下载"+ toolbarname + ".zip"; + final String zipName = "批量下载"+ toolbarname.replace(">", "-")+ ".zip"; String targetDir = AWSServerConf.getProperty("dc.path") + File.separator + "com.actionsoft.apps.coe.pal" + File.separator + "tmp/grouppackage/zip" + times + "/"; File targetFileDir = new File(targetDir); if (!targetFileDir.exists()) { @@ -637,7 +637,7 @@ public class UpfileWeb extends ActionWeb { } - UtilFile.zipCompress(targetDir, new File(targetDir + zipName)); + UtilFile.zipCompress(targetDir, new File(targetDir + zipName.replace(">", "-"))); File[] files = targetFileDir.listFiles(new FilenameFilter() { diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm index be8c710b..1106370c 100755 --- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm +++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm @@ -730,8 +730,8 @@ url : "./w?sid=" + encodeURIComponent($('#sid').val()) + "&cmd=com.awspaas.user.apps.browsing_data.service.insertReadingLog", data : "userId="+userId+"&userName="+userName+"&ruuid="+ruuid+"&fileName="+fileName+"&intervalStartTime="+intervalStartTime+"¤tTime="+currentTime+"&browserId="+browserId+"&isActive="+isActive, success : function(msg) { - if(msg.result==ok){ - + if (msg.result == "error") { + $.simpleAlert("删除失败", "error"); } } }); @@ -746,7 +746,9 @@ url : "./w?sid=" + encodeURIComponent($('#sid').val()) + "&cmd=com.awspaas.user.apps.browsing_data.service.insertReadingLog", data : "userId="+userId+"&userName="+userName+"&ruuid="+ruuid+"&fileName="+fileName+"&intervalStartTime="+intervalStartTime+"¤tTime="+currentTime+"&browserId="+browserId+"&isActive="+isActive, success : function(msg) { - + if (msg.result == "error") { + $.simpleAlert("删除失败", "error"); + } } }); diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js index a7212272..6d3a9881 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js @@ -285,6 +285,7 @@ function loadFiles() { //加载附件,params参考引用 $('#selfAccessoryTable').show(); var editable = parent.editable == "0" ? 0 : 1; //editable等于0，页面只读 for (var i = 0; i < list.length; i++) { + debugger; var obj = list[i]; var downloadIcon = ""; var deleteIcon = ""; @@ -292,7 +293,7 @@ function loadFiles() { //加载附件,params参考引用 deleteIcon = ' '; } if (obj.download == 1 || obj.createUser == $("#userId").val()) { - downloadIcon = ' '; + downloadIcon = ' '; } accessoryHtml += '' + '
' + obj.fileName ; @@ -451,10 +452,46 @@ function delFileAll(callback) { //删除全部文件 } //下载附件 -function downloadFile(url) { +function downloadFile(url,type) { window.location.href = url; + + var downloadsource; + if(type=='s'){ + downloadsource="数据属性"; + }else{ + downloadsource="文件属性"; + } + var queryString = url.split('?')[1]; + var params = new URLSearchParams(queryString); + var fileName = params.get('fileName'); + var fileExtension = fileName.substring(fileName.lastIndexOf('.')+1); + var subFileName=fileName.substring(0,fileName.lastIndexOf(".")); + + var params = { + "modelId": pl_uuid, + "modelName": parent.fileName, + "downloadType": fileExtension, + "fileName":subFileName, + "recordSource": "PAL画布-下载附件", + "fileName":fileName.substring(0,fileName.lastIndexOf(".")), + "downloadsource": downloadsource + } + jQuery.ajax({ + type: "POST", + url: "./jd?sid=" + encodeURIComponent(sid) + "&cmd=com.awspaas.user.apps.browsing_data.service.downloadRecord", + data: params, + success: function(msg) { + $.simpleAlert("close"); + + }, + err: function(msg) { + $.simpleAlert("close"); + } + }); } + + //附件在线预览 function readFile(uuid) { $.simpleAlert("文件正在处理", "loading"); diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js index 2fd0c29c..b0ec8ecd 100644 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js @@ -317,7 +317,6 @@ $(function () { }); //导出手册 $("#export_file").off("click").on("click", function () { - debugger; menuSelected($(this)); }); diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js index 30065bd8..c649f8bd 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js @@ -4403,7 +4403,6 @@ function outputReport() { palId: ruuid }, success: function (r) { - debugger; if (r.result == "ok") { if(r.data.state == true){ msg+="
您好，您的文件已超过"+r.data.maxFileLength+"M，导出时间可能大于3min，请您耐心等待" diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js index 34dd5873..176ae424 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js @@ -1761,11 +1761,49 @@ function downloadProcessFile(taskId) { success : function(msg) { if (msg.result == "ok") { window.location.href = msg.data.url; + + + + var queryString = msg.data.url.split('?')[1]; + var params = new URLSearchParams(queryString); + var fileName = params.get('fileName'); + var fileExtension = fileName.substring(fileName.lastIndexOf('.')+1); + var subFileName=fileName.substring(0,fileName.lastIndexOf(".")); + + var params = { + "modelId": ruuid , + "modelName": fileName, + "downloadType": fileExtension, + "fileName":subFileName, + "recordSource": "文件阅览-导出手册", + "fileName":fileName.substring(0,fileName.lastIndexOf(".")), + "downloadsource": "导出手册" + } + jQuery.ajax({ + type: "POST", + url: "./jd?sid=" + encodeURIComponent(sid) + "&cmd=com.awspaas.user.apps.browsing_data.service.downloadRecord", + data: params, + success: function(msg) { + $.simpleAlert("close"); + + }, + err: function(msg) { + $.simpleAlert("close"); + } + }); + + }else{ $.simpleAlert("请确认是否已生成流程手册", 'info'); } } }); + + + + + + } @@ -1803,9 +1841,35 @@ function downloadZipFile(splitId,toolbarname) { success : function(msg) { if (msg.result == "ok") { window.location.href = msg.data.url; + + + //插入下载记录数据 + var params = { + "modelId": ruuid, + "modelName":fileName, + "splitId": splitId, + } + jQuery.ajax({ + type: "POST", + url: "./jd?sid=" + encodeURIComponent(sid) + "&cmd=com.awspaas.user.apps.browsing_data.service.downloadRecordByFileRead", + data: params, + success: function(msg) { + $.simpleAlert("close"); + + }, + err: function(msg) { + $.simpleAlert("close"); + } + }); + + } } }); + + + + }