删除工作汇报和战略目标管理的实体对象

o2server/x_component_assemble_control/src/main/java/com/x/component/assemble/control/jaxrs/component/ActionBase.java

@@ -22,14 +22,15 @@ class ActionBase extends StandardJaxrsAction {
 	static final String COMPONENT_HOTARTICLE = "HotArticle";
 	static final String COMPONENT_EXEMANAGER = "ExeManager";
 	static final String COMPONENT_ONLINEMEETING = "OnlineMeeting";
-	static final String COMPONENT_STRATEGY = "Strategy";
-	static final String COMPONENT_REPORT = "Report";
+	static final String COMPONENT_ANN = "ANN";
+//	static final String COMPONENT_STRATEGY = "Strategy";
+//	static final String COMPONENT_REPORT = "Report";
 	static final String COMPONENT_MINDER = "Minder";
 	static final String COMPONENT_CALENDAR = "Calendar";
 
 	List<String> DEFAULT_COMPONENT_LIST = ListTools.toList(COMPONENT_FILE, COMPONENT_NOTE, COMPONENT_MEETING,
 			COMPONENT_EXECUTION, COMPONENT_ATTENDANCE, COMPONENT_FORUM, COMPONENT_HOTARTICLE, COMPONENT_EXEMANAGER,
-			COMPONENT_ONLINEMEETING, COMPONENT_STRATEGY, COMPONENT_REPORT, COMPONENT_MINDER, COMPONENT_CALENDAR);
+			COMPONENT_ONLINEMEETING, COMPONENT_MINDER, COMPONENT_CALENDAR, COMPONENT_ANN);
 
 	// {
 	// "name": "File",
@@ -124,5 +125,4 @@ class ActionBase extends StandardJaxrsAction {
 	// "visible": true
 	// }
 
- 
 }

o2server/x_component_assemble_control/src/main/java/com/x/component/assemble/control/jaxrs/component/ActionListAll.java

