From 0a10b173cc728fdb714d2284cc15343c7b307977 Mon Sep 17 00:00:00 2001 From: o2sword <171715986@qq.com> Date: Tue, 24 Nov 2020 14:28:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=BF=E5=BC=8F=E5=85=AC?= =?UTF-8?q?=E6=96=87=E8=BD=ACofd=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/project/config/ProcessPlatform.java | 18 ++++++++++++++++ .../ActionDocToWordWorkOrWorkCompleted.java | 21 ++++++++++++++----- .../surface/jaxrs/attachment/BaseAction.java | 2 ++ 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ProcessPlatform.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ProcessPlatform.java index cd22fa4a3f..d36db49f34 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ProcessPlatform.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ProcessPlatform.java @@ -601,12 +601,16 @@ public class ProcessPlatform extends ConfigObject { private WorkExtensionEvents workAttachmentDownloadEvents = new WorkExtensionEvents(); @FieldDescribe("工作版式文件转word.") private WorkExtensionEvents workDocToWordEvents = new WorkExtensionEvents(); + @FieldDescribe("工作版式文件转OFD.") + private WorkExtensionEvents workDocToOfdEvents = new WorkExtensionEvents(); @FieldDescribe("已完成工作附件上传.") private WorkCompletedExtensionEvents workCompletedAttachmentUploadEvents = new WorkCompletedExtensionEvents(); @FieldDescribe("已完成工作附件下载.") private WorkCompletedExtensionEvents workCompletedAttachmentDownloadEvents = new WorkCompletedExtensionEvents(); @FieldDescribe("已完成工作版式文件转word.") private WorkCompletedExtensionEvents workCompletedDocToWordEvents = new WorkCompletedExtensionEvents(); + @FieldDescribe("已完成工作版式文件转OFD.") + private WorkCompletedExtensionEvents workCompletedDocToOfdEvents = new WorkCompletedExtensionEvents(); public WorkExtensionEvents getWorkAttachmentUploadEvents() { if (null == this.workAttachmentUploadEvents) { @@ -629,6 +633,13 @@ public class ProcessPlatform extends ConfigObject { return workDocToWordEvents; } + public WorkExtensionEvents getWorkDocToOfdEvents() { + if (null == this.workDocToOfdEvents) { + this.workDocToOfdEvents = new WorkExtensionEvents(); + } + return workDocToOfdEvents; + } + public WorkCompletedExtensionEvents getWorkCompletedAttachmentUploadEvents() { if (null == this.workCompletedAttachmentUploadEvents) { this.workCompletedAttachmentUploadEvents = new WorkCompletedExtensionEvents(); @@ -650,6 +661,13 @@ public class ProcessPlatform extends ConfigObject { return workCompletedDocToWordEvents; } + public WorkCompletedExtensionEvents getWorkCompletedDocToOfdEvents() { + if (null == this.workCompletedDocToOfdEvents) { + this.workCompletedDocToOfdEvents = new WorkCompletedExtensionEvents(); + } + return workCompletedDocToOfdEvents; + } + } public static class WorkExtensionEvents extends ArrayList { diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionDocToWordWorkOrWorkCompleted.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionDocToWordWorkOrWorkCompleted.java index 274146031e..a217da76db 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionDocToWordWorkOrWorkCompleted.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionDocToWordWorkOrWorkCompleted.java @@ -74,9 +74,14 @@ class ActionDocToWordWorkOrWorkCompleted extends BaseAction { private byte[] workConvert(EffectivePerson effectivePerson, Wi wi, String application, String process, String activity, String job) throws Exception { byte[] bytes = null; - Optional event = Config.processPlatform().getExtensionEvents().getWorkDocToWordEvents() - .bind(application, process, activity); - + Optional event; + if(wi.getFileName().toLowerCase().endsWith(OFD_ATT_KEY)){ + event = Config.processPlatform().getExtensionEvents().getWorkDocToOfdEvents() + .bind(application, process, activity); + }else{ + event = Config.processPlatform().getExtensionEvents().getWorkDocToWordEvents() + .bind(application, process, activity); + } if (event.isPresent()) { bytes = this.workExtensionService(effectivePerson, wi.getContent(), event.get(), job); } else { @@ -107,8 +112,14 @@ class ActionDocToWordWorkOrWorkCompleted extends BaseAction { private byte[] workCompletedConvert(EffectivePerson effectivePerson, Wi wi, String application, String process, String job) throws Exception { byte[] bytes = null; - Optional event = Config.processPlatform().getExtensionEvents() - .getWorkCompletedDocToWordEvents().bind(application, process); + Optional event; + if(wi.getFileName().toLowerCase().endsWith(OFD_ATT_KEY)){ + event = Config.processPlatform().getExtensionEvents() + .getWorkCompletedDocToOfdEvents().bind(application, process); + }else{ + event = Config.processPlatform().getExtensionEvents() + .getWorkCompletedDocToWordEvents().bind(application, process); + } if (event.isPresent()) { bytes = this.workCompletedExtensionService(effectivePerson, wi.getContent(), event.get(), job); } else { diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/BaseAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/BaseAction.java index 39dc67d6b5..7c8cca6fd4 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/BaseAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/BaseAction.java @@ -32,6 +32,8 @@ abstract class BaseAction extends StandardJaxrsAction { private static Logger logger = LoggerFactory.getLogger(BaseAction.class); + protected final static String OFD_ATT_KEY = ".ofd"; + public static class WiExtraParam { private String site; -- GitLab