迁移汇报管理和目标管理至custom分类

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

@@ -1,54 +0,0 @@
-package com.x.base.core.project;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.x.base.core.entity.StorageType;
-import com.x.base.core.project.gson.XGsonBuilder;
-
-public class x_strategydeploy_assemble_control extends AssembleA {
-
-	public static final String name = "战略工作";
-	public static List<String> containerEntities = new ArrayList<>();
-	public static List<StorageType> usedStorageTypes = new ArrayList<>();
-	public static List<Class<? extends Compilable>> dependents = new ArrayList<>();
-
-	static {
-		containerEntities.add("com.x.strategydeploy.core.entity.Attachment");
-		containerEntities.add("com.x.strategydeploy.core.entity.StrategyDeploy");
-		containerEntities.add("com.x.strategydeploy.core.entity.MeasuresInfo");
-		containerEntities.add("com.x.strategydeploy.core.entity.KeyworkInfo");
-		containerEntities.add("com.x.strategydeploy.core.entity.StrategyConfigSys");
-		usedStorageTypes.add(StorageType.strategyDeploy);
-		dependents.add(x_base_core_project.class);
-		dependents.add(x_organization_core_express.class);
-		dependents.add(x_organization_core_entity.class);
-		dependents.add(x_strategydeploy_core_entity.class);
-		dependents.add(x_collaboration_core_message.class);
-	}
-
-	protected void custom(File lib, String xLib) throws Exception {
-		// File xLibDir = new File(xLib);
-		// File libDir = new File(lib, "WEB-INF/lib");
-		// for (Class<? extends Compilable> clz : dependents) {
-		// FileUtils.copyDirectory(xLibDir, libDir, new
-		// NameFileFilter(clz.getSimpleName() + "-" + VERSION + ".jar"));
-		// }
-	}
-
-	public static void main(String[] args) {
-		try {
-			String str = args[0];
-			str = StringUtils.replace(str, "\\", "/");
-			Argument arg = XGsonBuilder.instance().fromJson(str, Argument.class);
-			x_strategydeploy_assemble_control o = new x_strategydeploy_assemble_control();
-			o.pack(arg.getDistPath(), arg.getRepositoryPath());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-}

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

@@ -1,5 +0,0 @@
-package com.x.base.core.project;
-
-public class x_strategydeploy_core_entity extends CoreA {
-
-}

o2server/x_report_assemble_control/src/main/java/com/x/report/assemble/control/creator/profile/ProfileDetailComposer.java

@@ -6,8 +6,8 @@ import java.util.List;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.report.assemble.control.EnumReportModules;
 import com.x.report.assemble.control.dataadapter.strategy.CompanyStrategyMeasure;
-import com.x.report.assemble.control.dataadapter.strategy.CompanyStrategyWorks;
 import com.x.report.assemble.control.dataadapter.strategy.CompanyStrategyMeasure.WoCompanyStrategy;
+import com.x.report.assemble.control.dataadapter.strategy.CompanyStrategyWorks;
 import com.x.report.assemble.control.dataadapter.strategy.CompanyStrategyWorks.WoCompanyStrategyWorks;
 import com.x.report.assemble.control.schedule.bean.ReportCreateFlag;
 import com.x.report.core.entity.Report_P_Profile;

o2server/x_report_assemble_control/src/main/java/com/x/report/assemble/control/dataadapter/strategy/CompanyStrategyMeasure.java

@@ -4,7 +4,6 @@ import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.x.base.core.project.x_strategydeploy_assemble_control;
 import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
@@ -31,7 +30,8 @@ public class CompanyStrategyMeasure{
 		String serviceUrl = "strategydeployextra/listbyyear/";
 		String dataJson = "{\"strategydeployyear\":\""+year+"\"}";
 
-		ActionResponse resp = ThisApplication.context().applications().putQuery( x_strategydeploy_assemble_control.class, serviceUrl, dataJson );
+//		ActionResponse resp = ThisApplication.context().applications().putQuery(x_strategydeploy_assemble_control.class, serviceUrl, dataJson );
+		ActionResponse resp = ThisApplication.context().applications().putQuery("x_strategydeploy_assemble_control", serviceUrl, dataJson );
 		List<WoCompanyStrategy> wos = resp.getDataAsList( WoCompanyStrategy.class );
 		return wos;
 	}

o2server/x_report_assemble_control/src/main/java/com/x/report/assemble/control/dataadapter/strategy/CompanyStrategyWorks.java

@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.x.base.core.entity.JpaObject;
-import com.x.base.core.project.x_strategydeploy_assemble_control;
 import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
@@ -20,40 +19,47 @@ import com.x.strategydeploy.core.entity.StrategyDeploy;
  * 
  * @author O2LEE
  */
-public class CompanyStrategyWorks{
+public class CompanyStrategyWorks {
 
 	/**
 	 * TODO 从战略管理系统中获取所有的部门重点工作信息列表
-	 * @param year 
-	 * @param month 
+	 * 
+	 * @param year
+	 * @param month
 	 * @return
 	 */
-	public List<WoCompanyStrategyWorks> all( String year, String month ) throws UnsupportedEncodingException, Exception {
+	public List<WoCompanyStrategyWorks> all(String year, String month) throws UnsupportedEncodingException, Exception {
 		String serviceUri = "keyworkextra/listbyyearandmonth/year/" + year + "/month/" + month;
-		ActionResponse resp = ThisApplication.context().applications().getQuery( x_strategydeploy_assemble_control.class, serviceUri );
-		List<WoCompanyStrategyWorks> wos = resp.getDataAsList( WoCompanyStrategyWorks.class );
+//		ActionResponse resp = ThisApplication.context().applications().getQuery(x_strategydeploy_assemble_control.class, serviceUri );
+		ActionResponse resp = ThisApplication.context().applications().getQuery("x_strategydeploy_assemble_control",
+				serviceUri);
+		List<WoCompanyStrategyWorks> wos = resp.getDataAsList(WoCompanyStrategyWorks.class);
 		return wos;
 	}
-	
+
 	/**
 	 * TODO 从战略管理系统中获取所有的部门重点工作信息列表
-	 * @param year 
+	 * 
+	 * @param year
 	 * @return
 	 */
-	public List<WoCompanyStrategyWorks> all( String year ) throws UnsupportedEncodingException, Exception {
+	public List<WoCompanyStrategyWorks> all(String year) throws UnsupportedEncodingException, Exception {
 		String serviceUri = "keyworkextra/listbyyear/" + year;
-		ActionResponse resp = ThisApplication.context().applications().getQuery( x_strategydeploy_assemble_control.class, serviceUri );
-		List<WoCompanyStrategyWorks> wos = resp.getDataAsList( WoCompanyStrategyWorks.class );
+//		ActionResponse resp = ThisApplication.context().applications().getQuery(x_strategydeploy_assemble_control.class, serviceUri );
+		ActionResponse resp = ThisApplication.context().applications().getQuery("x_strategydeploy_assemble_control",
+				serviceUri);
+		List<WoCompanyStrategyWorks> wos = resp.getDataAsList(WoCompanyStrategyWorks.class);
 		return wos;
 	}
 
 	public static class WoCompanyStrategyWorks extends KeyworkInfo {
-		
+
 		private static final long serialVersionUID = -3236185242950790725L;
-		
+
 		public static List<String> Excludes = new ArrayList<String>();
-		
-		public static WrapCopier<KeyworkInfo, WoCompanyStrategyWorks> copier = WrapCopierFactory.wo(KeyworkInfo.class, WoCompanyStrategyWorks.class, null, JpaObject.FieldsInvisible);
+
+		public static WrapCopier<KeyworkInfo, WoCompanyStrategyWorks> copier = WrapCopierFactory.wo(KeyworkInfo.class,
+				WoCompanyStrategyWorks.class, null, JpaObject.FieldsInvisible);
 
 		@FieldDescribe("工作所属的战略举措信息列表")
 		private List<WoMeasuresInfoInWork> measuresobjlist;
@@ -66,17 +72,18 @@ public class CompanyStrategyWorks{
 			this.measuresobjlist = measuresobjlist;
 		}
 	}
-	
+
 	public static class WoMeasuresInfoInWork extends MeasuresInfo {
-		
+
 		private static final long serialVersionUID = -3236185242950790725L;
-		
+
 		public static List<String> Excludes = new ArrayList<String>();
-		
+
 		@FieldDescribe("战略举措所属的公司重点部署信息列表")
 		private WoStrategyDeployInMeasure strategyDeploy = null;
-		
-		public static WrapCopier<MeasuresInfo, WoMeasuresInfoInWork> copier = WrapCopierFactory.wo(MeasuresInfo.class, WoMeasuresInfoInWork.class, null, JpaObject.FieldsInvisible);
+
+		public static WrapCopier<MeasuresInfo, WoMeasuresInfoInWork> copier = WrapCopierFactory.wo(MeasuresInfo.class,
+				WoMeasuresInfoInWork.class, null, JpaObject.FieldsInvisible);
 
 		public WoStrategyDeployInMeasure getStrategyDeploy() {
 			return strategyDeploy;
@@ -86,14 +93,15 @@ public class CompanyStrategyWorks{
 			this.strategyDeploy = strategyDeploy;
 		}
 	}
-	
+
 	public static class WoStrategyDeployInMeasure extends StrategyDeploy {
-		
+
 		private static final long serialVersionUID = -3236185242950790725L;
-		
+
 		public static List<String> Excludes = new ArrayList<String>();
-		
-		public static WrapCopier<StrategyDeploy, WoStrategyDeployInMeasure> copier = WrapCopierFactory.wo(StrategyDeploy.class, WoStrategyDeployInMeasure.class, null, JpaObject.FieldsInvisible);
+
+		public static WrapCopier<StrategyDeploy, WoStrategyDeployInMeasure> copier = WrapCopierFactory
+				.wo(StrategyDeploy.class, WoStrategyDeployInMeasure.class, null, JpaObject.FieldsInvisible);
 
 	}
 }

o2server/x_report_assemble_control/src/main/java/com/x/report/assemble/control/jaxrs/export/StrategyDeployExportExcelWriter.java

@@ -10,9 +10,9 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
 

o2server/x_report_assemble_control/src/main/java/com/x/report/assemble/control/jaxrs/workinfo/ActionSaveWorkPlanSummary.java

@@ -1,8 +1,11 @@
 package com.x.report.assemble.control.jaxrs.workinfo;
 
 import java.io.Serializable;
+
 import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.lang3.StringUtils;
+
 import com.google.gson.JsonElement;
 import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.http.ActionResult;

o2server/x_report_assemble_control/src/main/java/com/x/report/assemble/control/jaxrs/workinfo/ActionSaveWorkProgSummary.java

@@ -1,8 +1,11 @@
 package com.x.report.assemble.control.jaxrs.workinfo;
 
 import java.io.Serializable;
+
 import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.lang3.StringUtils;
+
 import com.google.gson.JsonElement;
 import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.http.ActionResult;

o2server/x_report_assemble_control/src/main/java/com/x/report/assemble/control/x_report_assemble_control.java

@@ -0,0 +1,81 @@
+package com.x.report.assemble.control;
+
+import com.x.base.core.entity.StorageType;
+import com.x.base.core.project.AssembleA;
+import com.x.base.core.project.x_organization_core_entity;
+import com.x.base.core.project.x_organization_core_express;
+import com.x.base.core.project.annotation.Module;
+import com.x.base.core.project.annotation.ModuleCategory;
+import com.x.base.core.project.annotation.ModuleType;
+import com.x.report.core.entity.x_report_core_entity;
+
+@Module(type = ModuleType.ASSEMBLE, category = ModuleCategory.OFFICIAL, name = "汇报管理")
+public class x_report_assemble_control extends AssembleA {
+
+	public x_report_assemble_control() {
+		super();
+		dependency.containerEntities.add("com.x.report.core.entity.Report_C_WorkPlanNext");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_C_WorkPlanNextDetail");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_C_WorkPlan");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_C_WorkPlanDetail");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_C_WorkProg");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_C_WorkProgDetail");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_I_Base");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_I_Detail");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_I_WorkInfo");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_I_WorkInfoDetail");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_I_WorkTag");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_I_WorkTagUnit");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_P_Permission");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_P_MeasureInfo");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_P_Profile");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_P_ProfileDetail");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_R_CreateTime");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_R_View");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_S_Setting");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_S_SettingLobValue");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_I_Ext_Content");
+		dependency.containerEntities.add("com.x.report.core.entity.Report_I_Ext_ContentDetail");
+		dependency.storageTypes.add(StorageType.report.toString());
+		dependency.customJars.add("x_report_core_entity");
+		dependency.storeJars.add(x_organization_core_entity.class.getSimpleName());
+		dependency.storeJars.add(x_organization_core_express.class.getSimpleName());
+	}
+//	public static final String name = "汇报管理";
+//	public static List<String> containerEntities = new ArrayList<>();
+//	public static List<StorageType> usedStorageTypes = new ArrayList<>();
+//	public static List<Class<? extends Compilable>> dependents = new ArrayList<>();
+
+//	static {
+//		containerEntities.add("com.x.report.core.entity.Report_C_WorkPlanNext");
+//		containerEntities.add("com.x.report.core.entity.Report_C_WorkPlanNextDetail");
+//		containerEntities.add("com.x.report.core.entity.Report_C_WorkPlan");
+//		containerEntities.add("com.x.report.core.entity.Report_C_WorkPlanDetail");
+//		containerEntities.add("com.x.report.core.entity.Report_C_WorkProg");
+//		containerEntities.add("com.x.report.core.entity.Report_C_WorkProgDetail");
+//		containerEntities.add("com.x.report.core.entity.Report_I_Base");
+//		containerEntities.add("com.x.report.core.entity.Report_I_Detail");
+//		containerEntities.add("com.x.report.core.entity.Report_I_WorkInfo");
+//		containerEntities.add("com.x.report.core.entity.Report_I_WorkInfoDetail");
+//		containerEntities.add("com.x.report.core.entity.Report_I_WorkTag");
+//		containerEntities.add("com.x.report.core.entity.Report_I_WorkTagUnit");
+//		containerEntities.add("com.x.report.core.entity.Report_P_Permission");
+//		containerEntities.add("com.x.report.core.entity.Report_P_MeasureInfo");
+//		containerEntities.add("com.x.report.core.entity.Report_P_Profile");
+//		containerEntities.add("com.x.report.core.entity.Report_P_ProfileDetail");
+//		containerEntities.add("com.x.report.core.entity.Report_R_CreateTime");
+//		containerEntities.add("com.x.report.core.entity.Report_R_View");
+//		containerEntities.add("com.x.report.core.entity.Report_S_Setting");
+//		containerEntities.add("com.x.report.core.entity.Report_S_SettingLobValue");
+//		containerEntities.add("com.x.report.core.entity.Report_I_Ext_Content");
+//		containerEntities.add("com.x.report.core.entity.Report_I_Ext_ContentDetail");
+//
+//		usedStorageTypes.add(StorageType.report);
+//
+//		dependents.add(x_base_core_project.class);
+//		dependents.add(x_report_core_entity.class);
+//		dependents.add(x_organization_core_entity.class);
+//		dependents.add(x_organization_core_express.class);
+//	}
+
+}

