teamwork转为custom应用

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

@@ -1,24 +0,0 @@
-package com.x.base.core.project;
-
-import com.x.base.core.project.annotation.Module;
-import com.x.base.core.project.annotation.ModuleCategory;
-import com.x.base.core.project.annotation.ModuleType;
-
-@Module(type = ModuleType.ASSEMBLE, category = ModuleCategory.OFFICIAL, name = "工作任务管理", packageName = "com.x.teamwork.assemble.control", 
-containerEntities = {
-		"com.x.teamwork.core.entity.Project", "com.x.teamwork.core.entity.ProjectDetail",
-		"com.x.teamwork.core.entity.CustomExtFieldRele", "com.x.teamwork.core.entity.ProjectGroup",
-		"com.x.teamwork.core.entity.ProjectTemplate","com.x.teamwork.core.entity.TaskListTemplate",
-		"com.x.teamwork.core.entity.ProjectGroupRele", "com.x.teamwork.core.entity.Task",
-		"com.x.teamwork.core.entity.TaskGroup", "com.x.teamwork.core.entity.TaskGroupRele",
-		"com.x.teamwork.core.entity.TaskDetail", "com.x.teamwork.core.entity.TaskExtField", "com.x.teamwork.core.entity.TaskList",
-		"com.x.teamwork.core.entity.TaskListRele", "com.x.teamwork.core.entity.TaskRelevance",
-		"com.x.teamwork.core.entity.TaskView", "com.x.teamwork.core.entity.SystemConfig",
-		"com.x.teamwork.core.entity.SystemConfigLobValue", "com.x.teamwork.core.entity.Review",
-		"com.x.teamwork.core.entity.BatchOperation", "com.x.teamwork.core.entity.TaskTag", 
-		"com.x.teamwork.core.entity.TaskTagRele", "com.x.teamwork.core.entity.Attachment","com.x.teamwork.core.entity.ProjectConfig",
-		"com.x.teamwork.core.entity.Chat", "com.x.teamwork.core.entity.ChatContent","com.x.teamwork.core.entity.Priority",
-		"com.x.teamwork.core.entity.Dynamic", "com.x.teamwork.core.entity.DynamicDetail" }, storeJars = { "x_organization_core_entity",
-		"x_organization_core_express", "x_teamwork_core_entity" })
-public class x_teamwork_assemble_control extends Deployable {
-}

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

@@ -1,10 +0,0 @@
-package com.x.base.core.project;
-
-import com.x.base.core.project.annotation.Module;
-import com.x.base.core.project.annotation.ModuleCategory;
-import com.x.base.core.project.annotation.ModuleType;
-
-@Module(type = ModuleType.ENTITY, category = ModuleCategory.OFFICIAL, name = "工作任务管理", packageName = "com.x.teamwork.core.entity")
-public class x_teamwork_core_entity extends Compilable {
-
-}

o2server/x_teamwork_assemble_control/pom.xml

@@ -111,7 +111,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>../store</outputDirectory>
+							<outputDirectory>../../o2server/custom</outputDirectory>
 							<resources>
 								<resource>
 									<directory>target</directory>

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/MimeTypeDefinition.java

@@ -0,0 +1,7 @@
+package com.x.teamwork.assemble.control;
+
+import javax.activation.MimetypesFileTypeMap;
+
+public class MimeTypeDefinition {
+	public static MimetypesFileTypeMap instance;
+}

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/extfield/ActionListWithType.java

@@ -0,0 +1,80 @@
+package com.x.teamwork.assemble.control.jaxrs.extfield;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.x.base.core.entity.JpaObject;
+import com.x.base.core.project.bean.WrapCopier;
+import com.x.base.core.project.bean.WrapCopierFactory;
+import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.ListTools;
+import com.x.base.core.project.tools.SortTools;
+import com.x.teamwork.core.entity.CustomExtFieldRele;
+
+import net.sf.ehcache.Element;
+
+public class ActionListWithType extends BaseAction {
+
+	private static Logger logger = LoggerFactory.getLogger(ActionListWithType.class);
+
+	@SuppressWarnings("unchecked")
+	protected ActionResult<List<Wo>> execute(HttpServletRequest request, EffectivePerson effectivePerson, String type ) throws Exception {
+		ActionResult<List<Wo>> result = new ActionResult<>();
+		List<Wo> wos = null;
+		List<CustomExtFieldRele> customExtFieldReles = null;
+		Boolean check = true;
+
+		String cacheKey = ApplicationCache.concreteCacheKey( "ActionListWithPublic", type, effectivePerson.getDistinguishedName() );
+		Element element = customExtFieldReleCache.get( cacheKey );
+		
+		if ((null != element) && (null != element.getObjectValue())) {
+			wos = (List<Wo>) element.getObjectValue();
+			result.setData( wos );
+		} else {
+			if( Boolean.TRUE.equals( check ) ){
+				try {
+					customExtFieldReles = customExtFieldReleQueryService.listReleWithType(type);
+					if( ListTools.isEmpty( customExtFieldReles )) {
+						customExtFieldReles = new ArrayList<>();
+					}
+					wos = Wo.copier.copy( customExtFieldReles );						
+					SortTools.asc( wos, "createTime");						
+					customExtFieldReleCache.put(new Element(cacheKey, wos));
+					result.setData(wos);	
+				} catch (Exception e) {
+					check = false;
+					Exception exception = new CustomExtFieldReleQueryException(e, "根据关联ID查询对应的扩展属性信息列表时发生异常。");
+					result.error(exception);
+					logger.error(e, effectivePerson, request, null);
+				}
+			}
+		}
+		return result;
+	}
+
+	public static class Wo extends CustomExtFieldRele {
+		
+		private Long rank;
+
+		public Long getRank() {
+			return rank;
+		}
+
+		public void setRank(Long rank) {
+			this.rank = rank;
+		}
+		
+		private static final long serialVersionUID = -5076990764713538973L;
+
+		public static List<String> Excludes = new ArrayList<String>();
+
+		static WrapCopier<CustomExtFieldRele, Wo> copier = WrapCopierFactory.wo( CustomExtFieldRele.class, Wo.class, null, ListTools.toList(JpaObject.FieldsInvisible));
+
+	}
+}

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/x_teamwork_assemble_control.java

