diff --git a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/update/Action2021090901.java b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/upgrade/Action2021090901.java similarity index 95% rename from o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/update/Action2021090901.java rename to o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/upgrade/Action2021090901.java index 1a7f9de7fd3f31b66927dc064c5296349d8d0fa8..af6983a68dd43fb31ad242779bc0fb9db693aa6a 100644 --- a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/update/Action2021090901.java +++ b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/upgrade/Action2021090901.java @@ -1,4 +1,4 @@ -package com.x.general.assemble.control.jaxrs.update; +package com.x.general.assemble.control.jaxrs.upgrade; import java.util.List; diff --git a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/update/Action2021090902.java b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/upgrade/Action2021090902.java similarity index 77% rename from o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/update/Action2021090902.java rename to o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/upgrade/Action2021090902.java index 550bf30b8374a10682340e6cb0195e2bcbb4721a..d456e952a1ac43b027a0151a8eaea4e06fff8424 100644 --- a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/update/Action2021090902.java +++ b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/upgrade/Action2021090902.java @@ -1,7 +1,9 @@ -package com.x.general.assemble.control.jaxrs.update; +package com.x.general.assemble.control.jaxrs.upgrade; import java.util.List; +import org.apache.commons.lang3.BooleanUtils; + import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.project.http.ActionResult; @@ -20,7 +22,10 @@ public class Action2021090902 extends BaseAction { emc.beginTransaction(Route.class); for (Route route : list) { - if (null != route.getProperties().getSoleDirect()) { + if (BooleanUtils.isTrue(route.getProperties().getSoleDirect()) + && BooleanUtils.isTrue(route.getSole())) { + route.getProperties().setSoleDirect(true); + } else { route.getProperties().setSoleDirect(false); } } diff --git a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/update/BaseAction.java b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/upgrade/BaseAction.java similarity index 68% rename from o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/update/BaseAction.java rename to o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/upgrade/BaseAction.java index 4d79b9ea2118315f5b5b55b06a9668d01e667acb..0504aadf137266f4750d887e948cbf6a529d4a1b 100644 --- a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/update/BaseAction.java +++ b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/upgrade/BaseAction.java @@ -1,4 +1,4 @@ -package com.x.general.assemble.control.jaxrs.update; +package com.x.general.assemble.control.jaxrs.upgrade; import com.x.base.core.project.jaxrs.StandardJaxrsAction; diff --git a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/update/UpgradeAction.java b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/upgrade/UpgradeAction.java similarity index 97% rename from o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/update/UpgradeAction.java rename to o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/upgrade/UpgradeAction.java index be881f02c89b3c98ce5424b359cfe6d46d4b9d22..25a6950b1feb4c7548767379a765799629fb527d 100644 --- a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/update/UpgradeAction.java +++ b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/upgrade/UpgradeAction.java @@ -1,4 +1,4 @@ -package com.x.general.assemble.control.jaxrs.update; +package com.x.general.assemble.control.jaxrs.upgrade; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes;