修正component

o2server/x_component_assemble_control/src/main/java/com/x/component/assemble/control/schedule/InitComponents.java

@@ -7,7 +7,9 @@ import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.annotation.CheckPersistType;
 import com.x.base.core.entity.annotation.CheckRemoveType;
+import com.x.base.core.project.config.Components;
 import com.x.base.core.project.config.Config;
+import com.x.base.core.project.gson.XGsonBuilder;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.schedule.AbstractJob;
@@ -33,13 +35,15 @@ public class InitComponents extends AbstractJob {
 
 	private void init() throws Exception {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			List<String> names = ListTools.extractProperty(Config.components().getSystems(), "name", String.class, true,
-					true);
+
 			List<Component> os = emc.listEqualOrIn(Component.class, Component.type_FIELDNAME, Component.TYPE_SYSTEM,
-					Component.type_FIELDNAME, names);
+					Component.name_FIELDNAME, Components.SYSTEM_NAME_NAMES);
+
+			List<String> existNames = ListTools.extractProperty(os, Component.name_FIELDNAME, String.class, true, true);
+
 			List<Component> removes = new ArrayList<>();
 			for (Component o : os) {
-				if (!names.contains(o.getName())) {
+				if (!Components.SYSTEM_NAME_NAMES.contains(o.getName())) {
 					removes.add(o);
 				}
 			}
@@ -50,12 +54,9 @@ public class InitComponents extends AbstractJob {
 				}
 				emc.commit();
 			}
-			for (Component o : os) {
-				names.remove(o.getName());
-			}
 			List<Component> adds = new ArrayList<>();
 			for (com.x.base.core.project.config.Components.Component o : Config.components().getSystems()) {
-				if (!names.contains(o.getName())) {
+				if (!existNames.contains(o.getName())) {
 					Component component = new Component();
 					component.setName(o.getName());
 					component.setPath(o.getPath());

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/draft/ActionListNext.java

@@ -23,9 +23,9 @@ class ActionListNext extends BaseAction {
 	public static class Wo extends Draft {
 
 		private static final long serialVersionUID = 2279846765261247910L;
-
-		static WrapCopier<Draft, Wo> copier = WrapCopierFactory.wo(Draft.class, Wo.class, null,
-				JpaObject.FieldsInvisible);
+		
+		static WrapCopier<Draft, Wo> copier = WrapCopierFactory.wo(Draft.class, Wo.class,
+				JpaObject.singularAttributeField(Draft.class, true, true), null);
 
 		@FieldDescribe("排序号")
 		private Long rank;

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/draft/ActionListPrev.java

@@ -24,8 +24,8 @@ class ActionListPrev extends BaseAction {
 
 		private static final long serialVersionUID = 2279846765261247910L;
 
-		static WrapCopier<Draft, Wo> copier = WrapCopierFactory.wo(Draft.class, Wo.class, null,
-				JpaObject.FieldsInvisible);
+		static WrapCopier<Draft, Wo> copier = WrapCopierFactory.wo(Draft.class, Wo.class,
+				JpaObject.singularAttributeField(Draft.class, true, true), null);
 
 		@FieldDescribe("排序号")
 		private Long rank;