diff --git a/o2server/x_component_assemble_control/src/main/java/com/x/component/assemble/control/jaxrs/component/ActionBase.java b/o2server/x_component_assemble_control/src/main/java/com/x/component/assemble/control/jaxrs/component/ActionBase.java index e0ecd6ade43c50bb89406d91931796a4eeb7f3eb..0a0c4c8e082d6a0f86cc930d00569024a05eac85 100644 --- a/o2server/x_component_assemble_control/src/main/java/com/x/component/assemble/control/jaxrs/component/ActionBase.java +++ b/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 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 // } - } diff --git a/o2server/x_component_assemble_control/src/main/java/com/x/component/assemble/control/jaxrs/component/ActionListAll.java b/o2server/x_component_assemble_control/src/main/java/com/x/component/assemble/control/jaxrs/component/ActionListAll.java index 1edb02166babdd1d01d91fb22cff97c7dccec76d..c4fecade9342b1365a287e1d339081cc7b8ac131 100644 --- a/o2server/x_component_assemble_control/src/main/java/com/x/component/assemble/control/jaxrs/component/ActionListAll.java +++ b/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; } diff --git a/o2server/x_console/pom.xml b/o2server/x_console/pom.xml index 49aca5fe1d350105837e6d95dc174777e6b84ef7..393a6935233d4c61a27a4b97ef5009fd870e1df9 100644 --- a/o2server/x_console/pom.xml +++ b/o2server/x_console/pom.xml @@ -20,10 +20,6 @@ o2oa x_bbs_core_entity - - o2oa - x_report_core_entity - o2oa x_program_center_core_entity diff --git a/o2server/x_console/src/main/java/com/x/server/console/action/ActionEraseContentReport.java b/o2server/x_console/src/main/java/com/x/server/console/action/ActionEraseContentReport.java deleted file mode 100644 index 6de2159200a9903ad88eb34fdb9fd21fd15f0c61..0000000000000000000000000000000000000000 --- a/o2server/x_console/src/main/java/com/x/server/console/action/ActionEraseContentReport.java +++ /dev/null @@ -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; - } -} \ No newline at end of file diff --git a/o2server/x_console/src/test/resources/x_component_assemble_control.xml b/o2server/x_console/src/test/resources/x_component_assemble_control.xml deleted file mode 100644 index fc2fccfe359c13f1e53e09f5f9f75bd30ad8fc0b..0000000000000000000000000000000000000000 --- a/o2server/x_console/src/test/resources/x_component_assemble_control.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - /x_component_assemble_control - /data/o2server/store/x_component_assemble_control.war - - /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 - - /data/o2server/servers/applicationServer/work/x_component_assemble_control - - \ No newline at end of file