修复#243

.gitignore

@@ -14,6 +14,7 @@
 /o2server/jvm/
 /o2server/local/
 /o2server/*/src/main/webapp/describe/
+/o2server/*/src/main/webapp/WEB-INF/
 **/.settings/
 **/.classpath
 **/.project

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ProcessPlatform.java

@@ -1,49 +1,52 @@
 package com.x.base.core.project.config;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import com.x.base.core.project.annotation.FieldDescribe;
+import com.x.base.core.project.gson.XGsonBuilder;
+import com.x.base.core.project.tools.DefaultCharset;
+import com.x.base.core.project.tools.ListTools;
 
-import org.apache.commons.collections4.Get;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.quartz.CronExpression;
 
-import com.x.base.core.project.annotation.FieldDescribe;
-import com.x.base.core.project.gson.XGsonBuilder;
-import com.x.base.core.project.tools.DefaultCharset;
-
 /**
  * @author Zhou Rui
  */
 public class ProcessPlatform extends ConfigObject {
 
-	public final static Integer DEFAULT_FORMVERSIONPERIOD = 45;
+	public static final Integer DEFAULT_FORMVERSIONPERIOD = 45;
 
-	public final static Integer DEFAULT_PROCESSVERSIONPERIOD = 45;
+	public static final Integer DEFAULT_PROCESSVERSIONPERIOD = 45;
 
-	public final static Integer DEFAULT_SCRIPTVERSIONPERIOD = 45;
+	public static final Integer DEFAULT_SCRIPTVERSIONPERIOD = 45;
 
-	public final static Integer DEFAULT_FORMVERSIONCOUNT = 30;
+	public static final Integer DEFAULT_FORMVERSIONCOUNT = 30;
 
-	public final static Integer DEFAULT_PROCESSVERSIONCOUNT = 30;
+	public static final Integer DEFAULT_PROCESSVERSIONCOUNT = 30;
 
-	public final static Integer DEFAULT_SCRIPTVERSIONCOUNT = 30;
+	public static final Integer DEFAULT_SCRIPTVERSIONCOUNT = 30;
 
-	public final static String DEFAULT_DOCTOWORDTYPE = "local";
+	public static final String DEFAULT_DOCTOWORDTYPE = "local";
 
-	public final static String DOCTOWORDTYPE_LOCAL = "local";
+	public static final String DOCTOWORDTYPE_LOCAL = "local";
 
-	public final static String DOCTOWORDTYPE_CLOUD = "cloud";
+	public static final String DOCTOWORDTYPE_CLOUD = "cloud";
 
-	public final static String DEFAULT_DOCTOWORDDEFAULTFILENAME = "正文.docx";
+	public static final String DEFAULT_DOCTOWORDDEFAULTFILENAME = "正文.docx";
 
-	public final static String DEFAULT_DOCTOWORDDEFAULTSITE = "$doc";
+	public static final String DEFAULT_DOCTOWORDDEFAULTSITE = "$doc";
 
-	public final static Integer DEFAULT_EXECUTORCOUNT = 32;
+	public static final Integer DEFAULT_EXECUTORCOUNT = 32;
 
-	public final static Boolean DEFAULT_DELETEPROCESSINUSE = false;
+	public static final Boolean DEFAULT_DELETEPROCESSINUSE = false;
 
-	public final static Boolean DEFAULT_DELETEAPPLICATIONINUSE = false;
+	public static final Boolean DEFAULT_DELETEAPPLICATIONINUSE = false;
 
 	public final static Boolean DEFAULT_UPDATEDATAPROJECTIONENABLE = false;
 
@@ -159,6 +162,16 @@ public class ProcessPlatform extends ConfigObject {
 	@FieldDescribe("提醒设置,设置提醒间隔.")
 	private Press press;
 
+	@FieldDescribe("事件扩充.")
+	private ExtensionEvents extensionEvents;
+
+	public ExtensionEvents getExtensionEvents() {
+		if (null == extensionEvents) {
+			this.extensionEvents = new ExtensionEvents();
+		}
+		return extensionEvents;
+	}
+
 	public Urge getUrge() {
 		return this.urge == null ? new Urge() : this.urge;
 	}
@@ -550,4 +563,238 @@ public class ProcessPlatform extends ConfigObject {
 
 	}
 
+	public static class ExtensionEvents {
+
+		// public static ExtensionEvents defaultInstance() {
+		// return new ExtensionEvents();
+		// }
+
+		@FieldDescribe("工作附件上传.")
+		private WorkExtensionEvents workAttachmentUploadEvents = new WorkExtensionEvents();
+		@FieldDescribe("工作附件下载.")
+		private WorkExtensionEvents workAttachmentDownloadEvents = new WorkExtensionEvents();
+		@FieldDescribe("工作版式文件转word.")
+		private WorkExtensionEvents workDocToWordEvents = new WorkExtensionEvents();
+		@FieldDescribe("已完成工作附件上传.")
+		private WorkCompletedExtensionEvents workCompletedAttachmentUploadEvents = new WorkCompletedExtensionEvents();
+		@FieldDescribe("已完成工作附件下载.")
+		private WorkCompletedExtensionEvents workCompletedAttachmentDownloadEvents = new WorkCompletedExtensionEvents();
+		@FieldDescribe("已完成工作版式文件转word.")
+		private WorkCompletedExtensionEvents workCompletedDocToWordEvents = new WorkCompletedExtensionEvents();
+
+		public WorkExtensionEvents getWorkAttachmentUploadEvents() {
+			if (null == this.workAttachmentUploadEvents) {
+				this.workAttachmentUploadEvents = new WorkExtensionEvents();
+			}
+			return workAttachmentUploadEvents;
+		}
+
+		public WorkExtensionEvents getWorkAttachmentDownloadEvents() {
+			if (null == this.workAttachmentDownloadEvents) {
+				this.workAttachmentDownloadEvents = new WorkExtensionEvents();
+			}
+			return workAttachmentDownloadEvents;
+		}
+
+		public WorkExtensionEvents getWorkDocToWordEvents() {
+			if (null == this.workDocToWordEvents) {
+				this.workDocToWordEvents = new WorkExtensionEvents();
+			}
+			return workDocToWordEvents;
+		}
+
+		public WorkCompletedExtensionEvents getWorkCompletedAttachmentUploadEvents() {
+			if (null == this.workCompletedAttachmentUploadEvents) {
+				this.workCompletedAttachmentUploadEvents = new WorkCompletedExtensionEvents();
+			}
+			return workCompletedAttachmentUploadEvents;
+		}
+
+		public WorkCompletedExtensionEvents getWorkCompletedAttachmentDownloadEvents() {
+			if (null == this.workCompletedAttachmentDownloadEvents) {
+				this.workCompletedAttachmentDownloadEvents = new WorkCompletedExtensionEvents();
+			}
+			return workCompletedAttachmentDownloadEvents;
+		}
+
+		public WorkCompletedExtensionEvents getWorkCompletedDocToWordEvents() {
+			if (null == this.workCompletedDocToWordEvents) {
+				this.workCompletedDocToWordEvents = new WorkCompletedExtensionEvents();
+			}
+			return workCompletedDocToWordEvents;
+		}
+
+	}
+
+	public static class WorkExtensionEvents extends ArrayList<WorkExtensionEvent> {
+
+		public Optional<WorkExtensionEvent> bind(String application, String process, String activity) {
+			return this.stream().filter(o -> BooleanUtils.isTrue(o.getEnable()))
+					.filter(o -> (ListTools.contains(o.getApplications(), application)
+							&& ListTools.contains(o.getProcesses(), process)
+							&& ListTools.contains(o.getActivities(), activity))
+							|| (ListTools.contains(o.getApplications(), application)
+									&& ListTools.contains(o.getProcesses(), process)
+									&& ListTools.isEmpty(o.getActivities()))
+							|| (ListTools.contains(o.getApplications(), application)
+									&& ListTools.isEmpty(o.getProcesses()) && ListTools.isEmpty(o.getActivities()))
+							|| (ListTools.isEmpty(o.getApplications()) && ListTools.isEmpty(o.getProcesses())
+									&& ListTools.isEmpty(o.getActivities())))
+					.sorted((x, y) -> {
+						if (x.getActivities().contains(activity)) {
+							return 1;
+						} else if (y.getActivities().contains(activity)) {
+							return -1;
+						} else if (x.getProcesses().contains(process)) {
+							return 1;
+						} else if (y.getProcesses().contains(process)) {
+							return -1;
+						} else if (x.getApplications().contains(application)) {
+							return 1;
+						} else if (y.getApplications().contains(application)) {
+							return -1;
+						} else {
+							return 0;
+						}
+					}).findFirst();
+		}
+
+	}
+
+	public static class WorkExtensionEvent {
+
+		private Boolean enable;
+
+		private List<String> applications;
+		private List<String> processes;
+		private List<String> activities;
+
+		private String url;
+
+		private String custom;
+
+		public Boolean getEnable() {
+			return enable;
+		}
+
+		public void setEnable(Boolean enable) {
+			this.enable = enable;
+		}
+
+		public List<String> getApplications() {
+			return applications;
+		}
+
+		public void setApplications(List<String> applications) {
+			this.applications = applications;
+		}
+
+		public List<String> getProcesses() {
+			return processes;
+		}
+
+		public void setProcesses(List<String> processes) {
+			this.processes = processes;
+		}
+
+		public List<String> getActivities() {
+			return activities;
+		}
+
+		public void setActivities(List<String> activities) {
+			this.activities = activities;
+		}
+
+		public String getUrl() {
+			return url;
+		}
+
+		public void setUrl(String url) {
+			this.url = url;
+		}
+
+		public String getCustom() {
+			return custom;
+		}
+
+		public void setCustom(String custom) {
+			this.custom = custom;
+		}
+
+	}
+
+	public static class WorkCompletedExtensionEvents extends ArrayList<WorkCompletedExtensionEvent> {
+		public Optional<WorkCompletedExtensionEvent> bind(String application, String process) {
+			return this.stream().filter(o -> BooleanUtils.isTrue(o.getEnable()))
+					.filter(o -> (ListTools.contains(o.getApplications(), application)
+							&& ListTools.contains(o.getProcesses(), process))
+							|| (ListTools.contains(o.getApplications(), application)
+									&& ListTools.isEmpty(o.getApplications()))
+							|| (ListTools.isEmpty(o.getApplications()) && ListTools.isEmpty(o.getProcesses())))
+					.sorted((x, y) -> {
+						if (x.getProcesses().contains(process)) {
+							return 1;
+						} else if (y.getProcesses().contains(process)) {
+							return -1;
+						} else if (x.getApplications().contains(application)) {
+							return 1;
+						} else if (y.getApplications().contains(application)) {
+							return -1;
+						} else {
+							return 0;
+						}
+					}).findFirst();
+		}
+	}
+
+	public static class WorkCompletedExtensionEvent {
+
+		private Boolean enable;
+		private List<String> applications;
+		private List<String> processes;
+		private String url;
+		private String custom;
+
+		public Boolean getEnable() {
+			return enable;
+		}
+
+		public void setEnable(Boolean enable) {
+			this.enable = enable;
+		}
+
+		public List<String> getApplications() {
+			return applications;
+		}
+
+		public void setApplications(List<String> applications) {
+			this.applications = applications;
+		}
+
+		public List<String> getProcesses() {
+			return processes;
+		}
+
+		public void setProcesses(List<String> processes) {
+			this.processes = processes;
+		}
+
+		public String getUrl() {
+			return url;
+		}
+
+		public void setUrl(String url) {
+			this.url = url;
+		}
+
+		public String getCustom() {
+			return custom;
+		}
+
+		public void setCustom(String custom) {
+			this.custom = custom;
+		}
+
+	}
+
 }