From c9544dd2887fa7f5b240a16d2a1971c958fba3b4 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 29 Apr 2022 14:18:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4boolean=E5=80=BC=E7=B4=A2?= =?UTF-8?q?=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../x/base/core/project/build/CheckCore.java | 71 +++++++++---------- .../core/entity/content/Attachment.java | 2 - .../core/entity/content/DocSignScrawl.java | 10 +-- .../core/entity/content/DocumentVersion.java | 1 - .../core/entity/content/Read.java | 4 -- .../core/entity/content/ReadCompleted.java | 3 - .../core/entity/content/Record.java | 2 - .../core/entity/content/Review.java | 3 - .../core/entity/content/Task.java | 6 -- .../core/entity/content/TaskCompleted.java | 9 --- .../core/entity/content/Work.java | 5 -- .../core/entity/content/WorkCompleted.java | 7 -- .../core/entity/content/WorkLog.java | 2 - .../core/entity/element/Agent.java | 2 - .../entity/element/ApplicationDictItem.java | 1 - .../core/entity/element/Begin.java | 2 - .../core/entity/element/Cancel.java | 2 - .../core/entity/element/Choice.java | 2 - .../core/entity/element/Delay.java | 2 - .../core/entity/element/Embed.java | 4 -- .../core/entity/element/End.java | 2 - .../core/entity/element/Invoke.java | 2 - .../core/entity/element/Manual.java | 2 - .../core/entity/element/Merge.java | 2 - .../core/entity/element/Parallel.java | 2 - .../core/entity/element/Process.java | 4 +- .../core/entity/element/QueryStat.java | 1 - .../core/entity/element/QueryView.java | 2 - .../core/entity/element/Route.java | 6 +- .../core/entity/element/Service.java | 2 - .../core/entity/element/Split.java | 2 - 31 files changed, 44 insertions(+), 123 deletions(-) diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CheckCore.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CheckCore.java index da4b20ed02..970dea24fe 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CheckCore.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CheckCore.java @@ -41,16 +41,18 @@ public class CheckCore { checkColumnName(classes); checkColumnLength(classes); checkLobIndex(classes); + checkBooleanIndex(classes); checkListFieldContainerTableName(classes); checkFieldDescribeOnStatic(classes); checkTableNameUniqueConstraintName(classes); checkIdCreateTimeUpdateTimeSequenceIndex(classes); checkEnum(classes); checkDumpSize(classes); + } } - public static String packageName(String name) throws Exception { + public static String packageName(String name) throws ClassNotFoundException { try (ScanResult scanResult = new ClassGraph().enableAnnotationInfo().scan()) { List classInfos = scanResult.getClassesWithAnnotation(Module.class.getName()); for (ClassInfo info : classInfos) { @@ -67,16 +69,14 @@ public class CheckCore { /* * 检查数据库字段名是否是ColumnNamePrefix + fieldName */ - public static void checkColumnName(List> classes) throws Exception { + public static void checkColumnName(List> classes) { for (Class cls : classes) { List fields = FieldUtils.getAllFieldsList(cls); for (Field field : fields) { Column col = field.getAnnotation(Column.class); - if (null != col) { - if (!StringUtils.equals(JpaObject.ColumnNamePrefix + field.getName(), col.name())) { - System.err.println(String.format("checkColumnName error: class: %s, field: %s.", cls.getName(), - field.getName())); - } + if ((null != col) && (!StringUtils.equals(JpaObject.ColumnNamePrefix + field.getName(), col.name()))) { + System.err.println(String.format("checkColumnName error: class: %s, field: %s.", cls.getName(), + field.getName())); } } } @@ -85,7 +85,7 @@ public class CheckCore { /* * 检查是否有将Lob类型字段增加索引 */ - public static void checkLobIndex(List> classes) throws Exception { + public static void checkLobIndex(List> classes) { for (Class cls : classes) { List fields = FieldUtils.getAllFieldsList(cls); for (Field field : fields) { @@ -100,28 +100,25 @@ public class CheckCore { } /* - * 检查StringList从表名 - * - * @FieldDescribe("群组的个人成员.存放个人 ID.") - * - * @PersistentCollection(fetch = FetchType.EAGER) - * - * @OrderColumn(name = ORDERCOLUMNCOLUMN) - * - * @ContainerTable(name = TABLE + ContainerTableNameMiddle + - * personList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle + - * personList_FIELDNAME + JoinIndexNameSuffix)) - * - * @ElementColumn(length = JpaObject.length_id, name = ColumnNamePrefix + - * personList_FIELDNAME) - * - * @ElementIndex(name = TABLE + IndexNameMiddle + personList_FIELDNAME + - * ElementIndexNameSuffix) - * - * @CheckPersist(allowEmpty = true, citationExists = @CitationExist(type = - * Person.class)) private List personList; + * 检查是否有将Boolean类型字段增加索引 */ - public static void checkListFieldContainerTableName(List> classes) throws Exception { + public static void checkBooleanIndex(List> classes) { + for (Class cls : classes) { + List fields = FieldUtils.getAllFieldsList(cls); + for (Field field : fields) { + if (Boolean.class.isAssignableFrom(field.getType())) { + org.apache.openjpa.persistence.jdbc.Index index = field + .getAnnotation(org.apache.openjpa.persistence.jdbc.Index.class); + if (null != index) { + System.err.println(String.format("checkBooleanIndex error: class: %s, field: %s.", + cls.getName(), field.getName())); + } + } + } + } + } + + public static void checkListFieldContainerTableName(List> classes) throws IllegalAccessException { for (Class cls : classes) { List fields = FieldUtils.getAllFieldsList(cls); for (Field field : fields) { @@ -144,7 +141,7 @@ public class CheckCore { /* * 检查是否将@FieldDescribe注解到static字段上,如果是意味着上下行搞错了 */ - public static void checkFieldDescribeOnStatic(List> classes) throws Exception { + public static void checkFieldDescribeOnStatic(List> classes) { for (Class cls : classes) { List fields = FieldUtils.getFieldsListWithAnnotation(cls, FieldDescribe.class); for (Field field : fields) { @@ -159,12 +156,12 @@ public class CheckCore { /* * 检查约束名中的table名称和entity类中的TABLE名称是否一致 */ - public static void checkTableNameUniqueConstraintName(List> classes) throws Exception { + public static void checkTableNameUniqueConstraintName(List> classes) throws IllegalAccessException { for (Class cls : classes) { Table table = cls.getAnnotation(Table.class); String name = Objects.toString(FieldUtils.readStaticField(cls, "TABLE", true)); if (!StringUtils.equals(table.name(), name)) { - System.out.println("table name not match:" + cls); + System.err.println("table name not match:" + cls); } for (UniqueConstraint u : table.uniqueConstraints()) { if (!StringUtils.startsWith(u.name(), table.name())) { @@ -178,7 +175,7 @@ public class CheckCore { /* * 检查类中是否有在createTime,updateTime和sequence上的索引,这几个索引已经用约束在类上了 */ - public static void checkIdCreateTimeUpdateTimeSequenceIndex(List> classes) throws Exception { + public static void checkIdCreateTimeUpdateTimeSequenceIndex(List> classes) { for (Class cls : classes) { Field idField = FieldUtils.getField(cls, JpaObject.id_FIELDNAME, true); Field createTimeField = FieldUtils.getField(cls, JpaObject.createTime_FIELDNAME, true); @@ -196,7 +193,7 @@ public class CheckCore { /* * 检查entity是否有重复的字段 */ - public static void checkEnum(List> classes) throws Exception { + public static void checkEnum(List> classes) { for (Class cls : classes) { List fields = FieldUtils.getFieldsListWithAnnotation(cls, FieldDescribe.class); for (Field field : fields) { @@ -214,7 +211,7 @@ public class CheckCore { } /* 检查是否有对String lob 之外的字段设定长度 */ - public static void checkColumnLength(List> classes) throws Exception { + public static void checkColumnLength(List> classes) { for (Class cls : classes) { List fields = FieldUtils.getFieldsListWithAnnotation(cls, Column.class); for (Field field : fields) { @@ -234,7 +231,7 @@ public class CheckCore { } /* 检查StorageObject的dumpSize是否设置正确 */ - public static void checkDumpSize(List> classes) throws Exception { + public static void checkDumpSize(List> classes) { for (Class cls : classes) { if (StorageObject.class.isAssignableFrom(cls)) { ContainerEntity containerEntity = cls.getAnnotation(ContainerEntity.class); @@ -245,7 +242,7 @@ public class CheckCore { } } - public static void checkIdUnique(List> classes) throws Exception { + public static void checkIdUnique(List> classes) { for (Class cls : classes) { Field idField = FieldUtils.getField(cls, JpaObject.id_FIELDNAME, true); Column column = idField.getAnnotation(Column.class); diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Attachment.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Attachment.java index 6df4eca38b..5a264c13da 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Attachment.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Attachment.java @@ -342,7 +342,6 @@ public class Attachment extends StorageObject { public static final String completed_FIELDNAME = "completed"; @FieldDescribe("整个job是否已经完成.") @Column(name = ColumnNamePrefix + completed_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + completed_FIELDNAME) @CheckPersist(allowEmpty = false) private Boolean completed; @@ -456,7 +455,6 @@ public class Attachment extends StorageObject { @FieldDescribe("是否使用更深的路径.") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + deepPath_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + deepPath_FIELDNAME) private Boolean deepPath; public static final String orderNumber_FIELDNAME = "orderNumber"; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/DocSignScrawl.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/DocSignScrawl.java index 3555a32b6e..2dfc5bfbb6 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/DocSignScrawl.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/DocSignScrawl.java @@ -31,6 +31,7 @@ import com.x.processplatform.core.entity.PersistenceProperties; /** * 签批涂鸦信息 + * * @author sword */ @Entity @@ -47,11 +48,11 @@ public class DocSignScrawl extends StorageObject { private static final String TABLE = PersistenceProperties.Content.DocSignScrawl.table; - public static String SCRAWL_TYPE_PLACEHOLDER = "placeholder"; + public static final String SCRAWL_TYPE_PLACEHOLDER = "placeholder"; - public static String SCRAWL_TYPE_BASE64 = "base64"; + public static final String SCRAWL_TYPE_BASE64 = "base64"; - public static String SCRAWL_TYPE_IMAGE = "image"; + public static final String SCRAWL_TYPE_IMAGE = "image"; @Override public String getId() { @@ -70,7 +71,7 @@ public class DocSignScrawl extends StorageObject { @Override public void onPersist() throws Exception { - if(StringUtils.isNotBlank(this.name)){ + if (StringUtils.isNotBlank(this.name)) { this.extension = StringUtils.lowerCase(FilenameUtils.getExtension(name)); } } @@ -140,7 +141,6 @@ public class DocSignScrawl extends StorageObject { @FieldDescribe("是否使用更深的路径.") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + deepPath_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + deepPath_FIELDNAME) private Boolean deepPath; @Override diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/DocumentVersion.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/DocumentVersion.java index a53c4f9955..6376414472 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/DocumentVersion.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/DocumentVersion.java @@ -146,7 +146,6 @@ public class DocumentVersion extends SliceJpaObject { public static final String completed_FIELDNAME = "completed"; @FieldDescribe("整个job是否已经完成.") @Column(name = ColumnNamePrefix + completed_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + completed_FIELDNAME) @CheckPersist(allowEmpty = false) private Boolean completed; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Read.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Read.java index bcaa91d14a..18abbacb28 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Read.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Read.java @@ -201,7 +201,6 @@ public class Read extends SliceJpaObject implements ProjectionInterface { public static final String completed_FIELDNAME = "completed"; @FieldDescribe("整个job是否已经完成.") @Column(name = ColumnNamePrefix + completed_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + completed_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean completed; @@ -376,7 +375,6 @@ public class Read extends SliceJpaObject implements ProjectionInterface { public static final String viewed_FIELDNAME = "viewed"; @FieldDescribe("是否查看过.") @Column(name = ColumnNamePrefix + viewed_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + viewed_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean viewed; @@ -468,14 +466,12 @@ public class Read extends SliceJpaObject implements ProjectionInterface { public static final String booleanValue01_FIELDNAME = "booleanValue01"; @FieldDescribe("业务数据Boolean值01.") @Column(name = ColumnNamePrefix + booleanValue01_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + booleanValue01_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean booleanValue01; public static final String booleanValue02_FIELDNAME = "booleanValue02"; @FieldDescribe("业务数据Boolean值02.") @Column(name = ColumnNamePrefix + booleanValue02_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + booleanValue02_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean booleanValue02; 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 7fc17a0489..73a7803068 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 @@ -198,7 +198,6 @@ public class ReadCompleted extends SliceJpaObject implements ProjectionInterface public static final String completed_FIELDNAME = "completed"; @FieldDescribe("整个job是否已经完成.") @Column(name = ColumnNamePrefix + completed_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + completed_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean completed; @@ -487,14 +486,12 @@ public class ReadCompleted extends SliceJpaObject implements ProjectionInterface public static final String booleanValue01_FIELDNAME = "booleanValue01"; @FieldDescribe("业务数据Boolean值01.") @Column(name = ColumnNamePrefix + booleanValue01_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + booleanValue01_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean booleanValue01; public static final String booleanValue02_FIELDNAME = "booleanValue02"; @FieldDescribe("业务数据Boolean值02.") @Column(name = ColumnNamePrefix + booleanValue02_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + booleanValue02_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean booleanValue02; 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 90075daa5f..9ac44dba76 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 @@ -197,7 +197,6 @@ public class Record extends SliceJpaObject { public static final String workCompleted_FIELDNAME = "workCompleted"; @FieldDescribe("已完成工作") @Column(length = JpaObject.length_id, name = ColumnNamePrefix + workCompleted_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workCompleted_FIELDNAME) @CheckPersist(allowEmpty = true) private String workCompleted; @@ -213,7 +212,6 @@ public class Record extends SliceJpaObject { @FieldDescribe("是否显示.") /* 必填值 */ @Column(name = ColumnNamePrefix + display_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + display_FIELDNAME) @CheckPersist(allowEmpty = false) private Boolean display; 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 d70bebd966..230bc6a6b0 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 @@ -180,7 +180,6 @@ public class Review extends SliceJpaObject implements ProjectionInterface { public static final String completed_FIELDNAME = "completed"; @FieldDescribe("整个job是否已经完成.") @Column(name = ColumnNamePrefix + completed_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + completed_FIELDNAME) @CheckPersist(allowEmpty = false) private Boolean completed; @@ -393,14 +392,12 @@ public class Review extends SliceJpaObject implements ProjectionInterface { public static final String booleanValue01_FIELDNAME = "booleanValue01"; @FieldDescribe("业务数据Boolean值01.") @Column(name = ColumnNamePrefix + booleanValue01_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + booleanValue01_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean booleanValue01; public static final String booleanValue02_FIELDNAME = "booleanValue02"; @FieldDescribe("业务数据Boolean值02.") @Column(name = ColumnNamePrefix + booleanValue02_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + booleanValue02_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean booleanValue02; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Task.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Task.java index fe19ec97a0..3759fe5979 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Task.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Task.java @@ -369,7 +369,6 @@ public class Task extends SliceJpaObject implements ProjectionInterface { public static final String expired_FIELDNAME = "expired"; @FieldDescribe("是否已经超时.") @Column(name = ColumnNamePrefix + expired_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + expired_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean expired; @@ -385,7 +384,6 @@ public class Task extends SliceJpaObject implements ProjectionInterface { public static final String urged_FIELDNAME = "urged"; @FieldDescribe("是否已经催办过.") @Column(name = ColumnNamePrefix + urged_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + urged_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean urged; @@ -453,14 +451,12 @@ public class Task extends SliceJpaObject implements ProjectionInterface { public static final String modified_FIELDNAME = "modified"; @FieldDescribe("是否在前台保存过数据.") @Column(name = ColumnNamePrefix + modified_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + modified_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean modified; public static final String viewed_FIELDNAME = "viewed"; @FieldDescribe("是否查看过.") @Column(name = ColumnNamePrefix + viewed_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + viewed_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean viewed; @@ -725,14 +721,12 @@ public class Task extends SliceJpaObject implements ProjectionInterface { public static final String booleanValue01_FIELDNAME = "booleanValue01"; @FieldDescribe("业务数据Boolean值01.") @Column(name = ColumnNamePrefix + booleanValue01_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + booleanValue01_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean booleanValue01; public static final String booleanValue02_FIELDNAME = "booleanValue02"; @FieldDescribe("业务数据Boolean值02.") @Column(name = ColumnNamePrefix + booleanValue02_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + booleanValue02_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean booleanValue02; 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 1596076710..ffafb54edc 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 @@ -406,7 +406,6 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface public static final String completed_FIELDNAME = "completed"; @FieldDescribe("整个job是否已经完成.") @Column(name = ColumnNamePrefix + completed_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + completed_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean completed; @@ -481,14 +480,12 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface public static final String empowerToIdentity_FIELDNAME = "empowerToIdentity"; @FieldDescribe("授权给谁处理,在processType=empower时记录授权对象") @Column(length = length_255B, name = ColumnNamePrefix + empowerToIdentity_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + empowerToIdentity_FIELDNAME) @CheckPersist(allowEmpty = true) private String empowerToIdentity; public static final String empowerFromIdentity_FIELDNAME = "empowerFromIdentity"; @FieldDescribe("授权自Identity") @Column(length = length_255B, name = ColumnNamePrefix + empowerFromIdentity_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + empowerFromIdentity_FIELDNAME) @CheckPersist(allowEmpty = true) private String empowerFromIdentity; @@ -516,7 +513,6 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface public static final String activityAlias_FIELDNAME = "activityAlias"; @FieldDescribe("活动别名.") @Column(length = length_255B, name = ColumnNamePrefix + activityAlias_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + activityAlias_FIELDNAME) @CheckPersist(allowEmpty = true) private String activityAlias; @@ -530,7 +526,6 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface @FieldDescribe("活动类型.") @Enumerated(EnumType.STRING) @Column(length = ActivityType.length, name = ColumnNamePrefix + activityType_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + activityType_FIELDNAME) @CheckPersist(allowEmpty = false) private ActivityType activityType; @@ -600,7 +595,6 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface public static final String expired_FIELDNAME = "expired"; @FieldDescribe("是否超时.") @Column(name = ColumnNamePrefix + expired_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + expired_FIELDNAME) @CheckPersist(allowEmpty = false) private Boolean expired; @@ -626,7 +620,6 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface public static final String latest_FIELDNAME = "latest"; @FieldDescribe("同一Job中同一用户是否是最新的,多人可以有多条已办,页面显示的时候可以通过此标记仅显示一条最新的.") @Column(name = ColumnNamePrefix + latest_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + latest_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean latest; @@ -748,14 +741,12 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface public static final String booleanValue01_FIELDNAME = "booleanValue01"; @FieldDescribe("业务数据Boolean值01.") @Column(name = ColumnNamePrefix + booleanValue01_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + booleanValue01_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean booleanValue01; public static final String booleanValue02_FIELDNAME = "booleanValue02"; @FieldDescribe("业务数据Boolean值02.") @Column(name = ColumnNamePrefix + booleanValue02_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + booleanValue02_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean booleanValue02; 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 3ea9d28c7d..e37a2f78ae 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 @@ -351,14 +351,12 @@ public class Work extends SliceJpaObject implements ProjectionInterface { public static final String dataChanged_FIELDNAME = "dataChanged"; @FieldDescribe("当前工作是否经过保存修改的操作,用于判断是否是默认生成的未经修改的.") @Column(name = ColumnNamePrefix + dataChanged_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + dataChanged_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean dataChanged; public static final String workThroughManual_FIELDNAME = "workThroughManual"; @FieldDescribe("是否已经经过人工节点,用于判断是否是草稿.在到达环节进行判断.") @Column(name = ColumnNamePrefix + workThroughManual_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + workThroughManual_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean workThroughManual; @@ -404,7 +402,6 @@ public class Work extends SliceJpaObject implements ProjectionInterface { /** Split Attribute */ public static final String splitting_FIELDNAME = "splitting"; @FieldDescribe("是否是拆分中的工作") - @Index(name = TABLE + IndexNameMiddle + splitting_FIELDNAME) @Column(name = ColumnNamePrefix + splitting_FIELDNAME) @CheckPersist(allowEmpty = false) private Boolean splitting; @@ -562,14 +559,12 @@ public class Work extends SliceJpaObject implements ProjectionInterface { public static final String booleanValue01_FIELDNAME = "booleanValue01"; @FieldDescribe("业务数据Boolean值01.") @Column(name = ColumnNamePrefix + booleanValue01_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + booleanValue01_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean booleanValue01; public static final String booleanValue02_FIELDNAME = "booleanValue02"; @FieldDescribe("业务数据Boolean值02.") @Column(name = ColumnNamePrefix + booleanValue02_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + booleanValue02_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean booleanValue02; 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 8201f2c86e..84131439ad 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 @@ -117,8 +117,6 @@ public class WorkCompleted extends SliceJpaObject implements ProjectionInterface this.processAlias = work.getProcessAlias(); this.serial = work.getSerial(); this.form = work.getForm(); -// this.formData = formData; -// this.formMobileData = formMobileData; this.work = work.getId(); this.expireTime = work.getExpireTime(); if ((null != expireTime) && (completedTime.after(expireTime))) { @@ -316,7 +314,6 @@ public class WorkCompleted extends SliceJpaObject implements ProjectionInterface public static final String expired_FIELDNAME = "expired"; @FieldDescribe("是否超时.") @Column(name = ColumnNamePrefix + expired_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + expired_FIELDNAME) @CheckPersist(allowEmpty = false) private Boolean expired; @@ -329,7 +326,6 @@ public class WorkCompleted extends SliceJpaObject implements ProjectionInterface public static final String allowRollback_FIELDNAME = "allowRollback"; @FieldDescribe("完成后是否允许回滚.") @Column(name = ColumnNamePrefix + allowRollback_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowRollback_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean allowRollback; @@ -372,7 +368,6 @@ public class WorkCompleted extends SliceJpaObject implements ProjectionInterface public static final String merged_FIELDNAME = "merged"; @FieldDescribe("合并数据") @Column(name = ColumnNamePrefix + merged_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + merged_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean merged; @@ -449,14 +444,12 @@ public class WorkCompleted extends SliceJpaObject implements ProjectionInterface public static final String booleanValue01_FIELDNAME = "booleanValue01"; @FieldDescribe("业务数据Boolean值01.") @Column(name = ColumnNamePrefix + booleanValue01_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + booleanValue01_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean booleanValue01; public static final String booleanValue02_FIELDNAME = "booleanValue02"; @FieldDescribe("业务数据Boolean值02.") @Column(name = ColumnNamePrefix + booleanValue02_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + booleanValue02_FIELDNAME) @CheckPersist(allowEmpty = true) private Boolean booleanValue02; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkLog.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkLog.java index 799357238e..3f3934b312 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkLog.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkLog.java @@ -132,7 +132,6 @@ public class WorkLog extends SliceJpaObject { @FieldDescribe("工作是否已经完成.") /* 必填值 */ @Column(name = ColumnNamePrefix + completed_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + completed_FIELDNAME) @CheckPersist(allowEmpty = false) private Boolean completed; @@ -310,7 +309,6 @@ public class WorkLog extends SliceJpaObject { public static final String connected_FIELDNAME = "connected"; @FieldDescribe("是否已经完整填写了From和Arrived.") @Column(name = ColumnNamePrefix + connected_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + connected_FIELDNAME) @CheckPersist(allowEmpty = false) private Boolean connected; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Agent.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Agent.java index 8e7ab5c230..fc8c0134b6 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Agent.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Agent.java @@ -380,13 +380,11 @@ public class Agent extends Activity { @FieldDescribe("允许调度") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowReroute_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowReroute_FIELDNAME) private Boolean allowReroute; @FieldDescribe("允许调度到此节点") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowRerouteTo_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowRerouteTo_FIELDNAME) private Boolean allowRerouteTo; @FieldDescribe("允许挂起") diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/ApplicationDictItem.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/ApplicationDictItem.java index e6a5a53cc4..2877037c7b 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/ApplicationDictItem.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/ApplicationDictItem.java @@ -213,7 +213,6 @@ public class ApplicationDictItem extends DataItem { private Date timeValue; @Column(name = ColumnNamePrefix + booleanValue_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + booleanValue_FIELDNAME) private Boolean booleanValue; public static final String application_FIELDNAME = "application"; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Begin.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Begin.java index f378107304..9321a973a8 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Begin.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Begin.java @@ -380,13 +380,11 @@ public class Begin extends Activity { @FieldDescribe("允许调度") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowReroute_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowReroute_FIELDNAME) private Boolean allowReroute; @FieldDescribe("允许调度到此节点") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowRerouteTo_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowRerouteTo_FIELDNAME) private Boolean allowRerouteTo; @FieldDescribe("允许挂起") diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Cancel.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Cancel.java index 355d763f09..85141c2fbe 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Cancel.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Cancel.java @@ -373,13 +373,11 @@ public class Cancel extends Activity { @FieldDescribe("允许调度") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowReroute_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowReroute_FIELDNAME) private Boolean allowReroute; @FieldDescribe("允许调度到此节点") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowRerouteTo_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowRerouteTo_FIELDNAME) private Boolean allowRerouteTo; @FieldDescribe("允许挂起") diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Choice.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Choice.java index 69820abe86..c4aed19bfe 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Choice.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Choice.java @@ -370,13 +370,11 @@ public class Choice extends Activity { @FieldDescribe("允许调度") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowReroute_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowReroute_FIELDNAME) private Boolean allowReroute; @FieldDescribe("允许调度到此节点") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowRerouteTo_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowRerouteTo_FIELDNAME) private Boolean allowRerouteTo; @FieldDescribe("允许挂起") diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Delay.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Delay.java index 3d620794a6..4165acb47b 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Delay.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Delay.java @@ -382,13 +382,11 @@ public class Delay extends Activity { @FieldDescribe("允许调度") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowReroute_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowReroute_FIELDNAME) private Boolean allowReroute; @FieldDescribe("允许调度到此节点") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowRerouteTo_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowRerouteTo_FIELDNAME) private Boolean allowRerouteTo; @FieldDescribe("允许挂起") diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Embed.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Embed.java index e62498ad7d..727ac5979b 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Embed.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Embed.java @@ -471,13 +471,11 @@ public class Embed extends Activity { @FieldDescribe("允许调度") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowReroute_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowReroute_FIELDNAME) private Boolean allowReroute; @FieldDescribe("允许调度到此节点") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowRerouteTo_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowRerouteTo_FIELDNAME) private Boolean allowRerouteTo; @FieldDescribe("允许挂起") @@ -552,14 +550,12 @@ public class Embed extends Activity { @FieldDescribe("是否继承Data") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + inheritData_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + inheritData_FIELDNAME) private Boolean inheritData; public static final String inheritAttachment_FIELDNAME = "inheritAttachment"; @FieldDescribe("是否继承附件") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + inheritAttachment_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + inheritAttachment_FIELDNAME) private Boolean inheritAttachment; public static final String embedCreatorType_FIELDNAME = "embedCreatorType"; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/End.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/End.java index 41cc32259b..1d9936c1fb 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/End.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/End.java @@ -373,13 +373,11 @@ public class End extends Activity { @FieldDescribe("允许调度") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowReroute_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowReroute_FIELDNAME) private Boolean allowReroute; @FieldDescribe("允许调度到此节点") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowRerouteTo_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowRerouteTo_FIELDNAME) private Boolean allowRerouteTo; @FieldDescribe("允许挂起") diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Invoke.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Invoke.java index ae332af0c1..8f9151fb55 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Invoke.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Invoke.java @@ -382,13 +382,11 @@ public class Invoke extends Activity { @FieldDescribe("允许调度") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowReroute_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowReroute_FIELDNAME) private Boolean allowReroute; @FieldDescribe("允许调度到此节点") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowRerouteTo_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowRerouteTo_FIELDNAME) private Boolean allowRerouteTo; @FieldDescribe("允许挂起") 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 a38742d224..5587fb03ab 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 @@ -370,13 +370,11 @@ public class Manual extends Activity { @FieldDescribe("允许调度") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowReroute_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowReroute_FIELDNAME) private Boolean allowReroute; @FieldDescribe("允许调度到此节点") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowRerouteTo_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowRerouteTo_FIELDNAME) private Boolean allowRerouteTo; @FieldDescribe("允许挂起") diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Merge.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Merge.java index ce1eff7b39..2b1eee38a0 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Merge.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Merge.java @@ -379,13 +379,11 @@ public class Merge extends Activity { @FieldDescribe("允许调度") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowReroute_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowReroute_FIELDNAME) private Boolean allowReroute; @FieldDescribe("允许调度到此节点") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowRerouteTo_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowRerouteTo_FIELDNAME) private Boolean allowRerouteTo; @FieldDescribe("允许挂起") diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Parallel.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Parallel.java index 891c9b49fd..4d34ef827f 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Parallel.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Parallel.java @@ -371,13 +371,11 @@ public class Parallel extends Activity { @FieldDescribe("允许调度") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowReroute_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowReroute_FIELDNAME) private Boolean allowReroute; @FieldDescribe("允许调度到此节点") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowRerouteTo_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowRerouteTo_FIELDNAME) private Boolean allowRerouteTo; @FieldDescribe("允许挂起") diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Process.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Process.java index 61cf44e081..40acbae169 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Process.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Process.java @@ -96,8 +96,8 @@ public class Process extends SliceJpaObject { } } - @FieldDescribe("启用同步到自建表.") public static final String UPDATETABLEENABLE_FIELDNAME = "updateTableEnable"; + @FieldDescribe("启用同步到自建表.") @Transient private Boolean updateTableEnable; @@ -110,8 +110,8 @@ public class Process extends SliceJpaObject { this.getProperties().setUpdateTableEnable(updateTableEnable); } - @FieldDescribe("同步到自建表.") public static final String UPDATETABLELIST_FIELDNAME = "updateTableList"; + @FieldDescribe("同步到自建表.") @Transient private List updateTableList; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/QueryStat.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/QueryStat.java index e19ea7aa47..1c5a3752c3 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/QueryStat.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/QueryStat.java @@ -129,7 +129,6 @@ public class QueryStat extends SliceJpaObject { @FieldDescribe("是否是定时任务.") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + timingEnable_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + timingEnable_FIELDNAME) private Boolean timingEnable; public static final String timingInterval_FIELDNAME = "timingInterval"; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/QueryView.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/QueryView.java index 1b394683c5..cb37b4f1e4 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/QueryView.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/QueryView.java @@ -108,7 +108,6 @@ public class QueryView extends SliceJpaObject { @FieldDescribe("是否是定时任务.") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + timingEnable_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + timingEnable_FIELDNAME) private Boolean timingEnable; public static final String timingTouch_FIELDNAME = "timingTouch"; @@ -258,7 +257,6 @@ public class QueryView extends SliceJpaObject { public static final String display_FIELDNAME = "display"; @FieldDescribe("是否前端可见.") @Column(name = ColumnNamePrefix + display_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + display_FIELDNAME) private Boolean display; public String getName() { 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 577637b1c2..b8d6faee79 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 @@ -118,18 +118,18 @@ public class Route extends SliceJpaObject { this.getProperties().setDefaultSelected(defaultSelected); } - @FieldDescribe("是否启用异步返回.") public static final String ASYNCSUPPORTED_FIELDNAME = "asyncSupported"; + @FieldDescribe("是否启用异步返回.") @Transient private Boolean asyncSupported; - @FieldDescribe("选择优先路由时是否直接执行路由(一票否决),默认null.") public static final String SOLEDIRECT_FIELDNAME = "soleDirect"; + @FieldDescribe("选择优先路由时是否直接执行路由(一票否决),默认null.") @Transient private Boolean soleDirect; - @FieldDescribe("默认选中的路由.") public static final String DEFAULTSELECTED_FIELDNAME = "defaultSelected"; + @FieldDescribe("默认选中的路由.") @Transient private Boolean defaultSelected; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Service.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Service.java index 17b4b5d7ca..174685e417 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Service.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Service.java @@ -379,13 +379,11 @@ public class Service extends Activity { @FieldDescribe("允许调度") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowReroute_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowReroute_FIELDNAME) private Boolean allowReroute; @FieldDescribe("允许调度到此节点") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowRerouteTo_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowRerouteTo_FIELDNAME) private Boolean allowRerouteTo; @FieldDescribe("允许挂起") diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Split.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Split.java index 6c7f936994..993a2acf01 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Split.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Split.java @@ -383,13 +383,11 @@ public class Split extends Activity { @FieldDescribe("允许调度") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowReroute_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowReroute_FIELDNAME) private Boolean allowReroute; @FieldDescribe("允许调度到此节点") @CheckPersist(allowEmpty = true) @Column(name = ColumnNamePrefix + allowRerouteTo_FIELDNAME) - @Index(name = TABLE + IndexNameMiddle + allowRerouteTo_FIELDNAME) private Boolean allowRerouteTo; @FieldDescribe("允许挂起") -- GitLab