Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
a112df47
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,发现更多精彩内容 >>
提交
a112df47
编写于
1月 29, 2021
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
增加根据job获取工作附件列表的接口
上级
52cf078f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
185 addition
and
0 deletion
+185
-0
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/factory/content/JobFactory.java
...platform/assemble/surface/factory/content/JobFactory.java
+17
-0
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionListWithJob.java
.../assemble/surface/jaxrs/attachment/ActionListWithJob.java
+132
-0
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/AttachmentAction.java
...m/assemble/surface/jaxrs/attachment/AttachmentAction.java
+19
-0
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/BaseAction.java
...latform/assemble/surface/jaxrs/attachment/BaseAction.java
+17
-0
未找到文件。
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/factory/content/JobFactory.java
浏览文件 @
a112df47
...
...
@@ -2,6 +2,7 @@ package com.x.processplatform.assemble.surface.factory.content;
import
java.util.List
;
import
com.x.base.core.entity.JpaObject
;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.processplatform.assemble.surface.AbstractFactory
;
import
com.x.processplatform.assemble.surface.Business
;
...
...
@@ -63,4 +64,20 @@ public class JobFactory extends AbstractFactory {
return
false
;
}
}
public
String
findAWorkOrWorkCompleted
(
String
job
)
throws
Exception
{
String
id
=
""
;
List
<
Work
>
ws
=
this
.
entityManagerContainer
().
fetchEqualAscPaging
(
Work
.
class
,
ListTools
.
toList
(
Work
.
id_FIELDNAME
),
Work
.
job_FIELDNAME
,
job
,
1
,
1
,
JpaObject
.
sequence_FIELDNAME
);
if
(
ListTools
.
isNotEmpty
(
ws
))
{
id
=
ws
.
get
(
0
).
getId
();
}
else
{
List
<
WorkCompleted
>
wcs
=
this
.
entityManagerContainer
().
fetchEqualAscPaging
(
WorkCompleted
.
class
,
ListTools
.
toList
(
WorkCompleted
.
id_FIELDNAME
),
WorkCompleted
.
job_FIELDNAME
,
job
,
1
,
1
,
JpaObject
.
sequence_FIELDNAME
);
if
(
ListTools
.
isNotEmpty
(
wcs
))
{
id
=
wcs
.
get
(
0
).
getId
();
}
}
return
id
;
}
}
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionListWithJob.java
0 → 100644
浏览文件 @
a112df47
package
com.x.processplatform.assemble.surface.jaxrs.attachment
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.JpaObject
;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
com.x.base.core.project.bean.WrapCopier
;
import
com.x.base.core.project.bean.WrapCopierFactory
;
import
com.x.base.core.project.exception.ExceptionAccessDenied
;
import
com.x.base.core.project.gson.GsonPropertyObject
;
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.processplatform.assemble.surface.Business
;
import
com.x.processplatform.core.entity.content.Attachment
;
import
org.apache.commons.lang3.BooleanUtils
;
import
java.util.ArrayList
;
import
java.util.Comparator
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.concurrent.CompletableFuture
;
import
java.util.concurrent.TimeUnit
;
import
java.util.stream.Collectors
;
class
ActionListWithJob
extends
BaseAction
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ActionListWithJob
.
class
);
ActionResult
<
List
<
Wo
>>
execute
(
EffectivePerson
effectivePerson
,
String
job
)
throws
Exception
{
ActionResult
<
List
<
Wo
>>
result
=
new
ActionResult
<>();
CompletableFuture
<
List
<
Wo
>>
listFuture
=
listFuture
(
effectivePerson
,
job
);
CompletableFuture
<
Boolean
>
checkControlFuture
=
checkJobControlFuture
(
effectivePerson
,
job
);
result
.
setData
(
listFuture
.
get
(
10
,
TimeUnit
.
SECONDS
));
if
(
BooleanUtils
.
isFalse
(
checkControlFuture
.
get
(
10
,
TimeUnit
.
SECONDS
)))
{
throw
new
ExceptionAccessDenied
(
effectivePerson
,
job
);
}
return
result
;
}
private
CompletableFuture
<
List
<
Wo
>>
listFuture
(
EffectivePerson
effectivePerson
,
String
flag
)
{
return
CompletableFuture
.
supplyAsync
(()
->
{
List
<
Wo
>
wos
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Business
business
=
new
Business
(
emc
);
List
<
String
>
identities
=
business
.
organization
().
identity
().
listWithPerson
(
effectivePerson
);
List
<
String
>
units
=
business
.
organization
().
unit
().
listWithPerson
(
effectivePerson
);
final
String
job
=
flag
;
for
(
Attachment
attachment
:
business
.
entityManagerContainer
().
listEqual
(
Attachment
.
class
,
Attachment
.
job_FIELDNAME
,
job
))
{
Wo
wo
=
Wo
.
copier
.
copy
(
attachment
);
boolean
canControl
=
this
.
control
(
attachment
,
effectivePerson
,
identities
,
units
,
business
);
boolean
canEdit
=
this
.
edit
(
attachment
,
effectivePerson
,
identities
,
units
,
business
);
boolean
canRead
=
this
.
read
(
attachment
,
effectivePerson
,
identities
,
units
,
business
);
if
(
canRead
)
{
wo
.
getControl
().
setAllowRead
(
true
);
wo
.
getControl
().
setAllowEdit
(
canEdit
);
wo
.
getControl
().
setAllowControl
(
canControl
);
wos
.
add
(
wo
);
}
}
wos
=
wos
.
stream
()
.
sorted
(
Comparator
.
comparing
(
Wo:
:
getOrderNumber
,
Comparator
.
nullsLast
(
Integer:
:
compareTo
))
.
thenComparing
(
Comparator
.
comparing
(
Wo:
:
getCreateTime
,
Comparator
.
nullsLast
(
Date:
:
compareTo
))))
.
collect
(
Collectors
.
toList
());
}
catch
(
Exception
e
)
{
logger
.
error
(
e
);
}
return
wos
;
});
}
public
static
class
Wo
extends
Attachment
{
private
static
final
long
serialVersionUID
=
-
7666329770246726197L
;
static
WrapCopier
<
Attachment
,
Wo
>
copier
=
WrapCopierFactory
.
wo
(
Attachment
.
class
,
Wo
.
class
,
null
,
JpaObject
.
FieldsInvisible
);
private
WoControl
control
=
new
WoControl
();
public
WoControl
getControl
()
{
return
control
;
}
public
void
setControl
(
WoControl
control
)
{
this
.
control
=
control
;
}
}
public
static
class
WoControl
extends
GsonPropertyObject
{
private
static
final
long
serialVersionUID
=
-
7283783148043076205L
;
@FieldDescribe
(
"可读"
)
private
Boolean
allowRead
=
false
;
@FieldDescribe
(
"可写"
)
private
Boolean
allowEdit
=
false
;
@FieldDescribe
(
"可控制"
)
private
Boolean
allowControl
=
false
;
public
Boolean
getAllowRead
()
{
return
allowRead
;
}
public
void
setAllowRead
(
Boolean
allowRead
)
{
this
.
allowRead
=
allowRead
;
}
public
Boolean
getAllowEdit
()
{
return
allowEdit
;
}
public
void
setAllowEdit
(
Boolean
allowEdit
)
{
this
.
allowEdit
=
allowEdit
;
}
public
Boolean
getAllowControl
()
{
return
allowControl
;
}
public
void
setAllowControl
(
Boolean
allowControl
)
{
this
.
allowControl
=
allowControl
;
}
}
}
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/AttachmentAction.java
浏览文件 @
a112df47
...
...
@@ -173,6 +173,25 @@ public class AttachmentAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"根据工作的job获取Attachment列表."
,
action
=
ActionListWithJob
.
class
)
@GET
@Path
(
"list/job/{job}"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
listWithJob
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作的job"
)
@PathParam
(
"job"
)
String
job
)
{
ActionResult
<
List
<
ActionListWithJob
.
Wo
>>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionListWithJob
().
execute
(
effectivePerson
,
job
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"删除指定work下的附件."
,
action
=
ActionDeleteWithWork
.
class
)
@DELETE
@Path
(
"{id}/work/{workId}"
)
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/BaseAction.java
浏览文件 @
a112df47
...
...
@@ -235,6 +235,23 @@ abstract class BaseAction extends StandardJaxrsAction {
return
value
;
}
protected
CompletableFuture
<
Boolean
>
checkJobControlFuture
(
EffectivePerson
effectivePerson
,
String
job
)
{
return
CompletableFuture
.
supplyAsync
(()
->
{
Boolean
value
=
false
;
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Business
business
=
new
Business
(
emc
);
String
flag
=
business
.
job
().
findAWorkOrWorkCompleted
(
job
);
if
(
StringUtils
.
isNotEmpty
(
flag
)){
value
=
business
.
readableWithWorkOrWorkCompleted
(
effectivePerson
,
flag
,
new
ExceptionEntityNotExist
(
job
));
}
}
catch
(
Exception
e
)
{
logger
.
error
(
e
);
}
return
value
;
});
}
protected
CompletableFuture
<
Boolean
>
checkControlFuture
(
EffectivePerson
effectivePerson
,
String
flag
)
{
return
CompletableFuture
.
supplyAsync
(()
->
{
Boolean
value
=
false
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录