Merge branch 'feature/add_process_version' into 'develop'

Merge of feature/[流程平台]流程版本管理的后台服务优化 to develop

See merge request o2oa/o2oa!244

o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/output/ActionList.java

@@ -1,5 +1,6 @@
 package com.x.processplatform.assemble.designer.jaxrs.output;
 
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -25,6 +26,8 @@ import com.x.processplatform.core.entity.element.wrap.WrapForm;
 import com.x.processplatform.core.entity.element.wrap.WrapProcess;
 import com.x.processplatform.core.entity.element.wrap.WrapProcessPlatform;
 import com.x.processplatform.core.entity.element.wrap.WrapScript;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 
 class ActionList extends BaseAction {
 
@@ -36,6 +39,15 @@ class ActionList extends BaseAction {
 			List<Wo> wos = emc.fetchAll(Application.class, Wo.copier);
 
 			List<WrapProcess> processList = emc.fetchAll(Process.class, processCopier);
+			processList.stream().forEach( o -> {
+				if(StringUtils.isEmpty(o.getEdition())){
+					o.setName(o.getName() + "_V1.0");
+				}else{
+					o.setName(o.getEditionName());
+				}
+			});
+			processList = processList.stream().sorted(Comparator.comparing(WrapProcess::getName, Comparator.nullsLast(String::compareTo)))
+					.collect(Collectors.toList());
 
 			List<WrapForm> formList = emc.fetchAll(Form.class, formCopier);
 

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Agent.java

@@ -382,6 +382,11 @@ public class Agent extends Activity {
 	@CheckPersist(allowEmpty = true)
 	private String displayLogScriptText;
 
+	public static final String edition_FIELDNAME = "edition";
+	@FieldDescribe("版本编码.")
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + edition_FIELDNAME)
+	private String edition;
+
 	public String getDisplayLogScript() {
 		return displayLogScript;
 	}
@@ -734,4 +739,11 @@ public class Agent extends Activity {
 		this.opinionGroup = opinionGroup;
 	}
 
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
 }

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Begin.java

@@ -345,6 +345,11 @@ public class Begin extends Activity {
 	@CheckPersist(allowEmpty = true)
 	private String displayLogScriptText;
 
+	public static final String edition_FIELDNAME = "edition";
+	@FieldDescribe("版本编码.")
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + edition_FIELDNAME)
+	private String edition;
+
 	public String getDisplayLogScript() {
 		return displayLogScript;
 	}
@@ -673,4 +678,12 @@ public class Begin extends Activity {
 		this.opinionGroup = opinionGroup;
 	}
 
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
+
 }

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Cancel.java

@@ -344,6 +344,11 @@ public class Cancel extends Activity {
 	@CheckPersist(allowEmpty = true)
 	private String displayLogScriptText;
 
+	public static final String edition_FIELDNAME = "edition";
+	@FieldDescribe("版本编码.")
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + edition_FIELDNAME)
+	private String edition;
+
 	public String getDisplayLogScript() {
 		return displayLogScript;
 	}
@@ -656,4 +661,12 @@ public class Cancel extends Activity {
 		this.opinionGroup = opinionGroup;
 	}
 
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
+
 }

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Choice.java

@@ -359,6 +359,11 @@ public class Choice extends Activity {
 	@CheckPersist(allowEmpty = true)
 	private String displayLogScriptText;
 
+	public static final String edition_FIELDNAME = "edition";
+	@FieldDescribe("版本编码.")
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + edition_FIELDNAME)
+	private String edition;
+
 	public String getDisplayLogScript() {
 		return displayLogScript;
 	}
@@ -679,4 +684,12 @@ public class Choice extends Activity {
 		this.opinionGroup = opinionGroup;
 	}
 
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
+
 }

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Delay.java

@@ -407,6 +407,11 @@ public class Delay extends Activity {
 	@CheckPersist(allowEmpty = true)
 	private String displayLogScriptText;
 
+	public static final String edition_FIELDNAME = "edition";
+	@FieldDescribe("版本编码.")
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + edition_FIELDNAME)
+	private String edition;
+
 	public String getDisplayLogScript() {
 		return displayLogScript;
 	}
@@ -783,4 +788,12 @@ public class Delay extends Activity {
 		this.delayMode = delayMode;
 	}
 
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
+
 }

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Embed.java

@@ -484,6 +484,11 @@ public class Embed extends Activity {
 	@CheckPersist(allowEmpty = true)
 	private String displayLogScriptText;
 
+	public static final String edition_FIELDNAME = "edition";
+	@FieldDescribe("版本编码.")
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + edition_FIELDNAME)
+	private String edition;
+
 	public String getDisplayLogScript() {
 		return displayLogScript;
 	}
@@ -940,4 +945,11 @@ public class Embed extends Activity {
 		this.opinionGroup = opinionGroup;
 	}
 
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
 }

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/End.java

@@ -352,6 +352,11 @@ public class End extends Activity {
 	@CheckPersist(allowEmpty = true)
 	private String displayLogScriptText;
 
+	public static final String edition_FIELDNAME = "edition";
+	@FieldDescribe("版本编码.")
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + edition_FIELDNAME)
+	private String edition;
+
 	public String getDisplayLogScript() {
 		return displayLogScript;
 	}
