Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
038f8a7c
o2oa
项目概览
fuyue82
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
038f8a7c
编写于
2月 22, 2019
作者:
R
roo00
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
删除工作汇报和战略目标管理的实体对象
上级
0ff23f5e
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
25 addition
and
90 deletion
+25
-90
o2server/x_component_assemble_control/src/main/java/com/x/component/assemble/control/jaxrs/component/ActionBase.java
...omponent/assemble/control/jaxrs/component/ActionBase.java
+4
-4
o2server/x_component_assemble_control/src/main/java/com/x/component/assemble/control/jaxrs/component/ActionListAll.java
...onent/assemble/control/jaxrs/component/ActionListAll.java
+21
-14
o2server/x_console/pom.xml
o2server/x_console/pom.xml
+0
-4
o2server/x_console/src/main/java/com/x/server/console/action/ActionEraseContentReport.java
...com/x/server/console/action/ActionEraseContentReport.java
+0
-58
o2server/x_console/src/test/resources/x_component_assemble_control.xml
...nsole/src/test/resources/x_component_assemble_control.xml
+0
-10
未找到文件。
o2server/x_component_assemble_control/src/main/java/com/x/component/assemble/control/jaxrs/component/ActionBase.java
浏览文件 @
038f8a7c
...
...
@@ -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
浏览文件 @
038f8a7c
...
...
@@ -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
浏览文件 @
038f8a7c
...
...
@@ -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
已删除
100644 → 0
浏览文件 @
0ff23f5e
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
o2server/x_console/src/test/resources/x_component_assemble_control.xml
已删除
100644 → 0
浏览文件 @
0ff23f5e
<?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>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录