From 274823f8fdeb4ab7ab1209f0ed0d3254a4aed489 Mon Sep 17 00:00:00 2001 From: o2null Date: Thu, 10 Dec 2020 09:21:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9org=E7=9A=84dumpSize=E4=B8=BA?= =?UTF-8?q?500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/x/organization/core/entity/Bind.java | 2 +- .../x/organization/core/entity/Custom.java | 2 +- .../organization/core/entity/Definition.java | 4 +--- .../com/x/organization/core/entity/Group.java | 2 +- .../x/organization/core/entity/Identity.java | 2 +- .../x/organization/core/entity/OauthCode.java | 2 +- .../core/entity/PermissionSetting.java | 2 +- .../x/organization/core/entity/Person.java | 2 +- .../core/entity/PersonAttribute.java | 3 +-- .../organization/core/entity/PersonCard.java | 21 +------------------ .../com/x/organization/core/entity/Role.java | 3 +-- .../com/x/organization/core/entity/Unit.java | 2 +- .../core/entity/UnitAttribute.java | 3 +-- .../x/organization/core/entity/UnitDuty.java | 3 +-- .../core/entity/accredit/Empower.java | 2 +- .../core/entity/accredit/EmpowerLog.java | 2 +- 16 files changed, 16 insertions(+), 41 deletions(-) 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 3a628d1a02..0cf8291517 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 608caeb393..01b7f3b368 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 d6123cd311..07db64f1f7 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 6f920f76c3..021ec7fef4 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 bb1948688b..6665e04b94 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 6b892f4184..0610c000e9 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 58e8513172..6442e3166a 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 c5e144ad9a..fad859a3e8 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 66ac7b0ca3..0de3db277c 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 80f36577ee..f8797f5768 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 dcd34772ef..68afbcbc61 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 45d0c9c624..3b2e7883ed 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 2bf495ccc6..02820d39a0 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 b7e6045d1f..b95c324c18 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 ba517ba54b..6bf7a5f485 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 77fe185f8a..2f6ba04021 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, -- GitLab