@@ -672,4 +677,12 @@ public class End extends Activity {
 		this.opinionGroup = opinionGroup;
 	}
 
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
+
 }

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Invoke.java

@@ -506,6 +506,11 @@ public class Invoke extends Activity {
 	@CheckPersist(allowEmpty = true)
 	private String displayLogScriptText;
 
+	public static final String edition_FIELDNAME = "edition";
+	@FieldDescribe("版本编码.")
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + edition_FIELDNAME)
+	private String edition;
+
 	public String getDisplayLogScript() {
 		return displayLogScript;
 	}
@@ -1002,4 +1007,12 @@ public class Invoke extends Activity {
 		this.jaxrsHeadScriptText = jaxrsHeadScriptText;
 	}
 
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
+
 }

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Manual.java

@@ -582,6 +582,11 @@ public class Manual extends Activity {
 	@CheckPersist(allowEmpty = true)
 	private String displayLogScriptText;
 
+	public static final String edition_FIELDNAME = "edition";
+	@FieldDescribe("版本编码.")
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + edition_FIELDNAME)
+	private String edition;
+
 	public String getDisplayLogScript() {
 		return displayLogScript;
 	}
@@ -1178,4 +1183,12 @@ public class Manual extends Activity {
 		this.opinionGroup = opinionGroup;
 	}
 
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
+
 }

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Merge.java

@@ -351,6 +351,11 @@ public class Merge extends Activity {
 	@CheckPersist(allowEmpty = true)
 	private String displayLogScriptText;
 
+	public static final String edition_FIELDNAME = "edition";
+	@FieldDescribe("版本编码.")
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + edition_FIELDNAME)
+	private String edition;
+
 	public String getDisplayLogScript() {
 		return displayLogScript;
 	}
@@ -671,4 +676,12 @@ public class Merge extends Activity {
 		this.opinionGroup = opinionGroup;
 	}
 
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
+
 }

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Message.java

@@ -360,6 +360,11 @@ public class Message extends Activity {
 	@CheckPersist(allowEmpty = true)
 	private String displayLogScriptText;
 
+	public static final String edition_FIELDNAME = "edition";
+	@FieldDescribe("版本编码.")
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + edition_FIELDNAME)
+	private String edition;
+
 	public String getDisplayLogScript() {
 		return displayLogScript;
 	}
@@ -688,4 +693,12 @@ public class Message extends Activity {
 		this.opinionGroup = opinionGroup;
 	}
 
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
+
 }

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Parallel.java

@@ -360,6 +360,11 @@ public class Parallel extends Activity {
 	@CheckPersist(allowEmpty = true)
 	private String displayLogScriptText;
 
+	public static final String edition_FIELDNAME = "edition";
+	@FieldDescribe("版本编码.")
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + edition_FIELDNAME)
+	private String edition;
+
 	public String getDisplayLogScript() {
 		return displayLogScript;
 	}
@@ -680,4 +685,12 @@ public class Parallel extends Activity {
 		this.opinionGroup = opinionGroup;
 	}
 
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
+
 }

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Route.java

@@ -265,6 +265,11 @@ public class Route extends SliceJpaObject {
 	@CheckPersist(allowEmpty = true)
 	private String appendTaskIdentityScriptText;
 
+	public static final String edition_FIELDNAME = "edition";
+	@FieldDescribe("版本编码.")
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + edition_FIELDNAME)
+	private String edition;
+
 	public String getAppendTaskIdentityType() {
 		return appendTaskIdentityType;
 	}
@@ -493,4 +498,12 @@ public class Route extends SliceJpaObject {
 		this.validationScriptText = validationScriptText;
 	}
 
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
+
 }

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Service.java

@@ -378,6 +378,11 @@ public class Service extends Activity {
 	@CheckPersist(allowEmpty = true)
 	private String displayLogScriptText;
 
+	public static final String edition_FIELDNAME = "edition";
+	@FieldDescribe("版本编码.")
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + edition_FIELDNAME)
+	private String edition;
+
 	public String getDisplayLogScript() {
 		return displayLogScript;
 	}
@@ -722,4 +727,12 @@ public class Service extends Activity {
 		this.opinionGroup = opinionGroup;
 	}
 
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
+
 }

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Split.java

@@ -366,6 +366,11 @@ public class Split extends Activity {
 	@CheckPersist(allowEmpty = true)
 	private String displayLogScriptText;
 
+	public static final String edition_FIELDNAME = "edition";
+	@FieldDescribe("版本编码.")
+	@Column(length = JpaObject.length_255B, name = ColumnNamePrefix + edition_FIELDNAME)
+	private String edition;
+
 	public String getDisplayLogScript() {
 		return displayLogScript;
 	}
@@ -702,4 +707,11 @@ public class Split extends Activity {
 		this.opinionGroup = opinionGroup;
 	}
 
+	public String getEdition() {
+		return edition;
+	}
+
+	public void setEdition(String edition) {
+		this.edition = edition;
+	}
 }