Merge branch 'feature/增加同步区域接口' into 'wrdp'

【中心服务】增加手动发起同步区域接口

See merge request o2oa/o2oa!1898

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

+package com.x.program.center.jaxrs.collect;
+
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.jaxrs.WrapBoolean;
+import com.x.program.center.ThisApplication;
+import com.x.program.center.schedule.Area;
+
+class ActionSyncArea extends BaseAction {
+
+	ActionResult<Wo> execute(EffectivePerson effectivePerson) throws Exception {
+		ActionResult<Wo> result = new ActionResult<>();
+		Wo wo = new Wo();
+		wo.setValue(true);
+		result.setData(wo);
+		ThisApplication.context().scheduleLocal(Area.class);
+		return result;
+	}
+
+	public static class Wo extends WrapBoolean {
+	}
+
+}

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

@@ -326,4 +326,21 @@ public class CollectAction extends StandardJaxrsAction {
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}
 
+	@JaxrsMethodDescribe(value = "从collect 服务器同步area信息.", action = ActionSyncArea.class)
+	@GET
+	@Path("sync/area")
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public void syncArea(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) {
+		ActionResult<ActionSyncArea.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		try {
+			result = new ActionSyncArea().execute(effectivePerson);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+	}
+
 }
\ No newline at end of file

o2server/x_program_center/src/main/java/com/x/program/center/schedule/Area.java

@@ -40,7 +40,9 @@ public class Area extends BaseAction {
 		try {
 			if (pirmaryCenter()) {
 				if (Config.collect().getEnable()) {
+					logger.print("start sync area from o2 cloud!");
 					area();
+					logger.print("completed sync area!");
 				}
 			}
 		} catch (Exception e) {