diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Bind.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Bind.java index 3a628d1a02a547f5a3fe710bed233f707357abd3..0cf8291517e28c9c7ca1b44c3b13258416f6ff7b 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Bind.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Bind.java @@ -17,7 +17,7 @@ import com.x.base.core.entity.annotation.ContainerEntity; import com.x.base.core.project.annotation.FieldDescribe; @Entity -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) +@ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @Table(name = PersistenceProperties.Bind.table, uniqueConstraints = { @UniqueConstraint(name = PersistenceProperties.Bind.table + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Custom.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Custom.java index 608caeb393766a8467917646c957c8f7a8a61c59..01b7f3b3680e7f9365c973ad4dbb42a24d61d5b4 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Custom.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Custom.java @@ -22,7 +22,7 @@ import com.x.base.core.entity.annotation.Flag; import com.x.base.core.project.annotation.FieldDescribe; @Entity -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) +@ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @Table(name = PersistenceProperties.Custom.table, uniqueConstraints = { @UniqueConstraint(name = PersistenceProperties.Custom.table + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Definition.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Definition.java index d6123cd31106c0ff370382fc5fafc4836d89b665..07db64f1f78642f671b7c58cb518353cf5b5f60b 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Definition.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Definition.java @@ -1,7 +1,5 @@ package com.x.organization.core.entity; -import java.util.Date; - import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,7 +23,7 @@ import com.x.base.core.entity.annotation.Flag; import com.x.base.core.project.annotation.FieldDescribe; @Entity -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) +@ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @Table(name = PersistenceProperties.Definition.table, uniqueConstraints = { @UniqueConstraint(name = PersistenceProperties.Definition.table + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Group.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Group.java index 6f920f76c3ac7b8028f0de6e5ac840fc1b4ca49d..021ec7fef4c0bc9564213114905e180fd030104c 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Group.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Group.java @@ -34,7 +34,7 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.tools.DateTools; @Entity -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) +@ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @Table(name = PersistenceProperties.Group.table, uniqueConstraints = { @UniqueConstraint(name = PersistenceProperties.Group.table + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Identity.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Identity.java index bb1948688b3b495ef9a6c251de9e487b97bdc3b8..6665e04b9492bf971037e48c2dec4c6f0eb61ca4 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Identity.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Identity.java @@ -28,7 +28,7 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.tools.DateTools; @Entity -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) +@ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @Table(name = PersistenceProperties.Identity.table, uniqueConstraints = { @UniqueConstraint(name = PersistenceProperties.Identity.table + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/OauthCode.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/OauthCode.java index 6b892f4184f393d6135f02b0c8a5b2551126b8c6..0610c000e9f6a6525e1d84b896d3f0a879a8a4dd 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/OauthCode.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/OauthCode.java @@ -18,7 +18,7 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.tools.StringTools; @Entity -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) +@ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @Table(name = PersistenceProperties.OauthCode.table, uniqueConstraints = { @UniqueConstraint(name = PersistenceProperties.OauthCode.table + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/PermissionSetting.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/PermissionSetting.java index 58e8513172aa2a46bde317546a4a665a72199649..6442e3166ade55e507fe6bf7821dbad40fde0e92 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/PermissionSetting.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/PermissionSetting.java @@ -28,7 +28,7 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.tools.DateTools; @Entity -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) +@ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @Table(name = PersistenceProperties.PermissionSetting.table, uniqueConstraints = { @UniqueConstraint(name = PersistenceProperties.PermissionSetting.table + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Person.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Person.java index c5e144ad9ae17b3888886384d30c54cfa1658001..fad859a3e8a96b1c5a0403fd57052f28e7f1c1cc 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Person.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Person.java @@ -45,7 +45,7 @@ import com.x.base.core.project.tools.DateTools; import com.x.base.core.project.tools.StringTools; @Entity -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) +@ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @Table(name = PersistenceProperties.Person.table, uniqueConstraints = { @UniqueConstraint(name = PersistenceProperties.Person.table + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/PersonAttribute.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/PersonAttribute.java index 66ac7b0ca355288f1cec04c1e3754ef097540fc3..0de3db277c96e153eea1fc14a4b56b6c233093e0 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/PersonAttribute.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/PersonAttribute.java @@ -1,6 +1,5 @@ package com.x.organization.core.entity; -import java.util.Date; import java.util.List; import javax.persistence.Column; @@ -34,7 +33,7 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.tools.DateTools; @Entity -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) +@ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @Table(name = PersistenceProperties.PersonAttribute.table, uniqueConstraints = { @UniqueConstraint(name = PersistenceProperties.PersonAttribute.table + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/PersonCard.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/PersonCard.java index 80f36577ee59238903b47b8b2dca1153847520a8..f8797f576897af125245c440031a28cd52cbd51a 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/PersonCard.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/PersonCard.java @@ -1,31 +1,16 @@ package com.x.organization.core.entity; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.EnumType; import javax.persistence.Enumerated; -import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; -import javax.persistence.Lob; -import javax.persistence.OrderColumn; import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; import javax.persistence.UniqueConstraint; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.DateUtils; -import org.apache.openjpa.persistence.PersistentCollection; -import org.apache.openjpa.persistence.jdbc.ContainerTable; -import org.apache.openjpa.persistence.jdbc.ElementColumn; -import org.apache.openjpa.persistence.jdbc.ElementIndex; import org.apache.openjpa.persistence.jdbc.Index; import com.github.stuxuhai.jpinyin.PinyinFormat; @@ -34,18 +19,14 @@ import com.x.base.core.entity.AbstractPersistenceProperties; import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.SliceJpaObject; import com.x.base.core.entity.annotation.CheckPersist; -import com.x.base.core.entity.annotation.CheckRemove; -import com.x.base.core.entity.annotation.CitationExist; -import com.x.base.core.entity.annotation.CitationNotExist; import com.x.base.core.entity.annotation.ContainerEntity; import com.x.base.core.entity.annotation.Flag; import com.x.base.core.entity.type.GenderType; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.tools.DateTools; -import com.x.base.core.project.tools.StringTools; @Entity -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) +@ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @Table(name = PersistenceProperties.PersonCard.table, uniqueConstraints = { @UniqueConstraint(name = PersistenceProperties.PersonCard.table + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Role.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Role.java index dcd34772ef4ad0493ae17fabc9783db56a6b7c43..68afbcbc61db7c6ff0c3043c51566228dcadbe0f 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Role.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Role.java @@ -1,7 +1,6 @@ package com.x.organization.core.entity; import java.util.ArrayList; -import java.util.Date; import java.util.List; import javax.persistence.Column; @@ -34,7 +33,7 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.tools.DateTools; @Entity -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) +@ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @Table(name = PersistenceProperties.Role.table, uniqueConstraints = { @UniqueConstraint(name = PersistenceProperties.Role.table + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Unit.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Unit.java index 45d0c9c624e657c7caf069d74c96a0d1000fe232..3b2e7883eda5e1d057d34c1879f88e5df4ba33f1 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Unit.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Unit.java @@ -35,7 +35,7 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.tools.DateTools; @Entity -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) +@ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @Table(name = PersistenceProperties.Unit.table, uniqueConstraints = { @UniqueConstraint(name = PersistenceProperties.Unit.table + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/UnitAttribute.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/UnitAttribute.java index 2bf495ccc654bbd456b242b21e0d56eb1c48299c..02820d39a0d2bbb1890816b7107d8ad072caa47b 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/UnitAttribute.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/UnitAttribute.java @@ -1,6 +1,5 @@ package com.x.organization.core.entity; -import java.util.Date; import java.util.List; import javax.persistence.Column; @@ -34,7 +33,7 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.tools.DateTools; @Entity -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) +@ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @Table(name = PersistenceProperties.UnitAttribute.table, uniqueConstraints = { @UniqueConstraint(name = PersistenceProperties.UnitAttribute.table + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/UnitDuty.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/UnitDuty.java index b7e6045d1f71913c3b61184d35cfef4f2046c051..b95c324c182badc03176e217095f41533e85cb3e 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/UnitDuty.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/UnitDuty.java @@ -1,6 +1,5 @@ package com.x.organization.core.entity; -import java.util.Date; import java.util.List; import javax.persistence.Column; @@ -34,7 +33,7 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.tools.DateTools; @Entity -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) +@ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @Table(name = PersistenceProperties.UnitDuty.table, uniqueConstraints = { @UniqueConstraint(name = PersistenceProperties.UnitDuty.table + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/accredit/Empower.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/accredit/Empower.java index ba517ba54bc3922049773310650b9fa4a68d55d3..6bf7a5f4855d80e368c65a37cbf4dbb578cdcf88 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/accredit/Empower.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/accredit/Empower.java @@ -23,7 +23,7 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.organization.core.entity.PersistenceProperties; @Entity -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) +@ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @Table(name = PersistenceProperties.Accredit.Empower.table, uniqueConstraints = { @UniqueConstraint(name = PersistenceProperties.Accredit.Empower.table + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN, diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/accredit/EmpowerLog.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/accredit/EmpowerLog.java index 77fe185f8a3c034389a9d668a833408e222813fe..2f6ba040214e777d8220f1349f906dc84e3cf01b 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/accredit/EmpowerLog.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/accredit/EmpowerLog.java @@ -23,7 +23,7 @@ import com.x.base.core.project.tools.StringTools; import com.x.organization.core.entity.PersistenceProperties; @Entity -@ContainerEntity(dumpSize = 1000, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) +@ContainerEntity(dumpSize = 200, type = ContainerEntity.Type.content, reference = ContainerEntity.Reference.strong) @Table(name = PersistenceProperties.Accredit.EmpowerLog.table, uniqueConstraints = { @UniqueConstraint(name = PersistenceProperties.Accredit.EmpowerLog.table + JpaObject.IndexNameMiddle + JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,