Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
此号慢热型
o2oa
提交
da010299
o2oa
项目概览
此号慢热型
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
5
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,体验更适合开发者的 AI 搜索 >>
提交
da010299
编写于
5月 21, 2020
作者:
L
luojing
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
人员组织导入导出服务
上级
c86de453
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
123 addition
and
26 deletion
+123
-26
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/global/ActionProjectConfigGetByProject.java
...control/jaxrs/global/ActionProjectConfigGetByProject.java
+16
-13
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/global/GlobalAction.java
.../teamwork/assemble/control/jaxrs/global/GlobalAction.java
+1
-1
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionGet.java
.../x/teamwork/assemble/control/jaxrs/project/ActionGet.java
+21
-7
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/BaseAction.java
...x/teamwork/assemble/control/jaxrs/project/BaseAction.java
+3
-0
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/WrapOutControl.java
...amwork/assemble/control/jaxrs/project/WrapOutControl.java
+82
-5
未找到文件。
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/global/ActionProjectConfigGetByProject.java
浏览文件 @
da010299
...
...
@@ -10,46 +10,43 @@ import org.apache.commons.lang3.StringUtils;
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.teamwork.core.entity.Priority
;
import
com.x.teamwork.core.entity.ProjectConfig
;
import
com.x.teamwork.core.entity.ProjectGroup
;
import
net.sf.ehcache.Element
;
public
class
ActionProjectConfigGetByProject
extends
BaseAction
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ActionProjectConfigGetByProject
.
class
);
protected
ActionResult
<
Wo
>
execute
(
HttpServletRequest
request
,
EffectivePerson
effectivePerson
,
String
id
)
throws
Exception
{
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
Wo
wo
=
null
;
ProjectConfig
projectConfig
=
null
;
protected
ActionResult
<
List
<
Wo
>>
execute
(
HttpServletRequest
request
,
EffectivePerson
effectivePerson
,
String
id
)
throws
Exception
{
ActionResult
<
List
<
Wo
>>
result
=
new
ActionResult
<
List
<
Wo
>>();
List
<
Wo
>
wo
=
null
;
List
<
ProjectConfig
>
projectConfigs
=
null
;
Boolean
check
=
true
;
if
(
StringUtils
.
isEmpty
(
id
)
)
{
check
=
false
;
Exception
exception
=
new
Pr
iority
FlagForQueryEmptyException
();
Exception
exception
=
new
Pr
ojectConfig
FlagForQueryEmptyException
();
result
.
error
(
exception
);
}
if
(
Boolean
.
TRUE
.
equals
(
check
)
){
try
{
projectConfigs
=
projectConfigQueryService
.
getProjectConfigByProject
(
id
);
if
(
ListTools
.
isNotEmpty
(
projectConfigs
)){
/*
if(ListTools.isNotEmpty(projectConfigs)){
projectConfig = projectConfigs.get(0);
}
if ( projectConfig == null) {
check = false;
Exception exception = new ProjectConfigNotExistsException( id );
result.error( exception );
}
}
*/
}
catch
(
Exception
e
)
{
check
=
false
;
Exception
exception
=
new
ProjectConfigQueryException
(
e
,
"根据指定flag查询项目配置信息对象时发生异常。id:"
+
id
);
...
...
@@ -60,8 +57,14 @@ public class ActionProjectConfigGetByProject extends BaseAction {
if
(
Boolean
.
TRUE
.
equals
(
check
)
){
try
{
wo
=
Wo
.
copier
.
copy
(
projectConfig
);
result
.
setData
(
wo
);
if
(
ListTools
.
isEmpty
(
projectConfigs
)){
wo
=
new
ArrayList
<
Wo
>();
result
.
setData
(
wo
);
}
else
{
wo
=
Wo
.
copier
.
copy
(
projectConfigs
);
result
.
setData
(
wo
);
}
}
catch
(
Exception
e
)
{
Exception
exception
=
new
ProjectConfigQueryException
(
e
,
"将查询出来的项目配置信息对象转换为可输出的数据信息时发生异常。"
);
result
.
error
(
exception
);
...
...
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/global/GlobalAction.java
浏览文件 @
da010299
...
...
@@ -213,7 +213,7 @@ public class GlobalAction extends StandardJaxrsAction {
public
void
projectConfigGetByProject
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"项目ID"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
ActionProjectConfigGetByProject
.
Wo
>
result
=
new
ActionResult
<>();
ActionResult
<
List
<
ActionProjectConfigGetByProject
.
Wo
>
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionProjectConfigGetByProject
().
execute
(
request
,
effectivePerson
,
id
);
...
...
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionGet.java
浏览文件 @
da010299
...
...
@@ -20,6 +20,7 @@ import com.x.base.core.project.logger.LoggerFactory;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.teamwork.assemble.control.Business
;
import
com.x.teamwork.core.entity.Project
;
import
com.x.teamwork.core.entity.ProjectConfig
;
import
com.x.teamwork.core.entity.ProjectDetail
;
import
com.x.teamwork.core.entity.ProjectGroup
;
import
com.x.teamwork.core.entity.Task
;
...
...
@@ -37,6 +38,7 @@ public class ActionGet extends BaseAction {
List
<
String
>
groupIds
=
null
;
List
<
ProjectGroup
>
groups
=
null
;
List
<
Task
>
taskList
=
null
;
List
<
ProjectConfig
>
projectConfigs
=
null
;
WrapOutControl
control
=
null
;
Boolean
check
=
true
;
...
...
@@ -110,32 +112,44 @@ public class ActionGet extends BaseAction {
groups
=
projectGroupQueryService
.
list
(
groupIds
);
wo
.
setGroups
(
groups
);
//查询项目配置信息
projectConfigs
=
projectConfigQueryService
.
getProjectConfigByProject
(
project
.
getId
()
);
Business
business
=
null
;
try
(
EntityManagerContainer
bc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
business
=
new
Business
(
bc
);
}
control
=
new
WrapOutControl
();
if
(
ListTools
.
isNotEmpty
(
projectConfigs
)){
ProjectConfig
projectConfig
=
projectConfigs
.
get
(
0
);
control
.
setTaskCreate
(
projectConfig
.
getTaskCreate
());
control
.
setTaskCopy
(
projectConfig
.
getTaskCopy
());
control
.
setTaskRemove
(
projectConfig
.
getTaskRemove
());
control
.
setLaneCreate
(
projectConfig
.
getLaneCreate
());
control
.
setLaneEdit
(
projectConfig
.
getLaneEdit
());
control
.
setLaneRemove
(
projectConfig
.
getLaneRemove
());
control
.
setAttachmentUpload
(
projectConfig
.
getAttachmentUpload
());
control
.
setComment
(
projectConfig
.
getComment
());
}
else
{
control
.
setTaskCreate
(
true
);
}
if
(
business
.
isManager
(
effectivePerson
)
||
effectivePerson
.
getDistinguishedName
().
equalsIgnoreCase
(
project
.
getCreatorPerson
()
)
||
project
.
getManageablePersonList
().
contains
(
effectivePerson
.
getDistinguishedName
()
))
{
control
.
setDelete
(
true
);
control
.
setEdit
(
true
);
control
.
setSortable
(
true
);
control
.
set
Createabl
e
(
true
);
control
.
set
TaskCreat
e
(
true
);
}
else
{
control
.
setDelete
(
false
);
control
.
setEdit
(
false
);
control
.
setSortable
(
false
);
if
(
project
.
getCreateable
()){
control
.
setCreateable
(
true
);
}
else
{
control
.
setCreateable
(
false
);
}
}
if
(
project
.
getDeleted
()
||
project
.
getCompleted
()){
control
.
set
Createabl
e
(
false
);
control
.
set
TaskCreat
e
(
false
);
}
if
(
effectivePerson
.
getDistinguishedName
().
equalsIgnoreCase
(
project
.
getCreatorPerson
())){
control
.
setFounder
(
true
);
...
...
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/BaseAction.java
浏览文件 @
da010299
...
...
@@ -3,6 +3,7 @@ package com.x.teamwork.assemble.control.jaxrs.project;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.jaxrs.StandardJaxrsAction
;
import
com.x.teamwork.assemble.control.service.DynamicPersistService
;
import
com.x.teamwork.assemble.control.service.ProjectConfigQueryService
;
import
com.x.teamwork.assemble.control.service.ProjectGroupPersistService
;
import
com.x.teamwork.assemble.control.service.ProjectGroupQueryService
;
import
com.x.teamwork.assemble.control.service.ProjectPersistService
;
...
...
@@ -29,4 +30,6 @@ public class BaseAction extends StandardJaxrsAction {
protected
SystemConfigQueryService
systemConfigQueryService
=
new
SystemConfigQueryService
();
protected
ProjectConfigQueryService
projectConfigQueryService
=
new
ProjectConfigQueryService
();
}
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/WrapOutControl.java
浏览文件 @
da010299
...
...
@@ -16,8 +16,30 @@ public class WrapOutControl {
@FieldDescribe
(
"是否创始人"
)
private
Boolean
founder
=
false
;
@FieldDescribe
(
"是否可新建任务"
)
private
Boolean
createable
=
true
;
private
Boolean
taskCreate
=
true
;
@FieldDescribe
(
"是否可复制任务"
)
private
Boolean
taskCopy
=
true
;
@FieldDescribe
(
"是否可删除任务"
)
private
Boolean
taskRemove
=
true
;
@FieldDescribe
(
"是否可新建泳道"
)
private
Boolean
laneCreate
=
true
;
@FieldDescribe
(
"是否可编辑泳道"
)
private
Boolean
laneEdit
=
true
;
@FieldDescribe
(
"是否可删除泳道"
)
private
Boolean
laneRemove
=
true
;
@FieldDescribe
(
"是否上传附件"
)
private
Boolean
attachmentUpload
=
true
;
@FieldDescribe
(
"是否允许评论"
)
private
Boolean
comment
=
true
;
public
Boolean
getDelete
()
{
return
delete
;
...
...
@@ -51,12 +73,67 @@ public class WrapOutControl {
this
.
founder
=
founder
;
}
public
Boolean
getCreateable
()
{
return
createable
;
public
Boolean
getTaskCreate
()
{
return
taskCreate
;
}
public
void
setTaskCreate
(
Boolean
taskCreate
)
{
this
.
taskCreate
=
taskCreate
;
}
public
Boolean
getTaskCopy
()
{
return
taskCopy
;
}
public
void
set
Createable
(
Boolean
createable
)
{
this
.
createable
=
createable
;
public
void
set
TaskCopy
(
Boolean
taskCopy
)
{
this
.
taskCopy
=
taskCopy
;
}
public
Boolean
getTaskRemove
()
{
return
taskRemove
;
}
public
void
setTaskRemove
(
Boolean
taskRemove
)
{
this
.
taskRemove
=
taskRemove
;
}
public
Boolean
getLaneCreate
()
{
return
laneCreate
;
}
public
void
setLaneCreate
(
Boolean
laneCreate
)
{
this
.
laneCreate
=
laneCreate
;
}
public
Boolean
getLaneEdit
()
{
return
laneEdit
;
}
public
void
setLaneEdit
(
Boolean
laneEdit
)
{
this
.
laneEdit
=
laneEdit
;
}
public
Boolean
getLaneRemove
()
{
return
laneRemove
;
}
public
void
setLaneRemove
(
Boolean
laneRemove
)
{
this
.
laneRemove
=
laneRemove
;
}
public
Boolean
getAttachmentUpload
()
{
return
attachmentUpload
;
}
public
void
setAttachmentUpload
(
Boolean
attachmentUpload
)
{
this
.
attachmentUpload
=
attachmentUpload
;
}
public
Boolean
getComment
()
{
return
comment
;
}
public
void
setComment
(
Boolean
comment
)
{
this
.
comment
=
comment
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录