diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java index 532e6c7375945aae0ab5245536a517b86402223d..b119476ffa442dad255537c58b39af930a63458b 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java @@ -82,24 +82,28 @@ public abstract class JpaObject extends GsonPropertyObject implements Serializab public static final String scratchInteger_FIELDNAME = "scratchInteger"; + public static final String properties_FIELDNAME = "properties"; + public static final String JsonPropertiesValueHandler = "com.x.base.core.entity.annotation.JsonPropertiesValueHandler"; - public static final List FieldsUnmodify = ListUtils.unmodifiableList(Arrays.asList(id_FIELDNAME, - distributeFactor_FIELDNAME, createTime_FIELDNAME, updateTime_FIELDNAME, sequence_FIELDNAME, - scratchString_FIELDNAME, scratchBoolean_FIELDNAME, scratchDate_FIELDNAME, scratchInteger_FIELDNAME)); + public static final List FieldsUnmodify = ListUtils + .unmodifiableList(Arrays.asList(id_FIELDNAME, distributeFactor_FIELDNAME, createTime_FIELDNAME, + updateTime_FIELDNAME, sequence_FIELDNAME, scratchString_FIELDNAME, scratchBoolean_FIELDNAME, + scratchDate_FIELDNAME, scratchInteger_FIELDNAME, properties_FIELDNAME)); - public static final List FieldsUnmodifyExcludeId = ListUtils.unmodifiableList(Arrays.asList( - distributeFactor_FIELDNAME, createTime_FIELDNAME, updateTime_FIELDNAME, sequence_FIELDNAME, - scratchString_FIELDNAME, scratchBoolean_FIELDNAME, scratchDate_FIELDNAME, scratchInteger_FIELDNAME)); + public static final List FieldsUnmodifyExcludeId = ListUtils + .unmodifiableList(Arrays.asList(distributeFactor_FIELDNAME, createTime_FIELDNAME, updateTime_FIELDNAME, + sequence_FIELDNAME, scratchString_FIELDNAME, scratchBoolean_FIELDNAME, scratchDate_FIELDNAME, + scratchInteger_FIELDNAME, properties_FIELDNAME)); public static final List FieldsInvisible = ListUtils.unmodifiableList( Arrays.asList(distributeFactor_FIELDNAME, sequence_FIELDNAME, password_FIELDNAME, scratchString_FIELDNAME, - scratchBoolean_FIELDNAME, scratchDate_FIELDNAME, scratchInteger_FIELDNAME)); + scratchBoolean_FIELDNAME, scratchDate_FIELDNAME, scratchInteger_FIELDNAME, properties_FIELDNAME)); public static final List FieldsDefault = ListUtils .unmodifiableList(Arrays.asList(id_FIELDNAME, key_FIELDNAME, createTime_FIELDNAME, updateTime_FIELDNAME, sequence_FIELDNAME, distributeFactor_FIELDNAME, password_FIELDNAME, scratchString_FIELDNAME, - scratchBoolean_FIELDNAME, scratchDate_FIELDNAME, scratchInteger_FIELDNAME)); + scratchBoolean_FIELDNAME, scratchDate_FIELDNAME, scratchInteger_FIELDNAME, properties_FIELDNAME)); @FieldDescribe("创建时间,自动生成,索引创建在约束中.") @Column(name = ColumnNamePrefix + createTime_FIELDNAME) diff --git a/o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/form/ActionEdit.java b/o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/form/ActionEdit.java index 66cb2c6a2cdb523918cfa046043f7dc0a0cecee1..3cbdff67b4ea1ba8261f5d56403a2d612fa8a243 100644 --- a/o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/form/ActionEdit.java +++ b/o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/form/ActionEdit.java @@ -63,12 +63,16 @@ class ActionEdit extends BaseAction { Wi.copier.copy(wi, form); form.setId(id); form.setApplication(application.getId()); - FormProperties properties = new FormProperties(); - properties.setRelatedFormList(wi.getRelatedFormList()); - properties.setMobileRelatedFormList(wi.getMobileRelatedFormList()); - properties.setRelatedScriptMap(wi.getRelatedScriptMap()); - properties.setMobileRelatedScriptMap(wi.getMobileRelatedScriptMap()); - form.setProperties(properties); + // FormProperties properties = new FormProperties(); +// properties.setRelatedFormList(wi.getRelatedFormList()); +// properties.setMobileRelatedFormList(wi.getMobileRelatedFormList()); +// properties.setRelatedScriptMap(wi.getRelatedScriptMap()); +// properties.setMobileRelatedScriptMap(wi.getMobileRelatedScriptMap()); + // form.setP!!!roperties(properties); + form.getProperties().setRelatedFormList(wi.getRelatedFormList()); + form.getProperties().setMobileRelatedFormList(wi.getMobileRelatedFormList()); + form.getProperties().setRelatedScriptMap(wi.getRelatedScriptMap()); + form.getProperties().setMobileRelatedScriptMap(wi.getMobileRelatedScriptMap()); emc.check(form, CheckPersistType.all); emc.commit(); ApplicationCache.notify(Form.class); diff --git a/o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/process/BaseAction.java b/o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/process/BaseAction.java index df68fd6406a0acb20c659c68c152367d3d19997f..24345bbbc6edd79f921d0772b2cb03a13fd74c08 100644 --- a/o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/process/BaseAction.java +++ b/o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/process/BaseAction.java @@ -726,6 +726,7 @@ abstract class BaseAction extends StandardJaxrsAction { business.entityManagerContainer().persist(o, CheckPersistType.all); } else { WrapRoute.inCopier.copy(w, o); + business.entityManagerContainer().check(o, CheckPersistType.all); } } diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Draft.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Draft.java index 9a698f01ecd59bee4f4c4133461db800c05fdf59..999ff789b7a8e66fb031f1f9f88aafe6691c5de7 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Draft.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Draft.java @@ -238,8 +238,6 @@ public class Draft extends SliceJpaObject { this.unit = unit; } - public void setProperties(DraftProperties properties) { - this.properties = properties; - } + } \ No newline at end of file diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/ReadCompleted.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/ReadCompleted.java index 24afb81331a33e15fff36f11378f0b84adadaeb3..2268ab56866b23c497c808a4a3de6cad7e3b982d 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/ReadCompleted.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/ReadCompleted.java @@ -1142,8 +1142,6 @@ public class ReadCompleted extends SliceJpaObject implements ProjectionInterface this.currentActivityName = currentActivityName; } - public void setProperties(ReadCompletedProperties properties) { - this.properties = properties; - } + } \ No newline at end of file diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Record.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Record.java index e6dc75de7dc7a279f5a6c491ded1500b34b79992..b495aa168eff1a9d02545516cbb098dfdd5425fc 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Record.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Record.java @@ -467,9 +467,7 @@ public class Record extends SliceJpaObject { this.type = type; } - public void setProperties(RecordProperties properties) { - this.properties = properties; - } + public String getApplication() { return application; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Review.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Review.java index 7c345bae5cb7a355192d255f9e7f54cf446a9410..03b2428851403778b0d9676e62cdf5f475e364da 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Review.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Review.java @@ -956,8 +956,5 @@ public class Review extends SliceJpaObject implements ProjectionInterface { return stringValue01_FIELDNAME; } - public void setProperties(ReviewProperties properties) { - this.properties = properties; - } - + } \ No newline at end of file diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/TaskCompleted.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/TaskCompleted.java index 4eec7d70ed1c540cbb7a9d6b7ba9863023364126..b4c2e4afeb273446ed3a1a18dd41c6b19f94f189 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/TaskCompleted.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/TaskCompleted.java @@ -1486,9 +1486,7 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface this.empowerFromIdentity = empowerFromIdentity; } - public void setProperties(TaskCompletedProperties properties) { - this.properties = properties; - } + public String getProcessingType() { return processingType; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Work.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Work.java index 128a84fa7a6b5ea9e2838201353bc7492f8d01da..f156c49b8b39e376f48464ce3714cc033eb50eec 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Work.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Work.java @@ -1268,9 +1268,7 @@ public class Work extends SliceJpaObject implements ProjectionInterface { this.workCreateType = workCreateType; } - public void setProperties(WorkProperties properties) { - this.properties = properties; - } + public void setManualTaskIdentityList(List manualTaskIdentityList) { this.manualTaskIdentityList = manualTaskIdentityList; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkCompleted.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkCompleted.java index 4b4658c8c6671fe23a6663ceb3d8f656da2b3562..b1205b481123947c10fe90407e5209893b40b64c 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkCompleted.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkCompleted.java @@ -1049,9 +1049,7 @@ public class WorkCompleted extends SliceJpaObject implements ProjectionInterface this.merged = merged; } - public void setProperties(WorkCompletedProperties properties) { - this.properties = properties; - } + public String getActivity() { return activity; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Form.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Form.java index ad3de834b85c1b31235905897fe8b99ee70d6dd1..314d3ebfc4da108d42a6e13c946782e82cad301b 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Form.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Form.java @@ -194,7 +194,7 @@ public class Form extends SliceJpaObject { public static final String data_FIELDNAME = "data"; @FieldDescribe("文本内容.") @Lob -@Basic(fetch = FetchType.EAGER) + @Basic(fetch = FetchType.EAGER) // @Persistent(fetch = FetchType.EAGER) @Column(length = JpaObject.length_10M, name = ColumnNamePrefix + data_FIELDNAME) @CheckPersist(allowEmpty = true) @@ -203,8 +203,8 @@ public class Form extends SliceJpaObject { public static final String mobileData_FIELDNAME = "mobileData"; @FieldDescribe("移动端文本内容.") @Lob - @Basic(fetch = FetchType.EAGER) - //@Persistent(fetch = FetchType.EAGER) + @Basic(fetch = FetchType.EAGER) + // @Persistent(fetch = FetchType.EAGER) @Column(length = JpaObject.length_10M, name = ColumnNamePrefix + mobileData_FIELDNAME) @CheckPersist(allowEmpty = true) private String mobileData; @@ -307,8 +307,4 @@ public class Form extends SliceJpaObject { this.hasMobile = hasMobile; } - public void setProperties(FormProperties properties) { - this.properties = properties; - } - } \ No newline at end of file diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Manual.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Manual.java index 45cb61adf4c1a4bdb1f2d7ec70b984701ef17b25..427178df7030a2a450dd80d9fd590901f39353d2 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Manual.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Manual.java @@ -636,9 +636,7 @@ public class Manual extends Activity { @CheckPersist(allowEmpty = true) private ManualProperties properties; - public void setProperties(ManualProperties properties) { - this.properties = properties; - } + public String getDisplayLogScript() { return displayLogScript; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Route.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Route.java index 8bf263391b4f94865fc29280efc8a7c1f7e01f74..6e67190a608e285a9e7c575ce9fc9b718e0fce5a 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Route.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Route.java @@ -85,10 +85,6 @@ public class Route extends SliceJpaObject { return this.properties; } - public void setProperties(RouteProperties properties) { - this.properties = properties; - } - public Boolean getAsyncSupported() { return asyncSupported; } diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/SignalStackLog.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/SignalStackLog.java index 9cf73c2a577177d8d0810b8923bd5db0ebf39ec9..f0914f74cf5bfebfaa52b9d7faeda88c7d59da4e 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/SignalStackLog.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/SignalStackLog.java @@ -69,10 +69,6 @@ public class SignalStackLog extends SliceJpaObject { return this.properties; } - public void setProperties(SignalStackLogProperties properties) { - this.properties = properties; - } - public SignalStack getSignalStack() { return this.getProperties().getSignalStack(); }