diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionSyncArea.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionSyncArea.java new file mode 100644 index 0000000000000000000000000000000000000000..272422dc5ce22c831ab30097d8fe32f5debd5cde --- /dev/null +++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionSyncArea.java @@ -0,0 +1,23 @@ +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 execute(EffectivePerson effectivePerson) throws Exception { + ActionResult 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 { + } + +} diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/CollectAction.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/CollectAction.java index fd6dd07bd4f06a924a19478fecd5f2f9503773fb..9d91251e3efedafcfbbc1234e235bb8951fd0a62 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/CollectAction.java +++ b/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 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 diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/schedule/Area.java b/o2server/x_program_center/src/main/java/com/x/program/center/schedule/Area.java index 28af6a897aaa79a0a992c7bec13d85c7a6d26a55..101ca4d5ad68d1c4b5bdcb8d41906ee289902c54 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/schedule/Area.java +++ b/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) {