diff --git a/com.awspaas.user.apps.integrates/src/com/awspaas/user/apps/integration/controller/CreateFileContorller.java b/com.awspaas.user.apps.integrates/src/com/awspaas/user/apps/integration/controller/CreateFileContorller.java new file mode 100644 index 00000000..1591f1b1 --- /dev/null +++ b/com.awspaas.user.apps.integrates/src/com/awspaas/user/apps/integration/controller/CreateFileContorller.java @@ -0,0 +1,42 @@ +package com.awspaas.user.apps.integration.controller; + +import com.actionsoft.apps.coe.pal.pal.output.OutputAPIManager; +import com.actionsoft.apps.coe.pal.pal.output.dao.OutputTask; +import com.actionsoft.apps.coe.pal.pal.output.model.OutputTaskModel; +import com.actionsoft.bpms.server.UserContext; +import com.actionsoft.bpms.server.bind.annotation.Controller; +import com.actionsoft.bpms.server.bind.annotation.Mapping; +import com.actionsoft.bpms.util.UUIDGener; +import com.awspaas.user.apps.integration.event.OutputDCFileProcessor; + +/* + * 文件阅览界面下载时创建手册 + */ +@Controller +public class CreateFileContorller { + @Mapping("com.awspaas.user.apps.integrates.createFileController") + public String createFile(String sid,String taskId,String fileName) throws Exception { + String reportDownloadURL = ""; + UserContext me = UserContext.fromSessionId(sid); + OutputTaskModel model = new OutputTask().getTaskReportById(taskId); + + if (model != null) { + //三员管理,步骤横表下载重新生成手册 + String taskName = model.getTaskName(); + if ("步骤横表".equals(taskName)){ + // 重新设置生成id,与用户id + String uuid = UUIDGener.getUUID(); + model.setUserId(me.getUID()); + + // 重新生成手册文件 + OutputAPIManager.getInstance().reGennerReport(me,model,uuid); + + // 重新构建手册下载URL + taskId = uuid; + } + + reportDownloadURL = OutputDCFileProcessor.getReportDownloadURL(model.getWsId(), taskId, model.getProfileId(), me, fileName + model.getTaskName()); + } + return reportDownloadURL; + } +} diff --git a/com.awspaas.user.apps.integrates/src/com/awspaas/user/apps/integration/oauth/TaskController.java b/com.awspaas.user.apps.integrates/src/com/awspaas/user/apps/integration/oauth/TaskController.java index 9a920ff0..e22e4a81 100644 --- a/com.awspaas.user.apps.integrates/src/com/awspaas/user/apps/integration/oauth/TaskController.java +++ b/com.awspaas.user.apps.integrates/src/com/awspaas/user/apps/integration/oauth/TaskController.java @@ -222,32 +222,30 @@ public class TaskController { jsonObject.put("link",SDK.getPortalAPI().getPortalUrl()+ "/r/w?cmd=com.actionsoft.apps.coe.pal.publisher_publish_file_open&uuid=" + Row_maps_is_not_publish.get(0).getString("id") + "&sid=" + sid); jsonObject.put("size",""); jsonObject.put("id",num); - - OutputTaskModel model = new OutputTask().getTaskReportById(id); - JSONObject json = new JSONObject(); - if (model != null) { - //三员管理,步骤横表下载重新生成手册 - - String taskName = model.getTaskName(); - if ("步骤横表".equals(taskName)){ - // 重新设置生成id,与用户id - String uuid = UUIDGener.getUUID(); - model.setUserId(me.getUID()); - - // 重新生成手册文件 - OutputAPIManager.getInstance().reGennerReport(me,model,uuid); - - // 重新构建手册下载URL - id = uuid; - } - - try { - jsonObject.put("url", OutputDCFileProcessor.getReportDownloadURL(model.getWsId(), id, model.getProfileId(), me, bo.get("PUBLISHFILENAME")+model.getTaskName())); - } catch (Exception e) { - - e.printStackTrace(); - } - } + jsonObject.put("taskId",id); + // OutputTaskModel model = new OutputTask().getTaskReportById(id); + //JSONObject json = new JSONObject(); + /* + * if (model != null) { //三员管理,步骤横表下载重新生成手册 + * + * String taskName = model.getTaskName(); + * + * String str = ""; + * + * if ("步骤横表".equals(taskName)){ // 重新设置生成id,与用户id String uuid = + * UUIDGener.getUUID(); model.setUserId(me.getUID()); + * + * // 重新生成手册文件 OutputAPIManager.getInstance().reGennerReport(me,model,uuid); + * + * // 重新构建手册下载URL id = uuid; } + * + * try { //jsonObject.put("url", + * OutputDCFileProcessor.getReportDownloadURL(model.getWsId(), id, + * model.getProfileId(), me, bo.get("PUBLISHFILENAME")+model.getTaskName())); + * jsonObject.put("taskId",id); } catch (Exception e) { + * + * e.printStackTrace(); } } + */ jsonArray.add(jsonObject); num++;