@@ -0,0 +1,18 @@
+package com.x.teamwork.assemble.control;
+
+import com.x.base.core.project.Deployable;
+import com.x.base.core.project.annotation.Module;
+import com.x.base.core.project.annotation.ModuleCategory;
+import com.x.base.core.project.annotation.ModuleType;
+
+@Module(type = ModuleType.ASSEMBLE, category = ModuleCategory.CUSTOM, name = "团队管理", packageName = "com.x.teamwork.assemble.control", containerEntities = {
+		"com.x.teamwork.core.entity.Attachment","com.x.teamwork.core.entity.BatchOperation","com.x.teamwork.core.entity.Chat","com.x.teamwork.core.entity.ChatContent","com.x.teamwork.core.entity.Config","com.x.teamwork.core.entity.CustomExtFieldRele","com.x.teamwork.core.entity.Dynamic"
+		,"com.x.teamwork.core.entity.DynamicDetail","com.x.teamwork.core.entity.Priority","com.x.teamwork.core.entity.Project","com.x.teamwork.core.entity.ProjectConfig","com.x.teamwork.core.entity.ProjectDetail","com.x.teamwork.core.entity.ProjectGroup"
+		,"com.x.teamwork.core.entity.ProjectGroupRele","com.x.teamwork.core.entity.ProjectGroupRele","com.x.teamwork.core.entity.ProjectGroupRele","com.x.teamwork.core.entity.ProjectTemplate","com.x.teamwork.core.entity.Review","com.x.teamwork.core.entity.SystemConfig"
+		,"com.x.teamwork.core.entity.SystemConfig","com.x.teamwork.core.entity.PersistenceProperties","com.x.teamwork.core.entity.SystemConfigLobValue","com.x.teamwork.core.entity.Task","com.x.teamwork.core.entity.TaskDetail","com.x.teamwork.core.entity.TaskExtField"
+		,"com.x.teamwork.core.entity.TaskExtField","com.x.teamwork.core.entity.TaskGroup","com.x.teamwork.core.entity.TaskGroupRele","com.x.teamwork.core.entity.TaskList","com.x.teamwork.core.entity.TaskListRele","com.x.teamwork.core.entity.TaskListTemplate"
+		,"com.x.teamwork.core.entity.TaskRelevance","com.x.teamwork.core.entity.TaskStatuType","com.x.teamwork.core.entity.TaskTag","com.x.teamwork.core.entity.TaskTagRele","com.x.teamwork.core.entity.TaskView"}, 
+		storeJars = { "x_organization_core_entity",
+				"x_organization_core_express" }, customJars = { "x_teamwork_core_entity" })
+public class x_teamwork_assemble_control extends Deployable {
+}

o2server/x_teamwork_assemble_control/src/main/webapp/WEB-INF/web.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><web-app id="x_teamwork_assemble_control" metadata-complete="false" version="3.0"><display-name>x_teamwork_assemble_control</display-name><context-param><param-name>project</param-name><param-value>com.x.base.core.project.x_teamwork_assemble_control</param-value></context-param></web-app>
+<?xml version="1.0" encoding="UTF-8"?><web-app id="x_teamwork_assemble_control" metadata-complete="false" version="3.0"><display-name>x_teamwork_assemble_control</display-name><context-param><param-name>project</param-name><param-value>com.x.teamwork.assemble.control.x_teamwork_assemble_control</param-value></context-param></web-app>

o2server/x_teamwork_core_entity/pom.xml

@@ -83,7 +83,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>../store/jars</outputDirectory>
+							<outputDirectory>../../o2server/custom/jars</outputDirectory>
 							<resources>
 								<resource>
 									<directory>target</directory>