From e5dda7ff31a1ca44e6b092bcca68347b45859f6e Mon Sep 17 00:00:00 2001 From: Mr-wang Date: Wed, 31 Aug 2022 23:26:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=9F=E4=B8=80=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AE=A4=E8=AF=81=E7=9A=84=E7=9B=B8=E5=85=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=A2=9E=E5=8A=A0=E8=AE=A4=E8=AF=81=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=92=8C=E8=AE=A4=E8=AF=81=E9=80=9A=E8=BF=87=E6=97=B6=E9=97=B4?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E4=B8=8B=E8=BD=BD=E7=9A=84=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=94=B1=E9=A1=B5=E9=9D=A2=E5=8A=A0=E8=BD=BD=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=82=B9=E5=87=BB=E6=8C=89=E9=92=AE=E6=97=B6=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CreateFileContorller.java | 47 ++++++++++++------- .../apps/integration/oauth/OauthLogin.java | 2 +- .../integration/oauth/TaskController.java | 10 ++-- 3 files changed, 33 insertions(+), 26 deletions(-) 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 index 1591f1b1..f285eb08 100644 --- 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 @@ -7,6 +7,7 @@ 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.alibaba.fastjson.JSONObject; import com.awspaas.user.apps.integration.event.OutputDCFileProcessor; /* @@ -15,28 +16,38 @@ 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 { + public JSONObject createFile(String sid,String taskId,String title) throws Exception { + System.out.println("taskid》》》》》》》》》》"+taskId); + System.out.println("fileName》》》》》》》》》》"+title); String reportDownloadURL = ""; UserContext me = UserContext.fromSessionId(sid); - OutputTaskModel model = new OutputTask().getTaskReportById(taskId); - - if (model != null) { + OutputTaskModel model = new OutputTask().getTaskReportById(taskId); + JSONObject result = 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 - taskId = uuid; - } - - reportDownloadURL = OutputDCFileProcessor.getReportDownloadURL(model.getWsId(), taskId, model.getProfileId(), me, fileName + model.getTaskName()); + 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; + } + + try { + result.put("result","ok"); + reportDownloadURL = OutputDCFileProcessor.getReportDownloadURL(model.getWsId(), taskId, model.getProfileId(), me, title+model.getTaskName()); + result.put("url",reportDownloadURL); + } catch (Exception e) { + + e.printStackTrace(); + } } - return reportDownloadURL; + return result; } } diff --git a/com.awspaas.user.apps.integrates/src/com/awspaas/user/apps/integration/oauth/OauthLogin.java b/com.awspaas.user.apps.integrates/src/com/awspaas/user/apps/integration/oauth/OauthLogin.java index d7e3b03c..3aebdab5 100644 --- a/com.awspaas.user.apps.integrates/src/com/awspaas/user/apps/integration/oauth/OauthLogin.java +++ b/com.awspaas.user.apps.integrates/src/com/awspaas/user/apps/integration/oauth/OauthLogin.java @@ -92,7 +92,7 @@ public class OauthLogin extends AbstractOauth { try { long loginbegintime = System.currentTimeMillis(); - bo.set("BEGIN_TIME",loginbegintime); + bo.set("LOGIN_BEGIN_TIME",loginbegintime); String redirect_uri = params.get("code"); if(StringUtils.isEmpty(redirect_uri)){ 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 f6087c2e..7ef35cf8 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 @@ -221,7 +221,6 @@ public class TaskController { jsonObject.put("title",bo.get("PUBLISHFILENAME")); jsonObject.put("link",SDK.getPortalAPI().getPortalUrl()+ "/r/w?cmd=com.actionsoft.apps.coe.pal.publisher_publish_file_open&uuid=" + Row_maps_is_not_publish.getString("id") + "&sid=" + sid); jsonObject.put("size",""); -<<<<<<< HEAD jsonObject.put("id",num); jsonObject.put("taskId",id); // OutputTaskModel model = new OutputTask().getTaskReportById(id); @@ -247,11 +246,9 @@ public class TaskController { * * e.printStackTrace(); } } */ -======= - jsonObject.put("id",id); + jsonObject.put("id",num); System.out.println("查询完成后时间》》》》》》》"+System.currentTimeMillis()); - OutputTaskModel model = new OutputTask().getTaskReportById(id); - JSONObject json = new JSONObject(); + /* OutputTaskModel model = new OutputTask().getTaskReportById(id); if (model != null) { //三员管理，步骤横表下载重新生成手册 @@ -274,9 +271,8 @@ public class TaskController { e.printStackTrace(); } - } + }*/ System.out.println("构建表完成时间》》》》》》》"+System.currentTimeMillis()); ->>>>>>> 8f479d37933f5a19fec374d79fe5de2a45d5844c jsonArray.add(jsonObject); num++;