Merge branch 'fix/增加断开collect连接接口' into 'develop'

Merge of fix/[中心服务]增加断开collect连接接口 to develop

See merge request o2oa/o2oa!227

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionDisconnect.java

@@ -0,0 +1,23 @@
+package com.x.program.center.jaxrs.collect;
+
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.jaxrs.WrapBoolean;
+
+class ActionDisconnect extends BaseAction {
+
+	ActionResult<Wo> execute() throws Exception {
+		ActionResult<Wo> result = new ActionResult<>();
+		Wo wo = new Wo();
+		wo.setValue(true);
+		Config.collect().setEnable(false);
+		Config.collect().save();
+		Config.flush();
+		result.setData(wo);
+		return result;
+	}
+
+	public static class Wo extends WrapBoolean {
+	}
+
+}

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/CollectAction.java

@@ -1,12 +1,5 @@
 package com.x.program.center.jaxrs.collect;
 
-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;
-
 import com.google.gson.JsonElement;
 import com.x.base.core.project.annotation.JaxrsDescribe;
 import com.x.base.core.project.annotation.JaxrsMethodDescribe;
@@ -19,6 +12,13 @@ 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("collect")
 @JaxrsDescribe("云服务器")
 public class CollectAction extends StandardJaxrsAction {
@@ -93,6 +93,23 @@ public class CollectAction extends StandardJaxrsAction {
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}
 
+	@GET
+	@Path("disconnect")
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
+	@JaxrsMethodDescribe(value = "断开collect服务的连接", action = ActionDisconnect.class)
+	public void disconnect(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) {
+		ActionResult<ActionDisconnect.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		try {
+			result = new ActionDisconnect().execute();
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+	}
+
 	@GET
 	@Path("validate")
 	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)