From 47c7236a8e2c29af4a2f2b23b33f866bb38beaf5 Mon Sep 17 00:00:00 2001 From: o2null Date: Tue, 24 Nov 2020 16:51:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4general?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../control/jaxrs/general/ActionGet.java | 54 ------------------- .../control/jaxrs/general/BaseAction.java | 7 --- .../general/ExceptionInputFileObject.java | 13 ----- .../control/jaxrs/general/FileAction.java | 43 --------------- .../jaxrs/generalfile/GeneralFileAction.java | 17 +++--- 5 files changed, 10 insertions(+), 124 deletions(-) delete mode 100644 o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/general/ActionGet.java delete mode 100644 o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/general/BaseAction.java delete mode 100644 o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/general/ExceptionInputFileObject.java delete mode 100644 o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/general/FileAction.java diff --git a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/general/ActionGet.java b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/general/ActionGet.java deleted file mode 100644 index c4227e0190..0000000000 --- a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/general/ActionGet.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.x.general.assemble.control.jaxrs.general; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.project.config.StorageMapping; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.WoFile; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.general.assemble.control.ThisApplication; -import com.x.general.core.entity.general.File; - - -public class ActionGet extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionGet.class); - - protected ActionResult execute(EffectivePerson effectivePerson, String flag) throws Exception { - logger.debug(effectivePerson, "flag:{}.", flag); - ActionResult result = new ActionResult<>(); - Wo wo = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - File generalFile = emc.find(flag, File.class); - if(generalFile!=null){ - StorageMapping gfMapping = ThisApplication.context().storageMappings().get(File.class, - generalFile.getStorage()); - wo = new Wo(generalFile.readContent(gfMapping), this.contentType(false, generalFile.getName()), - this.contentDisposition(false, generalFile.getName())); - result.setData(wo); - - generalFile.deleteContent(gfMapping); - emc.beginTransaction(File.class); - emc.delete(File.class, generalFile.getId()); - emc.commit(); - } else { - throw new ExceptionInputFileObject(flag); - } - - } - result.setData(wo); - return result; - - } - - public static class Wo extends WoFile { - - public Wo(byte[] bytes, String contentType, String contentDisposition) { - super(bytes, contentType, contentDisposition); - } - - } - -} diff --git a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/general/BaseAction.java b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/general/BaseAction.java deleted file mode 100644 index 4f0b983a57..0000000000 --- a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/general/BaseAction.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.x.general.assemble.control.jaxrs.general; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; - -abstract class BaseAction extends StandardJaxrsAction { - -} diff --git a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/general/ExceptionInputFileObject.java b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/general/ExceptionInputFileObject.java deleted file mode 100644 index c0dc15964d..0000000000 --- a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/general/ExceptionInputFileObject.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.general.assemble.control.jaxrs.general; - -import com.x.base.core.project.exception.PromptException; - -public class ExceptionInputFileObject extends PromptException { - - private static final long serialVersionUID = 9085364457175859374L; - - ExceptionInputFileObject(String flag) { - super("对象不存在:{}.", flag); - } - -} \ No newline at end of file diff --git a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/general/FileAction.java b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/general/FileAction.java deleted file mode 100644 index d6d4513fb1..0000000000 --- a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/general/FileAction.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.x.general.assemble.control.jaxrs.general; - -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.*; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.container.Suspended; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; - -@Path("generalfile") -@JaxrsDescribe("获取附件") -public class FileAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(FileAction.class); - - @JaxrsMethodDescribe(value = "获取附件.", action = ActionGet.class) - @GET - @Path("flag/{flag}") - @Consumes(MediaType.APPLICATION_JSON) - public void getResult(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("附件标记") @PathParam("flag") String flag) { - ActionResult result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionGet().execute(effectivePerson, flag); - } catch (Exception e) { - logger.error(e, effectivePerson, request, null); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - -} \ No newline at end of file diff --git a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/generalfile/GeneralFileAction.java b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/generalfile/GeneralFileAction.java index 37493dfc62..8d198fe70e 100644 --- a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/generalfile/GeneralFileAction.java +++ b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/generalfile/GeneralFileAction.java @@ -1,5 +1,15 @@ package com.x.general.assemble.control.jaxrs.generalfile; +import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.container.AsyncResponse; +import javax.ws.rs.container.Suspended; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; + import com.x.base.core.project.annotation.JaxrsDescribe; import com.x.base.core.project.annotation.JaxrsMethodDescribe; import com.x.base.core.project.annotation.JaxrsParameterDescribe; @@ -10,13 +20,6 @@ import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.*; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.container.Suspended; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; - @Path("generalfile") @JaxrsDescribe("获取附件") public class GeneralFileAction extends StandardJaxrsAction { -- GitLab