@@ -130,20 +130,20 @@ class ActionListAll extends ActionBase {
 			o.setIconPath("appicon.png");
 			o.setVisible(true);
 			break;
-		case COMPONENT_STRATEGY:
-			o.setName(COMPONENT_STRATEGY);
-			o.setPath(COMPONENT_STRATEGY);
-			o.setTitle("战略管理");
-			o.setIconPath("appicon.png");
-			o.setVisible(true);
-			break;
-		case COMPONENT_REPORT:
-			o.setName(COMPONENT_REPORT);
-			o.setPath(COMPONENT_REPORT);
-			o.setTitle("工作报告");
-			o.setIconPath("appicon.png");
-			o.setVisible(true);
-			break;
+//		case COMPONENT_STRATEGY:
+//			o.setName(COMPONENT_STRATEGY);
+//			o.setPath(COMPONENT_STRATEGY);
+//			o.setTitle("战略管理");
+//			o.setIconPath("appicon.png");
+//			o.setVisible(true);
+//			break;
+//		case COMPONENT_REPORT:
+//			o.setName(COMPONENT_REPORT);
+//			o.setPath(COMPONENT_REPORT);
+//			o.setTitle("工作报告");
+//			o.setIconPath("appicon.png");
+//			o.setVisible(true);
+//			break;
 		case COMPONENT_MINDER:
 			o.setName(COMPONENT_MINDER);
 			o.setPath(COMPONENT_MINDER);
@@ -158,6 +158,13 @@ class ActionListAll extends ActionBase {
 			o.setIconPath("appicon.png");
 			o.setVisible(true);
 			break;
+		case COMPONENT_ANN:
+			o.setName(COMPONENT_ONLINEMEETING);
+			o.setPath(COMPONENT_ONLINEMEETING);
+			o.setTitle("神经网络");
+			o.setIconPath("appicon.png");
+			o.setVisible(true);
+			break;
 		default:
 			break;
 		}

o2server/x_console/pom.xml

@@ -20,10 +20,6 @@
 			<groupId>o2oa</groupId>
 			<artifactId>x_bbs_core_entity</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_report_core_entity</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>o2oa</groupId>
 			<artifactId>x_program_center_core_entity</artifactId>

o2server/x_console/src/main/java/com/x/server/console/action/ActionEraseContentReport.java

@@ -1,58 +0,0 @@
-package com.x.server.console.action;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.x.base.core.project.config.Config;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-import com.x.report.core.entity.Report_C_WorkPlan;
-import com.x.report.core.entity.Report_C_WorkPlanDetail;
-import com.x.report.core.entity.Report_C_WorkPlanNext;
-import com.x.report.core.entity.Report_C_WorkPlanNextDetail;
-import com.x.report.core.entity.Report_C_WorkProg;
-import com.x.report.core.entity.Report_C_WorkProgDetail;
-import com.x.report.core.entity.Report_I_Base;
-import com.x.report.core.entity.Report_I_Detail;
-import com.x.report.core.entity.Report_I_WorkInfo;
-import com.x.report.core.entity.Report_I_WorkInfoDetail;
-import com.x.report.core.entity.Report_I_WorkTag;
-import com.x.report.core.entity.Report_I_WorkTagUnit;
-import com.x.report.core.entity.Report_P_MeasureInfo;
-import com.x.report.core.entity.Report_P_Permission;
-import com.x.report.core.entity.Report_P_Profile;
-import com.x.report.core.entity.Report_P_ProfileDetail;
-import com.x.report.core.entity.Report_R_CreateTime;
-import com.x.report.core.entity.Report_R_View;
-
-public class ActionEraseContentReport extends ActionEraseContentProcessPlatform {
-
-	private static Logger logger = LoggerFactory.getLogger(ActionEraseContentReport.class);
-
-	public boolean execute(String password) throws Exception {
-		if (!StringUtils.equals(Config.token().getPassword(), password)) {
-			logger.print("password not match.");
-			return false;
-		}
-		this.init("report", null);
-		addClass(Report_C_WorkPlan.class);
-		addClass(Report_C_WorkPlanDetail.class);
-		addClass(Report_C_WorkPlanNext.class);
-		addClass(Report_C_WorkPlanNextDetail.class);
-		addClass(Report_C_WorkProg.class);
-		addClass(Report_C_WorkProgDetail.class);
-		addClass(Report_I_Base.class);
-		addClass(Report_I_Detail.class);
-		addClass(Report_I_WorkInfo.class);
-		addClass(Report_I_WorkInfoDetail.class);
-		addClass(Report_I_WorkTag.class);
-		addClass(Report_I_WorkTagUnit.class);
-		addClass(Report_P_MeasureInfo.class);
-		addClass(Report_P_Permission.class);
-		addClass(Report_P_Profile.class);
-		addClass(Report_P_ProfileDetail.class);
-		addClass(Report_R_CreateTime.class);
-		addClass(Report_R_View.class);
-		this.run();
-		return true;
-	}
-}

o2server/x_console/src/test/resources/x_component_assemble_control.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
-	<Set name="contextPath">/x_component_assemble_control</Set>
-	<Set name="war">/data/o2server/store/x_component_assemble_control.war
-	</Set>
-	<Set name="extraClasspath">/data/o2server/commons/ext/openjpa-2.4.2-SNAPSHOT.jar;/data/o2server/commons/ext/slf4j-simple-1.7.21.jar;/data/o2server/commons/ext/slf4j-api-1.7.21.jar;/data/o2server/commons/ext/ehcache-2.10.1.jar;/data/o2server/store/jars/x_component_core_entity-4.0.0.jar;/data/o2server/store/jars/x_base_core_project-4.0.0.jar
-	</Set>
-	<Set name="tempDirectory">/data/o2server/servers/applicationServer/work/x_component_assemble_control
-	</Set>
-</Configure>