o2server/x_report_assemble_control/src/main/java/com/x/report/common/cron/CronUtil.java

@@ -3,7 +3,9 @@ package com.x.report.common.cron;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+
 import org.quartz.CronExpression;
+
 import com.x.report.common.date.DateOperation;
 
 /**

o2server/x_report_core_entity/src/main/java/com/x/report/core/entity/x_report_core_entity.java

@@ -0,0 +1,11 @@
+package com.x.report.core.entity;
+
+import com.x.base.core.project.CoreA;
+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 = "汇报管理实体类")
+public class x_report_core_entity extends CoreA {
+
+}

o2server/x_strategydeploy_assemble_control/src/main/java/com/x/strategydeploy/assemble/control/keywork/ActionIsAdd.java

@@ -7,8 +7,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
-import com.x.base.core.project.x_report_assemble_control;
-import com.x.base.core.project.x_strategydeploy_assemble_control;
 import com.x.base.core.project.connection.ActionResponse;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
@@ -16,8 +14,8 @@ import com.x.base.core.project.jaxrs.WrapBoolean;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.report.core.entity.Report_S_Setting;
-import com.x.strategydeploy.assemble.control.ThisApplication;
 import com.x.strategydeploy.assemble.control.Business;
+import com.x.strategydeploy.assemble.control.ThisApplication;
 
 public class ActionIsAdd extends BaseAction {
 	private static Logger logger = LoggerFactory.getLogger(ActionIsAdd.class);
@@ -31,16 +29,16 @@ public class ActionIsAdd extends BaseAction {
 		ActionResult<Wo> result = new ActionResult<Wo>();
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			Business business = new Business(emc);
-			//战略作者（公司级别）
+			// 战略作者（公司级别）
 			List<String> writer_g = keyWorkOperationService.getWriter_groups();
 			List<String> writer_persons = business.organization().person().listWithGroup(writer_g);
 
-			//部门战略作者（部门级别）
+			// 部门战略作者（部门级别）
 			List<String> dept_writer_g = keyWorkOperationService.getDept_writer_groups();
 			List<String> dept_writer_persons = business.organization().person().listWithGroup(dept_writer_g);
 			String distinguishedName = effectivePerson.getDistinguishedName();
 
-			//---------------------部门战略管理员--------------------
+			// ---------------------部门战略管理员--------------------
 			List<String> identities = null;
 			List<String> dutyNames = null;
 			List<String> dutyNameResultList = new ArrayList<>();
@@ -58,14 +56,15 @@ public class ActionIsAdd extends BaseAction {
 				}
 			}
 
-			//部门战略管理员
+			// 部门战略管理员
 			String deptDuty = "";
 			deptDuty = this.getDutyNameFromReportSettingByConfigode();
 			logger.info("部门战略管理员 deptDuty：" + deptDuty);
-			//---------------------部门战略管理员---------------------
+			// ---------------------部门战略管理员---------------------
 
 			Wo wo = new Wo();
-			if (writer_persons.indexOf(distinguishedName) >= 0 || dept_writer_persons.indexOf(distinguishedName) >= 0 || dutyNameResultList.indexOf(deptDuty) >= 0) {
+			if (writer_persons.indexOf(distinguishedName) >= 0 || dept_writer_persons.indexOf(distinguishedName) >= 0
+					|| dutyNameResultList.indexOf(deptDuty) >= 0) {
 				wo.setValue(true);
 				result.setData(wo);
 			} else {
@@ -79,10 +78,14 @@ public class ActionIsAdd extends BaseAction {
 		return result;
 	}
 
+ 
 	String getDutyNameFromReportSettingByConfigode() throws Exception {
 		String key = this.configCode;
 		String serviceUri = "setting/code/" + key;
-		ActionResponse resp = ThisApplication.context().applications().getQuery(x_report_assemble_control.class, serviceUri);
+//		ActionResponse resp = ThisApplication.context().applications().getQuery(x_report_assemble_control.class,
+//				serviceUri);
+		ActionResponse resp = ThisApplication.context().applications().getQuery("x_report_assemble_control",
+				serviceUri);
 		Report_S_Setting setting = resp.getData(Report_S_Setting.class);
 		return setting.getConfigValue();
 	}

o2server/x_strategydeploy_assemble_control/src/main/java/com/x/strategydeploy/assemble/control/x_strategydeploy_assemble_control.java

@@ -0,0 +1,49 @@
+package com.x.strategydeploy.assemble.control;
+
+import com.x.base.core.entity.StorageType;
+import com.x.base.core.project.AssembleA;
+import com.x.base.core.project.x_collaboration_core_message;
+import com.x.base.core.project.x_organization_core_entity;
+import com.x.base.core.project.x_organization_core_express;
+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 = "战略工作")
+public class x_strategydeploy_assemble_control extends AssembleA {
+
+	public x_strategydeploy_assemble_control() {
+		super();
+		dependency.containerEntities.add("com.x.strategydeploy.core.entity.Attachment");
+		dependency.containerEntities.add("com.x.strategydeploy.core.entity.StrategyDeploy");
+		dependency.containerEntities.add("com.x.strategydeploy.core.entity.MeasuresInfo");
+		dependency.containerEntities.add("com.x.strategydeploy.core.entity.KeyworkInfo");
+		dependency.containerEntities.add("com.x.strategydeploy.core.entity.StrategyConfigSys");
+		dependency.storageTypes.add(StorageType.strategyDeploy.toString());
+		dependency.storeJars.add(x_organization_core_express.class.getSimpleName());
+		dependency.storeJars.add(x_organization_core_entity.class.getSimpleName());
+		dependency.storeJars.add(x_collaboration_core_message.class.getSimpleName());
+		dependency.customJars.add("x_strategydeploy_core_entity");
+	}
+
+//	public static final Dependency dependency = new Dependency();
+//
+//	static {
+//		dependency.containerEntities.add("com.x.strategydeploy.core.entity.Attachment");
+//		dependency.containerEntities.add("com.x.strategydeploy.core.entity.StrategyDeploy");
+//		dependency.containerEntities.add("com.x.strategydeploy.core.entity.MeasuresInfo");
+//		dependency.containerEntities.add("com.x.strategydeploy.core.entity.KeyworkInfo");
+//		dependency.containerEntities.add("com.x.strategydeploy.core.entity.StrategyConfigSys");
+//		dependency.storageTypes.add(StorageType.strategyDeploy.toString());
+//		dependency.storeJars.add(x_organization_core_express.class.getName());
+//		dependency.storeJars.add(x_organization_core_entity.class.getName());
+//		dependency.storeJars.add(x_collaboration_core_message.class.getName());
+//		dependency.customJars.add("x_strategydeploy_core_entity");
+//	}
+
+//	public static final String name = "战略工作";
+//	public static List<String> containerEntities = new ArrayList<>();
+//	public static List<StorageType> usedStorageTypes = new ArrayList<>();
+//	public static List<Class<? extends Compilable>> dependents = new ArrayList<>();
+
+}

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

@@ -2,4 +2,9 @@
 <web-app id="x_strategydeploy_assemble_control"
 	metadata-complete="false" version="3.0">
 	<display-name>x_strategydeploy_assemble_control</display-name>
+	<context-param>
+		<param-name>project</param-name>
+		<param-value>com.x.strategydeploy.assemble.control.x_strategydeploy_assemble_control
+		</param-value>
+	</context-param>
 </web-app>

o2server/x_strategydeploy_core_entity/src/main/java/com/x/strategydeploy/core/entity/x_strategydeploy_core_entity.java

@@ -0,0 +1,11 @@
+package com.x.strategydeploy.core.entity;
+
+import com.x.base.core.project.CoreA;
+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 = "战略工作实体类")
+public class x_strategydeploy_core_entity extends CoreA {
+
+}