From cf739d35a0f0abf01d38c864772fc06832c420a2 Mon Sep 17 00:00:00 2001
From: lihongyu <504404568@qq.com>
Date: Tue, 30 Aug 2022 13:48:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9E=8B=E9=98=85?=
 =?UTF-8?q?=E8=A7=88=E4=B8=8B=E8=BD=BD=E6=97=B6=E5=86=8D=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=94=9F=E6=88=90=E5=99=A8=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CreateFileContorller.java      | 42 ++++++++++++++++
 .../integration/oauth/TaskController.java     | 50 +++++++++----------
 2 files changed, 66 insertions(+), 26 deletions(-)
 create mode 100644 com.awspaas.user.apps.integrates/src/com/awspaas/user/apps/integration/controller/CreateFileContorller.java

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++;