Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
41e22566
o2oa
项目概览
ghsby
/
o2oa
落后 Fork 源项目 2880 个版本
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
1
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,发现更多精彩内容 >>
提交
41e22566
编写于
10月 27, 2020
作者:
Z
zhourui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mock
上级
40ce7cfe
变更
31
展开全部
显示空白变更内容
内联
并排
Showing
31 changed file
with
1580 addition
and
185 deletion
+1580
-185
o2server/configSample/node_127.0.0.1.json
o2server/configSample/node_127.0.0.1.json
+3
-3
o2server/configSample/web.json
o2server/configSample/web.json
+4
-0
o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CreateConfigSample.java
...ava/com/x/base/core/project/build/CreateConfigSample.java
+2
-0
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java
.../src/main/java/com/x/base/core/project/config/Config.java
+26
-0
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Web.java
...ect/src/main/java/com/x/base/core/project/config/Web.java
+31
-0
o2server/x_base_core_project/src/main/java/com/x/base/core/project/http/FilterTools.java
...c/main/java/com/x/base/core/project/http/FilterTools.java
+1
-1
o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java
.../java/com/x/server/console/server/web/WebServerTools.java
+13
-12
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/Business.java
...java/com/x/processplatform/assemble/surface/Business.java
+14
-12
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/applicationdict/ApplicationDictAction.java
.../surface/jaxrs/applicationdict/ApplicationDictAction.java
+405
-21
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionListWithWorkOrWorkCompleted.java
...e/jaxrs/attachment/ActionListWithWorkOrWorkCompleted.java
+36
-23
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/AttachmentAction.java
...m/assemble/surface/jaxrs/attachment/AttachmentAction.java
+153
-1
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/draft/DraftAction.java
...essplatform/assemble/surface/jaxrs/draft/DraftAction.java
+36
-1
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/keylock/KeyLockAction.java
...latform/assemble/surface/jaxrs/keylock/KeyLockAction.java
+19
-0
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/process/ActionGet.java
...essplatform/assemble/surface/jaxrs/process/ActionGet.java
+0
-17
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/read/ReadAction.java
...ocessplatform/assemble/surface/jaxrs/read/ReadAction.java
+98
-5
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/ReadCompletedAction.java
...mble/surface/jaxrs/readcompleted/ReadCompletedAction.java
+39
-2
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/record/RecordAction.java
...splatform/assemble/surface/jaxrs/record/RecordAction.java
+37
-0
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/review/ReviewAction.java
...splatform/assemble/surface/jaxrs/review/ReviewAction.java
+21
-2
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/route/RouteAction.java
...essplatform/assemble/surface/jaxrs/route/RouteAction.java
+19
-0
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/serialnumber/SerialNumberAction.java
...semble/surface/jaxrs/serialnumber/SerialNumberAction.java
+37
-0
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/service/ServiceAction.java
...latform/assemble/surface/jaxrs/service/ServiceAction.java
+22
-3
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionTypeAbandoned.java
...form/assemble/surface/jaxrs/snap/ActionTypeAbandoned.java
+7
-7
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/SnapAction.java
...ocessplatform/assemble/surface/jaxrs/snap/SnapAction.java
+18
-0
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/TaskAction.java
...ocessplatform/assemble/surface/jaxrs/task/TaskAction.java
+135
-5
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/taskcompleted/TaskCompletedAction.java
...mble/surface/jaxrs/taskcompleted/TaskCompletedAction.java
+40
-2
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCloseCheck.java
...latform/assemble/surface/jaxrs/work/ActionCloseCheck.java
+0
-33
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/WorkAction.java
...ocessplatform/assemble/surface/jaxrs/work/WorkAction.java
+242
-10
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/workcompleted/WorkCompletedAction.java
...mble/surface/jaxrs/workcompleted/WorkCompletedAction.java
+39
-25
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/test/ActionTest5.java
...ssplatform/service/processing/jaxrs/test/ActionTest5.java
+23
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/test/ActionTest52.java
...splatform/service/processing/jaxrs/test/ActionTest52.java
+23
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/test/TestAction.java
...essplatform/service/processing/jaxrs/test/TestAction.java
+37
-0
未找到文件。
o2server/configSample/node_127.0.0.1.json
浏览文件 @
41e22566
...
@@ -135,12 +135,12 @@
...
@@ -135,12 +135,12 @@
},
},
"logLevel"
:
"warn"
,
"logLevel"
:
"warn"
,
"dumpData"
:
{
"dumpData"
:
{
"enable"
:
tru
e
,
"enable"
:
fals
e
,
"cron"
:
""
,
"cron"
:
""
,
"size"
:
7.0
,
"size"
:
7.0
,
"path"
:
""
,
"path"
:
""
,
"###enable"
:
"是否启用,默认
每天凌晨2点进行备份
.###"
,
"###enable"
:
"是否启用,默认
禁用
.###"
,
"###cron"
:
"定时任务cron表达式###"
,
"###cron"
:
"定时任务cron表达式
,默认每天凌晨2点进行备份.
###"
,
"###size"
:
"最大保留份数,超过将自动删除最久的数据.###"
,
"###size"
:
"最大保留份数,超过将自动删除最久的数据.###"
,
"###path"
:
"备份路径###"
"###path"
:
"备份路径###"
},
},
...
...
o2server/configSample/web.json
0 → 100644
浏览文件 @
41e22566
{
"mocks"
:
[],
"###mocks"
:
"使用Post模拟Put,Get模拟Delete的模块.###"
}
\ No newline at end of file
o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CreateConfigSample.java
浏览文件 @
41e22566
...
@@ -40,6 +40,7 @@ import com.x.base.core.project.config.Qiyeweixin;
...
@@ -40,6 +40,7 @@ import com.x.base.core.project.config.Qiyeweixin;
import
com.x.base.core.project.config.Query
;
import
com.x.base.core.project.config.Query
;
import
com.x.base.core.project.config.Token
;
import
com.x.base.core.project.config.Token
;
import
com.x.base.core.project.config.Vfs
;
import
com.x.base.core.project.config.Vfs
;
import
com.x.base.core.project.config.Web
;
import
com.x.base.core.project.config.WorkTime
;
import
com.x.base.core.project.config.WorkTime
;
import
com.x.base.core.project.config.ZhengwuDingding
;
import
com.x.base.core.project.config.ZhengwuDingding
;
import
com.x.base.core.project.gson.XGsonBuilder
;
import
com.x.base.core.project.gson.XGsonBuilder
;
...
@@ -80,6 +81,7 @@ public class CreateConfigSample {
...
@@ -80,6 +81,7 @@ public class CreateConfigSample {
classes
.
add
(
WorkTime
.
class
);
classes
.
add
(
WorkTime
.
class
);
classes
.
add
(
ZhengwuDingding
.
class
);
classes
.
add
(
ZhengwuDingding
.
class
);
classes
.
add
(
Cache
.
class
);
classes
.
add
(
Cache
.
class
);
classes
.
add
(
Web
.
class
);
Collections
.
sort
(
classes
,
new
Comparator
<
Class
<?>>()
{
Collections
.
sort
(
classes
,
new
Comparator
<
Class
<?>>()
{
public
int
compare
(
Class
<?>
c1
,
Class
<?>
c2
)
{
public
int
compare
(
Class
<?>
c1
,
Class
<?>
c2
)
{
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java
浏览文件 @
41e22566
...
@@ -3,6 +3,9 @@ package com.x.base.core.project.config;
...
@@ -3,6 +3,9 @@ package com.x.base.core.project.config;
import
java.io.File
;
import
java.io.File
;
import
java.io.FileFilter
;
import
java.io.FileFilter
;
import
java.net.URLEncoder
;
import
java.net.URLEncoder
;
import
java.nio.file.Files
;
import
java.nio.file.Path
;
import
java.nio.file.Paths
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
@@ -79,6 +82,7 @@ public class Config {
...
@@ -79,6 +82,7 @@ public class Config {
public
static
final
String
PATH_CONFIG_CACHE
=
"config/cache.json"
;
public
static
final
String
PATH_CONFIG_CACHE
=
"config/cache.json"
;
public
static
final
String
PATH_CONFIG_COMPONENTS
=
"config/components.json"
;
public
static
final
String
PATH_CONFIG_COMPONENTS
=
"config/components.json"
;
public
static
final
String
PATH_CONFIG_EMAIL
=
"config/email.json"
;
public
static
final
String
PATH_CONFIG_EMAIL
=
"config/email.json"
;
public
static
final
String
PATH_CONFIG_WEB
=
"config/web.json"
;
public
static
final
String
DIR_COMMONS
=
"commons"
;
public
static
final
String
DIR_COMMONS
=
"commons"
;
public
static
final
String
DIR_COMMONS_TESS4J_TESSDATA
=
"commons/tess4j/tessdata"
;
public
static
final
String
DIR_COMMONS_TESS4J_TESSDATA
=
"commons/tess4j/tessdata"
;
...
@@ -116,6 +120,7 @@ public class Config {
...
@@ -116,6 +120,7 @@ public class Config {
public
static
final
String
DIR_SERVERS_CENTERSERVER_WEBAPPS
=
"servers/centerServer/webapps"
;
public
static
final
String
DIR_SERVERS_CENTERSERVER_WEBAPPS
=
"servers/centerServer/webapps"
;
public
static
final
String
DIR_SERVERS_CENTERSERVER_WORK
=
"servers/centerServer/work"
;
public
static
final
String
DIR_SERVERS_CENTERSERVER_WORK
=
"servers/centerServer/work"
;
public
static
final
String
DIR_SERVERS_WEBSERVER
=
"servers/webServer"
;
public
static
final
String
DIR_SERVERS_WEBSERVER
=
"servers/webServer"
;
public
static
final
String
DIR_SERVERS_WEBSERVER_X_DESKTOP_RES_CONFIG
=
"servers/webServer/x_desktop/res/config"
;
public
static
final
String
DIR_STORE
=
"store"
;
public
static
final
String
DIR_STORE
=
"store"
;
public
static
final
String
DIR_STORE_JARS
=
"store/jars"
;
public
static
final
String
DIR_STORE_JARS
=
"store/jars"
;
...
@@ -457,6 +462,14 @@ public class Config {
...
@@ -457,6 +462,14 @@ public class Config {
return
dir
;
return
dir
;
}
}
public
static
Path
path_servers_webServer_x_desktop_res_config
(
Boolean
force
)
throws
Exception
{
Path
path
=
Paths
.
get
(
base
(),
DIR_SERVERS_WEBSERVER_X_DESKTOP_RES_CONFIG
);
if
(!
Files
.
exists
(
path
))
{
Files
.
createDirectories
(
path
);
}
return
path
;
}
public
static
synchronized
void
flush
()
{
public
static
synchronized
void
flush
()
{
INSTANCE
=
null
;
INSTANCE
=
null
;
}
}
...
@@ -1136,6 +1149,19 @@ public class Config {
...
@@ -1136,6 +1149,19 @@ public class Config {
return
instance
().
components
;
return
instance
().
components
;
}
}
public
Web
web
;
public
static
synchronized
Web
web
()
throws
Exception
{
if
(
null
==
instance
().
web
)
{
Web
obj
=
BaseTools
.
readConfigObject
(
PATH_CONFIG_WEB
,
Web
.
class
);
if
(
null
==
obj
)
{
obj
=
Web
.
defaultInstance
();
}
instance
().
web
=
obj
;
}
return
instance
().
web
;
}
public
static
Object
resource
(
String
name
)
throws
Exception
{
public
static
Object
resource
(
String
name
)
throws
Exception
{
return
initialContext
().
lookup
(
name
);
return
initialContext
().
lookup
(
name
);
}
}
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Web.java
0 → 100644
浏览文件 @
41e22566
package
com.x.base.core.project.config
;
import
java.util.ArrayList
;
import
java.util.List
;
import
com.x.base.core.project.annotation.FieldDescribe
;
public
class
Web
extends
ConfigObject
{
private
static
final
long
serialVersionUID
=
-
1549522764856326338L
;
public
static
Web
defaultInstance
()
{
return
new
Web
();
}
public
Web
()
{
}
@FieldDescribe
(
"使用Post模拟Put,Get模拟Delete的模块."
)
private
List
<
String
>
mocks
=
new
ArrayList
<>();
public
List
<
String
>
getMocks
()
{
return
mocks
;
}
public
void
setMocks
(
List
<
String
>
mocks
)
{
this
.
mocks
=
mocks
;
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/http/FilterTools.java
浏览文件 @
41e22566
...
@@ -12,7 +12,7 @@ public class FilterTools {
...
@@ -12,7 +12,7 @@ public class FilterTools {
public
static
final
String
Access_Control_Allow_Methods
=
"Access-Control-Allow-Methods"
;
public
static
final
String
Access_Control_Allow_Methods
=
"Access-Control-Allow-Methods"
;
public
static
final
String
Access_Control_Allow_Methods_Value
=
"GET, POST, OPTIONS, PUT, DELETE, HEAD, TRACE"
;
public
static
final
String
Access_Control_Allow_Methods_Value
=
"GET, POST, OPTIONS, PUT, DELETE, HEAD, TRACE"
;
public
static
final
String
Access_Control_Allow_Headers
=
"Access-Control-Allow-Headers"
;
public
static
final
String
Access_Control_Allow_Headers
=
"Access-Control-Allow-Headers"
;
public
static
final
String
Access_Control_Allow_Headers_Value
=
"x-requested-with, x-request, x-token, c-token, Content-Type, Content-Length, x-cipher, x-client, x-debugger, Authorization"
;
public
static
final
String
Access_Control_Allow_Headers_Value
=
"x-requested-with, x-request, x-token, c-token, Content-Type, Content-Length, x-cipher, x-client, x-debugger, Authorization
, P-User-Id, P-Request-Id, P-Page-Id
"
;
public
static
final
String
Access_Control_Allow_Credentials
=
"Access-Control-Allow-Credentials"
;
public
static
final
String
Access_Control_Allow_Credentials
=
"Access-Control-Allow-Credentials"
;
public
static
final
String
Access_Control_Expose_Headers
=
"Access-Control-Expose-Headers"
;
public
static
final
String
Access_Control_Expose_Headers
=
"Access-Control-Expose-Headers"
;
public
static
final
String
Access_Control_Max_Age
=
"Access-Control-Max-Age"
;
public
static
final
String
Access_Control_Max_Age
=
"Access-Control-Max-Age"
;
...
...
o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java
浏览文件 @
41e22566
package
com.x.server.console.server.web
;
package
com.x.server.console.server.web
;
import
java.io.File
;
import
java.io.File
;
import
java.nio.charset.StandardCharsets
;
import
java.nio.file.Files
;
import
java.nio.file.Files
;
import
java.nio.file.Path
;
import
java.nio.file.Path
;
import
java.nio.file.Paths
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.EnumSet
;
import
java.util.EnumSet
;
import
java.util.HashMap
;
import
java.util.HashMap
;
...
@@ -52,21 +54,15 @@ public class WebServerTools extends JettySeverTools {
...
@@ -52,21 +54,15 @@ public class WebServerTools extends JettySeverTools {
public
static
Server
start
(
WebServer
webServer
)
throws
Exception
{
public
static
Server
start
(
WebServer
webServer
)
throws
Exception
{
/
**
/
/ 创建Web.json
* 更新x_desktop的center指向
updateWeb
();
*/
// 更新x_desktop的center指向
updateCenterConfigJson
();
updateCenterConfigJson
();
/**
// 更新 favicon.ico
* 更新 favicon.ico
*/
updateFavicon
();
updateFavicon
();
/**
// 创建index.html
* 创建index.html
*/
createIndexPage
();
createIndexPage
();
/**
// copyDefaultHtml
* copyDefaultHtml
*/
copyDefaultHtml
();
copyDefaultHtml
();
QueuedThreadPool
threadPool
=
new
QueuedThreadPool
();
QueuedThreadPool
threadPool
=
new
QueuedThreadPool
();
...
@@ -161,6 +157,11 @@ public class WebServerTools extends JettySeverTools {
...
@@ -161,6 +157,11 @@ public class WebServerTools extends JettySeverTools {
}
}
}
}
private
static
void
updateWeb
()
throws
Exception
{
Path
path
=
Config
.
path_servers_webServer_x_desktop_res_config
(
true
);
Files
.
write
(
path
.
resolve
(
"web.json"
),
XGsonBuilder
.
toJson
(
Config
.
web
()).
getBytes
(
StandardCharsets
.
UTF_8
));
}
private
static
void
updateFavicon
()
throws
Exception
{
private
static
void
updateFavicon
()
throws
Exception
{
File
file
=
new
File
(
Config
.
dir_config
(),
"favicon.ico"
);
File
file
=
new
File
(
Config
.
dir_config
(),
"favicon.ico"
);
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/Business.java
浏览文件 @
41e22566
...
@@ -1097,16 +1097,16 @@ public class Business {
...
@@ -1097,16 +1097,16 @@ public class Business {
if
(
effectivePerson
.
isPerson
(
creatorPerson
))
{
if
(
effectivePerson
.
isPerson
(
creatorPerson
))
{
return
true
;
return
true
;
}
}
if
(
emc
.
countEqualAndEqual
(
Review
.
class
,
Review
.
person_FIELDNAME
,
effectivePerson
.
getDistinguishedName
(),
Review
.
job_FIELDNAME
,
job
)
==
0
)
{
if
(
emc
.
countEqualAndEqual
(
Task
.
class
,
Task
.
person_FIELDNAME
,
effectivePerson
.
getDistinguishedName
(),
Task
.
job_FIELDNAME
,
job
)
==
0
)
{
if
(
emc
.
countEqualAndEqual
(
Read
.
class
,
Read
.
person_FIELDNAME
,
effectivePerson
.
getDistinguishedName
(),
Read
.
job_FIELDNAME
,
job
)
==
0
)
{
if
(
emc
.
countEqualAndEqual
(
TaskCompleted
.
class
,
TaskCompleted
.
person_FIELDNAME
,
if
(
emc
.
countEqualAndEqual
(
TaskCompleted
.
class
,
TaskCompleted
.
person_FIELDNAME
,
effectivePerson
.
getDistinguishedName
(),
TaskCompleted
.
job_FIELDNAME
,
job
)
==
0
)
{
effectivePerson
.
getDistinguishedName
(),
TaskCompleted
.
job_FIELDNAME
,
job
)
==
0
)
{
if
(
emc
.
countEqualAndEqual
(
ReadCompleted
.
class
,
ReadCompleted
.
person_FIELDNAME
,
if
(
emc
.
countEqualAndEqual
(
ReadCompleted
.
class
,
ReadCompleted
.
person_FIELDNAME
,
effectivePerson
.
getDistinguishedName
(),
ReadCompleted
.
job_FIELDNAME
,
job
)
==
0
)
{
effectivePerson
.
getDistinguishedName
(),
ReadCompleted
.
job_FIELDNAME
,
job
)
==
0
)
{
if
(
emc
.
countEqualAndEqual
(
Task
.
class
,
Task
.
person_FIELDNAME
,
effectivePerson
.
getDistinguishedName
(),
Task
.
job_FIELDNAME
,
job
)
==
0
)
{
if
(
emc
.
countEqualAndEqual
(
Read
.
class
,
Read
.
person_FIELDNAME
,
effectivePerson
.
getDistinguishedName
(),
Read
.
job_FIELDNAME
,
job
)
==
0
)
{
if
(
emc
.
countEqualAndEqual
(
Review
.
class
,
Review
.
person_FIELDNAME
,
effectivePerson
.
getDistinguishedName
(),
Review
.
job_FIELDNAME
,
job
)
==
0
)
{
Application
application
=
application
().
pick
(
applicationId
);
Application
application
=
application
().
pick
(
applicationId
);
Process
process
=
process
().
pick
(
processId
);
Process
process
=
process
().
pick
(
processId
);
if
(!
canManageApplicationOrProcess
(
effectivePerson
,
application
,
process
))
{
if
(!
canManageApplicationOrProcess
(
effectivePerson
,
application
,
process
))
{
...
@@ -1230,7 +1230,8 @@ public class Business {
...
@@ -1230,7 +1230,8 @@ public class Business {
try
(
ZipOutputStream
zos
=
new
ZipOutputStream
(
os
))
{
try
(
ZipOutputStream
zos
=
new
ZipOutputStream
(
os
))
{
for
(
Map
.
Entry
<
String
,
Attachment
>
entry
:
filePathMap
.
entrySet
())
{
for
(
Map
.
Entry
<
String
,
Attachment
>
entry
:
filePathMap
.
entrySet
())
{
zos
.
putNextEntry
(
new
ZipEntry
(
StringUtils
.
replaceEach
(
entry
.
getKey
(),
zos
.
putNextEntry
(
new
ZipEntry
(
StringUtils
.
replaceEach
(
entry
.
getKey
(),
new
String
[]
{
"/"
,
":"
,
"*"
,
"?"
,
"<<"
,
">>"
,
"|"
,
"<"
,
">"
,
"\\"
},
new
String
[]
{
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
})));
new
String
[]
{
"/"
,
":"
,
"*"
,
"?"
,
"<<"
,
">>"
,
"|"
,
"<"
,
">"
,
"\\"
},
new
String
[]
{
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
})));
StorageMapping
mapping
=
ThisApplication
.
context
().
storageMappings
().
get
(
Attachment
.
class
,
StorageMapping
mapping
=
ThisApplication
.
context
().
storageMappings
().
get
(
Attachment
.
class
,
entry
.
getValue
().
getStorage
());
entry
.
getValue
().
getStorage
());
try
(
ByteArrayOutputStream
os1
=
new
ByteArrayOutputStream
())
{
try
(
ByteArrayOutputStream
os1
=
new
ByteArrayOutputStream
())
{
...
@@ -1244,7 +1245,8 @@ public class Business {
...
@@ -1244,7 +1245,8 @@ public class Business {
if
(
otherAttMap
!=
null
)
{
if
(
otherAttMap
!=
null
)
{
for
(
Map
.
Entry
<
String
,
byte
[]>
entry
:
otherAttMap
.
entrySet
())
{
for
(
Map
.
Entry
<
String
,
byte
[]>
entry
:
otherAttMap
.
entrySet
())
{
zos
.
putNextEntry
(
new
ZipEntry
(
StringUtils
.
replaceEach
(
entry
.
getKey
(),
zos
.
putNextEntry
(
new
ZipEntry
(
StringUtils
.
replaceEach
(
entry
.
getKey
(),
new
String
[]
{
"/"
,
":"
,
"*"
,
"?"
,
"<<"
,
">>"
,
"|"
,
"<"
,
">"
,
"\\"
},
new
String
[]
{
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
})));
new
String
[]
{
"/"
,
":"
,
"*"
,
"?"
,
"<<"
,
">>"
,
"|"
,
"<"
,
">"
,
"\\"
},
new
String
[]
{
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
})));
zos
.
write
(
entry
.
getValue
());
zos
.
write
(
entry
.
getValue
());
}
}
}
}
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/applicationdict/ApplicationDictAction.java
浏览文件 @
41e22566
此差异已折叠。
点击以展开。
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionListWithWorkOrWorkCompleted.java
浏览文件 @
41e22566
...
@@ -4,8 +4,11 @@ import java.util.ArrayList;
...
@@ -4,8 +4,11 @@ import java.util.ArrayList;
import
java.util.Comparator
;
import
java.util.Comparator
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.concurrent.CompletableFuture
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
org.apache.commons.lang3.BooleanUtils
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.JpaObject
;
import
com.x.base.core.entity.JpaObject
;
...
@@ -19,6 +22,8 @@ import com.x.base.core.project.http.EffectivePerson;
...
@@ -19,6 +22,8 @@ import com.x.base.core.project.http.EffectivePerson;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.processplatform.assemble.surface.Business
;
import
com.x.processplatform.assemble.surface.Business
;
import
com.x.processplatform.assemble.surface.jaxrs.work.ActionGetWithWorkOrWorkCompleted.WoRead
;
import
com.x.processplatform.assemble.surface.jaxrs.work.ActionGetWithWorkOrWorkCompleted.WoTask
;
import
com.x.processplatform.core.entity.content.Attachment
;
import
com.x.processplatform.core.entity.content.Attachment
;
class
ActionListWithWorkOrWorkCompleted
extends
BaseAction
{
class
ActionListWithWorkOrWorkCompleted
extends
BaseAction
{
...
@@ -31,11 +36,12 @@ class ActionListWithWorkOrWorkCompleted extends BaseAction {
...
@@ -31,11 +36,12 @@ class ActionListWithWorkOrWorkCompleted extends BaseAction {
Business
business
=
new
Business
(
emc
);
Business
business
=
new
Business
(
emc
);
if
(!
business
.
readableWithWorkOrWorkCompleted
(
effectivePerson
,
workOrWorkCompleted
,
CompletableFuture
<
Boolean
>
_control
=
CompletableFuture
.
supplyAsync
(()
->
{
new
ExceptionEntityNotExist
(
workOrWorkCompleted
)))
{
return
business
.
readableWithWorkOrWorkCompleted
(
effectivePerson
,
workOrWorkCompleted
,
throw
new
ExceptionAccessDenied
(
effectivePerson
);
new
ExceptionEntityNotExist
(
workOrWorkCompleted
)
);
}
}
);
CompletableFuture
<
List
<
Wo
>>
_wos
=
CompletableFuture
.
supplyAsync
(()
->
{
List
<
String
>
identities
=
business
.
organization
().
identity
().
listWithPerson
(
effectivePerson
);
List
<
String
>
identities
=
business
.
organization
().
identity
().
listWithPerson
(
effectivePerson
);
List
<
String
>
units
=
business
.
organization
().
unit
().
listWithPerson
(
effectivePerson
);
List
<
String
>
units
=
business
.
organization
().
unit
().
listWithPerson
(
effectivePerson
);
...
@@ -57,11 +63,18 @@ class ActionListWithWorkOrWorkCompleted extends BaseAction {
...
@@ -57,11 +63,18 @@ class ActionListWithWorkOrWorkCompleted extends BaseAction {
}
}
}
}
wos
=
wos
.
stream
().
sorted
(
Comparator
.
comparing
(
Wo:
:
getOrderNumber
,
Comparator
.
nullsLast
(
Integer:
:
compareTo
))
wos
=
wos
.
stream
()
.
thenComparing
(
Comparator
.
comparing
(
Wo:
:
getCreateTime
,
Comparator
.
nullsLast
(
Date:
:
compareTo
))))
.
sorted
(
Comparator
.
comparing
(
Wo:
:
getOrderNumber
,
Comparator
.
nullsLast
(
Integer:
:
compareTo
))
.
thenComparing
(
Comparator
.
comparing
(
Wo:
:
getCreateTime
,
Comparator
.
nullsLast
(
Date:
:
compareTo
))))
.
collect
(
Collectors
.
toList
());
.
collect
(
Collectors
.
toList
());
return
wos
;
});
result
.
setData
(
wos
);
if
(
BooleanUtils
.
isFalse
(
_control
.
get
()))
{
throw
new
ExceptionAccessDenied
(
effectivePerson
,
workOrWorkCompleted
);
}
result
.
setData
(
_wos
.
get
());
return
result
;
return
result
;
}
}
}
}
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/AttachmentAction.java
浏览文件 @
41e22566
...
@@ -192,6 +192,25 @@ public class AttachmentAction extends StandardJaxrsAction {
...
@@ -192,6 +192,25 @@ public class AttachmentAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete."
,
action
=
ActionDeleteWithWork
.
class
)
@GET
@Path
(
"{id}/work/{workId}/mockget2delete"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
deleteWithWorkMockGet2Delete
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"附件标识"
)
@PathParam
(
"id"
)
String
id
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"workId"
)
String
workId
)
{
ActionResult
<
ActionDeleteWithWork
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionDeleteWithWork
().
execute
(
effectivePerson
,
id
,
workId
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"删除指定workCompleted下的附件. "
,
action
=
ActionDeleteWithWorkCompleted
.
class
)
@JaxrsMethodDescribe
(
value
=
"删除指定workCompleted下的附件. "
,
action
=
ActionDeleteWithWorkCompleted
.
class
)
@DELETE
@DELETE
@Path
(
"{id}/workcompleted/{workCompletedId}"
)
@Path
(
"{id}/workcompleted/{workCompletedId}"
)
...
@@ -211,6 +230,25 @@ public class AttachmentAction extends StandardJaxrsAction {
...
@@ -211,6 +230,25 @@ public class AttachmentAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete."
,
action
=
ActionDeleteWithWorkCompleted
.
class
)
@GET
@Path
(
"{id}/workcompleted/{workCompletedId}/mockget2delete"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
deleteWithWorkCompletedMockGet2Delete
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"附件标识"
)
@PathParam
(
"id"
)
String
id
,
@JaxrsParameterDescribe
(
"已完成工作标识"
)
@PathParam
(
"workCompletedId"
)
String
workCompletedId
)
{
ActionResult
<
ActionDeleteWithWorkCompleted
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionDeleteWithWorkCompleted
().
execute
(
effectivePerson
,
id
,
workCompletedId
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"根据Work下载附件"
,
action
=
ActionDownloadWithWork
.
class
)
@JaxrsMethodDescribe
(
value
=
"根据Work下载附件"
,
action
=
ActionDownloadWithWork
.
class
)
@GET
@GET
@Path
(
"download/{id}/work/{workId}"
)
@Path
(
"download/{id}/work/{workId}"
)
...
@@ -501,6 +539,42 @@ public class AttachmentAction extends StandardJaxrsAction {
...
@@ -501,6 +539,42 @@ public class AttachmentAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete."
,
action
=
ActionUpdate
.
class
)
@POST
@Path
(
"update/{id}/work/{workId}/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
MULTIPART_FORM_DATA
)
public
void
updateMockPost2Put
(
FormDataMultiPart
form
,
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"附件标识"
)
@PathParam
(
"id"
)
String
id
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"workId"
)
String
workId
,
@JaxrsParameterDescribe
(
"附件名称"
)
@FormDataParam
(
FILENAME_FIELD
)
String
fileName
,
@JaxrsParameterDescribe
(
"天印扩展字段"
)
@FormDataParam
(
"extraParam"
)
String
extraParam
,
@FormDataParam
(
FILE_FIELD
)
byte
[]
bytes
,
@JaxrsParameterDescribe
(
"附件"
)
@FormDataParam
(
FILE_FIELD
)
final
FormDataContentDisposition
disposition
)
{
ActionResult
<
ActionUpdate
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
if
(
StringUtils
.
isEmpty
(
extraParam
))
{
extraParam
=
this
.
request2Json
(
request
);
}
if
(
bytes
==
null
)
{
Map
<
String
,
List
<
FormDataBodyPart
>>
map
=
form
.
getFields
();
for
(
String
key
:
map
.
keySet
())
{
FormDataBodyPart
part
=
map
.
get
(
key
).
get
(
0
);
if
(
"application"
.
equals
(
part
.
getMediaType
().
getType
()))
{
bytes
=
part
.
getValueAs
(
byte
[].
class
);
break
;
}
}
}
result
=
new
ActionUpdate
().
execute
(
effectivePerson
,
id
,
workId
,
fileName
,
bytes
,
disposition
,
extraParam
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"更新Attachment信息"
,
action
=
ActionUpdateContent
.
class
)
@JaxrsMethodDescribe
(
value
=
"更新Attachment信息"
,
action
=
ActionUpdateContent
.
class
)
@PUT
@PUT
@Path
(
"update/content/{id}/work/{workId}"
)
@Path
(
"update/content/{id}/work/{workId}"
)
...
@@ -520,6 +594,25 @@ public class AttachmentAction extends StandardJaxrsAction {
...
@@ -520,6 +594,25 @@ public class AttachmentAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete."
,
action
=
ActionUpdateContent
.
class
)
@POST
@Path
(
"update/content/{id}/work/{workId}/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
updateContentMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"附件标识"
)
@PathParam
(
"id"
)
String
id
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"workId"
)
String
workId
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionUpdateContent
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionUpdateContent
().
execute
(
effectivePerson
,
id
,
workId
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"更新附件,使用callback方式,为了与前台兼容使用POST方法."
,
action
=
ActionUpdateCallback
.
class
)
@JaxrsMethodDescribe
(
value
=
"更新附件,使用callback方式,为了与前台兼容使用POST方法."
,
action
=
ActionUpdateCallback
.
class
)
@POST
@POST
@Path
(
"update/{id}/work/{workId}/callback/{callback}"
)
@Path
(
"update/{id}/work/{workId}/callback/{callback}"
)
...
@@ -657,6 +750,25 @@ public class AttachmentAction extends StandardJaxrsAction {
...
@@ -657,6 +750,25 @@ public class AttachmentAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete."
,
action
=
ActionEdit
.
class
)
@POST
@Path
(
"edit/{id}/work/{workId}/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
editMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"附件标识"
)
@PathParam
(
"id"
)
String
id
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"workId"
)
String
workId
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionEdit
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionEdit
().
execute
(
effectivePerson
,
id
,
workId
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"设置附件排序号."
,
action
=
ActionEdit
.
class
)
@JaxrsMethodDescribe
(
value
=
"设置附件排序号."
,
action
=
ActionEdit
.
class
)
@GET
@GET
@Path
(
"{id}/work/{workId}/change/ordernumber/{orderNumber}"
)
@Path
(
"{id}/work/{workId}/change/ordernumber/{orderNumber}"
)
...
@@ -696,6 +808,25 @@ public class AttachmentAction extends StandardJaxrsAction {
...
@@ -696,6 +808,25 @@ public class AttachmentAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete."
,
action
=
ActionEditText
.
class
)
@POST
@Path
(
"edit/{id}/work/{workId}/text/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
exitTextMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"附件标识"
)
@PathParam
(
"id"
)
String
id
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"workId"
)
String
workId
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionEditText
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionEditText
().
execute
(
effectivePerson
,
id
,
workId
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"获取附件文本."
,
action
=
ActionGetText
.
class
)
@JaxrsMethodDescribe
(
value
=
"获取附件文本."
,
action
=
ActionGetText
.
class
)
@GET
@GET
@Path
(
"{id}/work/{workId}/text"
)
@Path
(
"{id}/work/{workId}/text"
)
...
@@ -871,7 +1002,7 @@ public class AttachmentAction extends StandardJaxrsAction {
...
@@ -871,7 +1002,7 @@ public class AttachmentAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"上传工单的表单、审批记录等html信息到缓存"
,
action
=
ActionUploadWorkInfo
.
class
)
@JaxrsMethodDescribe
(
value
=
"上传工单的表单、审批记录等html信息到缓存
.
"
,
action
=
ActionUploadWorkInfo
.
class
)
@PUT
@PUT
@Path
(
"upload/work/{workId}/save/as/{flag}"
)
@Path
(
"upload/work/{workId}/save/as/{flag}"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
...
@@ -891,6 +1022,27 @@ public class AttachmentAction extends StandardJaxrsAction {
...
@@ -891,6 +1022,27 @@ public class AttachmentAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete."
,
action
=
ActionUploadWorkInfo
.
class
)
@POST
@Path
(
"upload/work/{workId}/save/as/{flag}/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
uploadWorkInfoMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"Work或WorkCompleted的工作标识"
)
@PathParam
(
"workId"
)
String
workId
,
@JaxrsParameterDescribe
(
"另存为格式:(0)表示不转换|pdf表示转为pdf|word表示转为word"
)
@PathParam
(
"flag"
)
String
flag
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionUploadWorkInfo
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionUploadWorkInfo
().
execute
(
effectivePerson
,
workId
,
flag
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"下载工单的表单、审批记录等html信息"
,
action
=
ActionDownloadWorkInfo
.
class
)
@JaxrsMethodDescribe
(
value
=
"下载工单的表单、审批记录等html信息"
,
action
=
ActionDownloadWorkInfo
.
class
)
@GET
@GET
@Path
(
"download/work/{workId}/att/{flag}"
)
@Path
(
"download/work/{workId}/att/{flag}"
)
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/draft/DraftAction.java
浏览文件 @
41e22566
...
@@ -88,10 +88,28 @@ public class DraftAction extends StandardJaxrsAction {
...
@@ -88,10 +88,28 @@ public class DraftAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@PUT
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete"
,
action
=
ActionDelete
.
class
)
@GET
@Path
(
"{id}/mockget2delete"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
deleteMockGet2Delete
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"草稿标识"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
ActionDelete
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionDelete
().
execute
(
effectivePerson
,
id
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@JaxrsMethodDescribe
(
value
=
"保存草稿."
,
action
=
ActionSave
.
class
)
@JaxrsMethodDescribe
(
value
=
"保存草稿."
,
action
=
ActionSave
.
class
)
@PUT
public
void
save
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
public
void
save
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
JsonElement
jsonElement
)
{
JsonElement
jsonElement
)
{
ActionResult
<
ActionSave
.
Wo
>
result
=
new
ActionResult
<>();
ActionResult
<
ActionSave
.
Wo
>
result
=
new
ActionResult
<>();
...
@@ -105,6 +123,23 @@ public class DraftAction extends StandardJaxrsAction {
...
@@ -105,6 +123,23 @@ public class DraftAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@JaxrsMethodDescribe
(
value
=
"Mock Post 2 Put."
,
action
=
ActionSave
.
class
)
@POST
public
void
saveMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionSave
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionSave
().
execute
(
effectivePerson
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"列示当前用户创建的草稿,分页."
,
action
=
ActionListMyPaging
.
class
)
@JaxrsMethodDescribe
(
value
=
"列示当前用户创建的草稿,分页."
,
action
=
ActionListMyPaging
.
class
)
@POST
@POST
@Path
(
"list/my/paging/{page}/size/{size}"
)
@Path
(
"list/my/paging/{page}/size/{size}"
)
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/keylock/KeyLockAction.java
浏览文件 @
41e22566
...
@@ -2,6 +2,7 @@ package com.x.processplatform.assemble.surface.jaxrs.keylock;
...
@@ -2,6 +2,7 @@ package com.x.processplatform.assemble.surface.jaxrs.keylock;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.POST
;
import
javax.ws.rs.PUT
;
import
javax.ws.rs.PUT
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.Produces
;
import
javax.ws.rs.Produces
;
...
@@ -44,4 +45,22 @@ public class KeyLockAction extends BaseAction {
...
@@ -44,4 +45,22 @@ public class KeyLockAction extends BaseAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionLock
.
class
)
@POST
@Path
(
"lock/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
lockMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionLock
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionLock
().
execute
(
effectivePerson
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
}
\ No newline at end of file
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/process/ActionGet.java
浏览文件 @
41e22566
package
com.x.processplatform.assemble.surface.jaxrs.process
;
package
com.x.processplatform.assemble.surface.jaxrs.process
;
import
java.util.List
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.JpaObject
;
import
com.x.base.core.entity.JpaObject
;
...
@@ -11,22 +9,7 @@ import com.x.base.core.project.exception.ExceptionEntityNotExist;
...
@@ -11,22 +9,7 @@ import com.x.base.core.project.exception.ExceptionEntityNotExist;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.processplatform.assemble.surface.Business
;
import
com.x.processplatform.assemble.surface.Business
;
import
com.x.processplatform.core.entity.element.Agent
;
import
com.x.processplatform.core.entity.element.Begin
;
import
com.x.processplatform.core.entity.element.Cancel
;
import
com.x.processplatform.core.entity.element.Choice
;
import
com.x.processplatform.core.entity.element.Delay
;
import
com.x.processplatform.core.entity.element.Embed
;
import
com.x.processplatform.core.entity.element.End
;
import
com.x.processplatform.core.entity.element.Invoke
;
import
com.x.processplatform.core.entity.element.Manual
;
import
com.x.processplatform.core.entity.element.Merge
;
import
com.x.processplatform.core.entity.element.Message
;
import
com.x.processplatform.core.entity.element.Parallel
;
import
com.x.processplatform.core.entity.element.Process
;
import
com.x.processplatform.core.entity.element.Process
;
import
com.x.processplatform.core.entity.element.Route
;
import
com.x.processplatform.core.entity.element.Service
;
import
com.x.processplatform.core.entity.element.Split
;
class
ActionGet
extends
BaseAction
{
class
ActionGet
extends
BaseAction
{
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/read/ReadAction.java
浏览文件 @
41e22566
...
@@ -317,6 +317,24 @@ public class ReadAction extends StandardJaxrsAction {
...
@@ -317,6 +317,24 @@ public class ReadAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionEdit
.
class
)
@POST
@Path
(
"{id}/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
editMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"待阅标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionEdit
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionEdit
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"获取制定人员的待阅数量,没有权限限制."
,
action
=
ActionCountWithPerson
.
class
)
@JaxrsMethodDescribe
(
value
=
"获取制定人员的待阅数量,没有权限限制."
,
action
=
ActionCountWithPerson
.
class
)
@GET
@GET
@Path
(
"count/{credential}"
)
@Path
(
"count/{credential}"
)
...
@@ -462,6 +480,24 @@ public class ReadAction extends StandardJaxrsAction {
...
@@ -462,6 +480,24 @@ public class ReadAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"管理删除待阅."
,
action
=
ActionManageDelete
.
class
)
@GET
@Path
(
"{id}/manage/mockget2delete"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageDeleteMockGet2Delete
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"待阅标识"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
ActionManageDelete
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageDelete
().
execute
(
effectivePerson
,
id
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"管理待阅转已阅."
,
action
=
ActionManageProcessing
.
class
)
@JaxrsMethodDescribe
(
value
=
"管理待阅转已阅."
,
action
=
ActionManageProcessing
.
class
)
@PUT
@PUT
@Path
(
"{id}/processing/manage"
)
@Path
(
"{id}/processing/manage"
)
...
@@ -480,7 +516,26 @@ public class ReadAction extends StandardJaxrsAction {
...
@@ -480,7 +516,26 @@ public class ReadAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"重置待阅,将之前的待办转为已办,opinion:办理意见,,identityList:新的待阅人."
,
action
=
ActionManageReset
.
class
)
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionManageProcessing
.
class
)
@POST
@Path
(
"{id}/processing/manage/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageProcessingMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"待阅标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionManageProcessing
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageProcessing
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"重置待阅,将之前的待办转为已办,opinion:办理意见,identityList:新的待阅人."
,
action
=
ActionManageReset
.
class
)
@PUT
@PUT
@Path
(
"{id}/reset/manage"
)
@Path
(
"{id}/reset/manage"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
...
@@ -498,6 +553,25 @@ public class ReadAction extends StandardJaxrsAction {
...
@@ -498,6 +553,25 @@ public class ReadAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionManageReset
.
class
)
@POST
@Path
(
"{id}/reset/manage/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageReadMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"待阅标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionManageReset
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageReset
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"管理修改意见."
,
action
=
ActionManageOpinion
.
class
)
@JaxrsMethodDescribe
(
value
=
"管理修改意见."
,
action
=
ActionManageOpinion
.
class
)
@PUT
@PUT
@Path
(
"{id}/opinion/manage"
)
@Path
(
"{id}/opinion/manage"
)
...
@@ -516,6 +590,25 @@ public class ReadAction extends StandardJaxrsAction {
...
@@ -516,6 +590,25 @@ public class ReadAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionManageOpinion
.
class
)
@POST
@Path
(
"{id}/opinion/manage/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageOpinionMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"待阅标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionManageOpinion
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageOpinion
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"列示当前用户的待阅,分页."
,
action
=
ActionListMyPaging
.
class
)
@JaxrsMethodDescribe
(
value
=
"列示当前用户的待阅,分页."
,
action
=
ActionListMyPaging
.
class
)
@GET
@GET
@Path
(
"list/my/paging/{page}/size/{size}"
)
@Path
(
"list/my/paging/{page}/size/{size}"
)
...
@@ -728,8 +821,8 @@ public class ReadAction extends StandardJaxrsAction {
...
@@ -728,8 +821,8 @@ public class ReadAction extends StandardJaxrsAction {
@Path
(
"list/person/{person}/manage"
)
@Path
(
"list/person/{person}/manage"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageListWithPerson
(
@Suspended
final
AsyncResponse
asyncResponse
,
public
void
manageListWithPerson
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"用户"
)
@PathParam
(
"person"
)
String
person
)
{
@JaxrsParameterDescribe
(
"用户"
)
@PathParam
(
"person"
)
String
person
)
{
ActionResult
<
List
<
ActionManageListWithPerson
.
Wo
>>
result
=
new
ActionResult
<>();
ActionResult
<
List
<
ActionManageListWithPerson
.
Wo
>>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
try
{
...
@@ -746,8 +839,8 @@ public class ReadAction extends StandardJaxrsAction {
...
@@ -746,8 +839,8 @@ public class ReadAction extends StandardJaxrsAction {
@Path
(
"list/date/{date}/manage"
)
@Path
(
"list/date/{date}/manage"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageListWithDate
(
@Suspended
final
AsyncResponse
asyncResponse
,
public
void
manageListWithDate
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"日期(如:2020-09-11)"
)
@PathParam
(
"date"
)
String
date
)
{
@JaxrsParameterDescribe
(
"日期(如:2020-09-11)"
)
@PathParam
(
"date"
)
String
date
)
{
ActionResult
<
List
<
ActionManageListWithDate
.
Wo
>>
result
=
new
ActionResult
<>();
ActionResult
<
List
<
ActionManageListWithDate
.
Wo
>>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
try
{
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/ReadCompletedAction.java
浏览文件 @
41e22566
...
@@ -389,6 +389,24 @@ public class ReadCompletedAction extends StandardJaxrsAction {
...
@@ -389,6 +389,24 @@ public class ReadCompletedAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete"
,
action
=
ActionManageDelete
.
class
)
@GET
@Path
(
"{id}/manage/mockget2delete"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageDeleteMockGet2Delete
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"已阅标识"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
ActionManageDelete
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageDelete
().
execute
(
effectivePerson
,
id
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"管理修改意见."
,
action
=
ActionManageOpinion
.
class
)
@JaxrsMethodDescribe
(
value
=
"管理修改意见."
,
action
=
ActionManageOpinion
.
class
)
@PUT
@PUT
@Path
(
"{id}/opinion/manage"
)
@Path
(
"{id}/opinion/manage"
)
...
@@ -407,6 +425,25 @@ public class ReadCompletedAction extends StandardJaxrsAction {
...
@@ -407,6 +425,25 @@ public class ReadCompletedAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionManageOpinion
.
class
)
@POST
@Path
(
"{id}/opinion/manage/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageDeleteMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"已阅标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionManageOpinion
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageOpinion
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"列示当前用户的已阅,分页."
,
action
=
ActionListMyPaging
.
class
)
@JaxrsMethodDescribe
(
value
=
"列示当前用户的已阅,分页."
,
action
=
ActionListMyPaging
.
class
)
@GET
@GET
@Path
(
"list/my/paging/{page}/size/{size}"
)
@Path
(
"list/my/paging/{page}/size/{size}"
)
...
@@ -619,8 +656,8 @@ public class ReadCompletedAction extends StandardJaxrsAction {
...
@@ -619,8 +656,8 @@ public class ReadCompletedAction extends StandardJaxrsAction {
@Path
(
"list/date/{date}/manage"
)
@Path
(
"list/date/{date}/manage"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageListWithDate
(
@Suspended
final
AsyncResponse
asyncResponse
,
public
void
manageListWithDate
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"日期(如:2020-09-11)"
)
@PathParam
(
"date"
)
String
date
)
{
@JaxrsParameterDescribe
(
"日期(如:2020-09-11)"
)
@PathParam
(
"date"
)
String
date
)
{
ActionResult
<
List
<
ActionManageListWithDate
.
Wo
>>
result
=
new
ActionResult
<>();
ActionResult
<
List
<
ActionManageListWithDate
.
Wo
>>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
try
{
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/record/RecordAction.java
浏览文件 @
41e22566
...
@@ -131,6 +131,24 @@ public class RecordAction extends StandardJaxrsAction {
...
@@ -131,6 +131,24 @@ public class RecordAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete."
,
action
=
ActionManageDelete
.
class
)
@GET
@Path
(
"{id}/manage/mockget2delete"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageDeleteMockGet2Delete
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"标识"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
ActionManageDelete
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageDelete
().
execute
(
effectivePerson
,
id
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"管理根据job创建记录."
,
action
=
ActionManageCreateWithJob
.
class
)
@JaxrsMethodDescribe
(
value
=
"管理根据job创建记录."
,
action
=
ActionManageCreateWithJob
.
class
)
@POST
@POST
@Path
(
"job/{job}/manage"
)
@Path
(
"job/{job}/manage"
)
...
@@ -166,4 +184,23 @@ public class RecordAction extends StandardJaxrsAction {
...
@@ -166,4 +184,23 @@ public class RecordAction extends StandardJaxrsAction {
}
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionManageEdit
.
class
)
@POST
@Path
(
"{id}/manage/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageEditMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionManageEdit
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageEdit
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
}
\ No newline at end of file
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/review/ReviewAction.java
浏览文件 @
41e22566
...
@@ -179,6 +179,25 @@ public class ReviewAction extends StandardJaxrsAction {
...
@@ -179,6 +179,25 @@ public class ReviewAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete."
,
action
=
ActionManageDelete
.
class
)
@GET
@Path
(
"{id}/application/{applicationFlag}/manage/mockget2delete"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageDeleteMockGet2Delete
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"参阅标识"
)
@PathParam
(
"id"
)
String
id
,
@JaxrsParameterDescribe
(
"应用标识"
)
@PathParam
(
"applicationFlag"
)
String
applicationFlag
)
{
ActionResult
<
ActionManageDelete
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageDelete
().
execute
(
effectivePerson
,
id
,
applicationFlag
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"列示当前用户创建的工作的参阅,分页."
,
action
=
V2ListCreatePaging
.
class
)
@JaxrsMethodDescribe
(
value
=
"列示当前用户创建的工作的参阅,分页."
,
action
=
V2ListCreatePaging
.
class
)
@POST
@POST
@Path
(
"v2/list/create/paging/{page}/size/{size}"
)
@Path
(
"v2/list/create/paging/{page}/size/{size}"
)
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/route/RouteAction.java
浏览文件 @
41e22566
...
@@ -5,6 +5,7 @@ import java.util.List;
...
@@ -5,6 +5,7 @@ import java.util.List;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.GET
;
import
javax.ws.rs.GET
;
import
javax.ws.rs.POST
;
import
javax.ws.rs.PUT
;
import
javax.ws.rs.PUT
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.PathParam
;
import
javax.ws.rs.PathParam
;
...
@@ -68,6 +69,24 @@ public class RouteAction extends StandardJaxrsAction {
...
@@ -68,6 +69,24 @@ public class RouteAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionList
.
class
)
@POST
@Path
(
"list/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
listMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
JsonElement
jsonElement
)
{
ActionResult
<
List
<
ActionList
.
Wo
>>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionList
().
execute
(
effectivePerson
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"获取选择人员配置."
,
action
=
ActionGetSelectConfig
.
class
)
@JaxrsMethodDescribe
(
value
=
"获取选择人员配置."
,
action
=
ActionGetSelectConfig
.
class
)
@GET
@GET
@Path
(
"{id}/selectconfig"
)
@Path
(
"{id}/selectconfig"
)
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/serialnumber/SerialNumberAction.java
浏览文件 @
41e22566
...
@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
...
@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.DELETE
;
import
javax.ws.rs.DELETE
;
import
javax.ws.rs.GET
;
import
javax.ws.rs.GET
;
import
javax.ws.rs.POST
;
import
javax.ws.rs.PUT
;
import
javax.ws.rs.PUT
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.PathParam
;
import
javax.ws.rs.PathParam
;
...
@@ -87,6 +88,24 @@ public class SerialNumberAction extends StandardJaxrsAction {
...
@@ -87,6 +88,24 @@ public class SerialNumberAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionUpdate
.
class
)
@POST
@Path
(
"{id}/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
updateMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionUpdate
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionUpdate
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"删除SerialNumber内容."
,
action
=
ActionRemove
.
class
)
@JaxrsMethodDescribe
(
value
=
"删除SerialNumber内容."
,
action
=
ActionRemove
.
class
)
@DELETE
@DELETE
@Path
(
"{id}"
)
@Path
(
"{id}"
)
...
@@ -105,4 +124,22 @@ public class SerialNumberAction extends StandardJaxrsAction {
...
@@ -105,4 +124,22 @@ public class SerialNumberAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete."
,
action
=
ActionRemove
.
class
)
@GET
@Path
(
"{id}/mockget2delete"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
deleteMockGet2Delete
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"标识"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
ActionRemove
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionRemove
().
execute
(
effectivePerson
,
id
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
}
\ No newline at end of file
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/service/ServiceAction.java
浏览文件 @
41e22566
...
@@ -2,6 +2,7 @@ package com.x.processplatform.assemble.surface.jaxrs.service;
...
@@ -2,6 +2,7 @@ package com.x.processplatform.assemble.surface.jaxrs.service;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.POST
;
import
javax.ws.rs.PUT
;
import
javax.ws.rs.PUT
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.PathParam
;
import
javax.ws.rs.PathParam
;
...
@@ -29,19 +30,37 @@ public class ServiceAction extends StandardJaxrsAction {
...
@@ -29,19 +30,37 @@ public class ServiceAction extends StandardJaxrsAction {
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ServiceAction
.
class
);
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ServiceAction
.
class
);
@JaxrsMethodDescribe
(
value
=
"访问服务"
,
action
=
ActionTouch
.
class
)
@JaxrsMethodDescribe
(
value
=
"访问服务
.
"
,
action
=
ActionTouch
.
class
)
@PUT
@PUT
@Path
(
"work/{id}/touch"
)
@Path
(
"work/{id}/touch"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
get
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
public
void
touch
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionTouch
.
Wo
>
result
=
new
ActionResult
<>();
ActionResult
<
ActionTouch
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
try
{
result
=
new
ActionTouch
().
execute
(
effectivePerson
,
id
,
jsonElement
);
result
=
new
ActionTouch
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionTouch
.
class
)
@POST
@Path
(
"work/{id}/touch/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
touchMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionTouch
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionTouch
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
result
.
error
(
e
);
}
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionTypeAbandoned.java
浏览文件 @
41e22566
...
@@ -15,8 +15,8 @@ import com.x.base.core.project.logger.Logger;
...
@@ -15,8 +15,8 @@ import com.x.base.core.project.logger.Logger;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.processplatform.assemble.surface.Business
;
import
com.x.processplatform.assemble.surface.Business
;
import
com.x.processplatform.assemble.surface.ThisApplication
;
import
com.x.processplatform.assemble.surface.ThisApplication
;
import
com.x.processplatform.assemble.surface.WorkControl
;
import
com.x.processplatform.core.entity.content.Work
;
import
com.x.processplatform.core.entity.content.Work
;
import
com.x.processplatform.core.entity.element.Activity
;
class
ActionTypeAbandoned
extends
BaseAction
{
class
ActionTypeAbandoned
extends
BaseAction
{
...
@@ -30,14 +30,11 @@ class ActionTypeAbandoned extends BaseAction {
...
@@ -30,14 +30,11 @@ class ActionTypeAbandoned extends BaseAction {
if
(
null
==
work
)
{
if
(
null
==
work
)
{
throw
new
ExceptionEntityNotExist
(
workId
,
Work
.
class
);
throw
new
ExceptionEntityNotExist
(
workId
,
Work
.
class
);
}
}
job
=
work
.
getJob
();
WoControl
control
=
business
.
getControl
(
effectivePerson
,
work
,
WoControl
.
class
);
Activity
activity
=
business
.
getActivity
(
work
.
getActivity
(),
work
.
getActivityType
());
if
(
BooleanUtils
.
isNotTrue
(
control
.
getAllowDelete
()))
{
if
(
BooleanUtils
.
isNotTrue
(
business
.
canManageApplicationOrProcess
(
effectivePerson
,
work
.
getApplication
(),
work
.
getProcess
()))
&&
((!
business
.
editable
(
effectivePerson
,
work
))
||
(
BooleanUtils
.
isNotTrue
(
activity
.
getAllowSuspend
()))))
{
throw
new
ExceptionAccessDenied
(
effectivePerson
,
work
);
throw
new
ExceptionAccessDenied
(
effectivePerson
,
work
);
}
}
job
=
work
.
getJob
();
}
}
Wo
wo
=
ThisApplication
.
context
().
applications
()
Wo
wo
=
ThisApplication
.
context
().
applications
()
...
@@ -56,4 +53,7 @@ class ActionTypeAbandoned extends BaseAction {
...
@@ -56,4 +53,7 @@ class ActionTypeAbandoned extends BaseAction {
}
}
public
static
class
WoControl
extends
WorkControl
{
}
}
}
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/SnapAction.java
浏览文件 @
41e22566
...
@@ -105,6 +105,24 @@ public class SnapAction extends StandardJaxrsAction {
...
@@ -105,6 +105,24 @@ public class SnapAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"删除快照"
,
action
=
ActionDelete
.
class
)
@GET
@Path
(
"{id}/mockget2delete"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
deleteMockGet2Delete
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"标识"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
ActionDelete
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionDelete
().
execute
(
effectivePerson
,
id
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"恢复快照"
,
action
=
ActionRestore
.
class
)
@JaxrsMethodDescribe
(
value
=
"恢复快照"
,
action
=
ActionRestore
.
class
)
@GET
@GET
@Path
(
"{id}/restore"
)
@Path
(
"{id}/restore"
)
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/TaskAction.java
浏览文件 @
41e22566
...
@@ -357,7 +357,25 @@ public class TaskAction extends StandardJaxrsAction {
...
@@ -357,7 +357,25 @@ public class TaskAction extends StandardJaxrsAction {
@Path
(
"{id}"
)
@Path
(
"{id}"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
update
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
public
void
edit
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionEdit
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionEdit
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionEdit
.
class
)
@POST
@Path
(
"{id}/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
editMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
@JaxrsParameterDescribe
(
"标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionEdit
.
Wo
>
result
=
new
ActionResult
<>();
ActionResult
<
ActionEdit
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
...
@@ -388,6 +406,24 @@ public class TaskAction extends StandardJaxrsAction {
...
@@ -388,6 +406,24 @@ public class TaskAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"重置待办,将之前的待办转为已办,opinion:办理意见,routeName:选择路由,identityList:新的办理人."
,
action
=
ActionReset
.
class
)
@POST
@Path
(
"{id}/reset/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
resetMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionReset
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionReset
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"预计下一活动处理状态及处理人."
,
action
=
ActionWill
.
class
)
@JaxrsMethodDescribe
(
value
=
"预计下一活动处理状态及处理人."
,
action
=
ActionWill
.
class
)
@GET
@GET
@Path
(
"{id}/will"
)
@Path
(
"{id}/will"
)
...
@@ -478,6 +514,24 @@ public class TaskAction extends StandardJaxrsAction {
...
@@ -478,6 +514,24 @@ public class TaskAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete."
,
action
=
ActionManageDelete
.
class
)
@GET
@Path
(
"{id}/manage/mockget2delete"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageDeleteMockGet2Delete
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"标识"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
ActionManageDelete
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageDelete
().
execute
(
effectivePerson
,
id
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"待办转已办."
,
action
=
ActionManageProcessing
.
class
)
@JaxrsMethodDescribe
(
value
=
"待办转已办."
,
action
=
ActionManageProcessing
.
class
)
@PUT
@PUT
@Path
(
"{id}/processing/manage"
)
@Path
(
"{id}/processing/manage"
)
...
@@ -496,6 +550,25 @@ public class TaskAction extends StandardJaxrsAction {
...
@@ -496,6 +550,25 @@ public class TaskAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionManageProcessing
.
class
)
@POST
@Path
(
"{id}/processing/manage/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageProcessingMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"待办标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionManageProcessing
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageProcessing
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"管理修改意见."
,
action
=
ActionManageOpinion
.
class
)
@JaxrsMethodDescribe
(
value
=
"管理修改意见."
,
action
=
ActionManageOpinion
.
class
)
@PUT
@PUT
@Path
(
"{id}/opinion/manage"
)
@Path
(
"{id}/opinion/manage"
)
...
@@ -514,6 +587,25 @@ public class TaskAction extends StandardJaxrsAction {
...
@@ -514,6 +587,25 @@ public class TaskAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionManageOpinion
.
class
)
@POST
@Path
(
"{id}/opinion/manage/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageOpinionMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"待办标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionManageOpinion
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageOpinion
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"重置待办,将之前的待办转为已办,opinion:办理意见,routeName:选择路由,identityList:新的办理人."
,
action
=
ActionManageReset
.
class
)
@JaxrsMethodDescribe
(
value
=
"重置待办,将之前的待办转为已办,opinion:办理意见,routeName:选择路由,identityList:新的办理人."
,
action
=
ActionManageReset
.
class
)
@PUT
@PUT
@Path
(
"{id}/reset/manage"
)
@Path
(
"{id}/reset/manage"
)
...
@@ -532,6 +624,25 @@ public class TaskAction extends StandardJaxrsAction {
...
@@ -532,6 +624,25 @@ public class TaskAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"重置待办,将之前的待办转为已办,opinion:办理意见,routeName:选择路由,identityList:新的办理人."
,
action
=
ActionManageReset
.
class
)
@POST
@Path
(
"{id}/reset/manage/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageResetMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionManageReset
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageReset
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"列示当前用户的待办,分页."
,
action
=
ActionListMyPaging
.
class
)
@JaxrsMethodDescribe
(
value
=
"列示当前用户的待办,分页."
,
action
=
ActionListMyPaging
.
class
)
@GET
@GET
@Path
(
"list/my/paging/{page}/size/{size}"
)
@Path
(
"list/my/paging/{page}/size/{size}"
)
...
@@ -833,6 +944,24 @@ public class TaskAction extends StandardJaxrsAction {
...
@@ -833,6 +944,24 @@ public class TaskAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
V2Reset
.
class
)
@POST
@Path
(
"v2/{id}/reset/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
V2ResetMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
V2Reset
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
V2Reset
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"待办提醒,message类型:task_press."
,
action
=
ActionManagePress
.
class
)
@JaxrsMethodDescribe
(
value
=
"待办提醒,message类型:task_press."
,
action
=
ActionManagePress
.
class
)
@GET
@GET
@Path
(
"{id}/press/manage"
)
@Path
(
"{id}/press/manage"
)
...
@@ -856,8 +985,8 @@ public class TaskAction extends StandardJaxrsAction {
...
@@ -856,8 +985,8 @@ public class TaskAction extends StandardJaxrsAction {
@Path
(
"list/person/{person}/manage"
)
@Path
(
"list/person/{person}/manage"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageListWithPerson
(
@Suspended
final
AsyncResponse
asyncResponse
,
public
void
manageListWithPerson
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"用户"
)
@PathParam
(
"person"
)
String
person
)
{
@JaxrsParameterDescribe
(
"用户"
)
@PathParam
(
"person"
)
String
person
)
{
ActionResult
<
List
<
ActionManageListWithPerson
.
Wo
>>
result
=
new
ActionResult
<>();
ActionResult
<
List
<
ActionManageListWithPerson
.
Wo
>>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
try
{
...
@@ -875,7 +1004,8 @@ public class TaskAction extends StandardJaxrsAction {
...
@@ -875,7 +1004,8 @@ public class TaskAction extends StandardJaxrsAction {
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageListWithDateHour
(
@Suspended
final
AsyncResponse
asyncResponse
,
public
void
manageListWithDateHour
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"日期(如:2020-09-11)"
)
@PathParam
(
"date"
)
String
date
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"日期(如:2020-09-11)"
)
@PathParam
(
"date"
)
String
date
,
@JaxrsParameterDescribe
(
"小时(0-23)"
)
@PathParam
(
"hour"
)
Integer
hour
)
{
@JaxrsParameterDescribe
(
"小时(0-23)"
)
@PathParam
(
"hour"
)
Integer
hour
)
{
ActionResult
<
List
<
ActionManageListWithDateHour
.
Wo
>>
result
=
new
ActionResult
<>();
ActionResult
<
List
<
ActionManageListWithDateHour
.
Wo
>>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/taskcompleted/TaskCompletedAction.java
浏览文件 @
41e22566
...
@@ -407,6 +407,24 @@ public class TaskCompletedAction extends StandardJaxrsAction {
...
@@ -407,6 +407,24 @@ public class TaskCompletedAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete."
,
action
=
ActionManageDelete
.
class
)
@GET
@Path
(
"{id}/manage/mockget2delete"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageDeleteMockGet2Delete
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"标识"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
ActionManageDelete
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageDelete
().
execute
(
effectivePerson
,
id
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"管理修改意见."
,
action
=
ActionManageOpinion
.
class
)
@JaxrsMethodDescribe
(
value
=
"管理修改意见."
,
action
=
ActionManageOpinion
.
class
)
@PUT
@PUT
@Path
(
"{id}/opinion/manage"
)
@Path
(
"{id}/opinion/manage"
)
...
@@ -425,6 +443,25 @@ public class TaskCompletedAction extends StandardJaxrsAction {
...
@@ -425,6 +443,25 @@ public class TaskCompletedAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionManageOpinion
.
class
)
@POST
@Path
(
"{id}/opinion/manage/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageOpinionMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"已办标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionManageOpinion
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageOpinion
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"提醒."
,
action
=
ActionPress
.
class
)
@JaxrsMethodDescribe
(
value
=
"提醒."
,
action
=
ActionPress
.
class
)
@GET
@GET
@Path
(
"press/work/{work}"
)
@Path
(
"press/work/{work}"
)
...
@@ -674,7 +711,8 @@ public class TaskCompletedAction extends StandardJaxrsAction {
...
@@ -674,7 +711,8 @@ public class TaskCompletedAction extends StandardJaxrsAction {
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageListWithDateHour
(
@Suspended
final
AsyncResponse
asyncResponse
,
public
void
manageListWithDateHour
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"日期(如:2020-09-11)"
)
@PathParam
(
"date"
)
String
date
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"日期(如:2020-09-11)"
)
@PathParam
(
"date"
)
String
date
,
@JaxrsParameterDescribe
(
"小时(0-23)"
)
@PathParam
(
"hour"
)
Integer
hour
)
{
@JaxrsParameterDescribe
(
"小时(0-23)"
)
@PathParam
(
"hour"
)
Integer
hour
)
{
ActionResult
<
List
<
ActionManageListWithDateHour
.
Wo
>>
result
=
new
ActionResult
<>();
ActionResult
<
List
<
ActionManageListWithDateHour
.
Wo
>>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCloseCheck.java
浏览文件 @
41e22566
...
@@ -62,35 +62,10 @@ class ActionCloseCheck extends BaseAction {
...
@@ -62,35 +62,10 @@ class ActionCloseCheck extends BaseAction {
return
wo
;
return
wo
;
}
}
// private WoGrabRelease grabRelease(Business business, EffectivePerson effectivePerson, Work work) throws Exception {
// WoGrabRelease wo = new WoGrabRelease();
// if ((null != work) && (Objects.equals(work.getActivityType(), ActivityType.manual))) {
// Manual manual = business.manual().pick(work.getActivity());
// if ((null != manual) && Objects.equals(ManualMode.grab, manual.getManualMode())) {
// if (ListTools.isEmpty(work.getManualTaskIdentityList())
// || (work.getManualTaskIdentityList().size() == 1)) {
// business.entityManagerContainer().beginTransaction(Work.class);
// work.getManualTaskIdentityList().clear();
// business.entityManagerContainer().commit();
// ThisApplication.context().applications().putQuery(effectivePerson.getDebugger(),
// x_processplatform_service_processing.class,
// Applications.joinQueryUri("work", work.getId(), "processing"), null);
// List<Task> tasks = business.entityManagerContainer().fetchEqual(Task.class,
// ListTools.toList(Task.identity_FIELDNAME), Task.work_FIELDNAME, work.getId());
// wo.setRelease(true);
// wo.setTaskList(tasks);
// }
// }
// }
// return wo;
// }
public
static
class
Wo
extends
GsonPropertyObject
{
public
static
class
Wo
extends
GsonPropertyObject
{
@FieldDescribe
(
"检查删除草稿结果"
)
@FieldDescribe
(
"检查删除草稿结果"
)
private
WoDraft
draft
;
private
WoDraft
draft
;
// @FieldDescribe("检查抢办释放结果")
// private WoGrabRelease grabRelease;
public
WoDraft
getDraft
()
{
public
WoDraft
getDraft
()
{
return
draft
;
return
draft
;
...
@@ -100,14 +75,6 @@ class ActionCloseCheck extends BaseAction {
...
@@ -100,14 +75,6 @@ class ActionCloseCheck extends BaseAction {
this
.
draft
=
draft
;
this
.
draft
=
draft
;
}
}
// public WoGrabRelease getGrabRelease() {
// return grabRelease;
// }
//
// public void setGrabRelease(WoGrabRelease grabRelease) {
// this.grabRelease = grabRelease;
// }
}
}
public
static
class
WoDraft
extends
WrapBoolean
{
public
static
class
WoDraft
extends
WrapBoolean
{
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/WorkAction.java
浏览文件 @
41e22566
package
com.x.processplatform.assemble.surface.jaxrs.work
;
package
com.x.processplatform.assemble.surface.jaxrs.work
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
...
@@ -201,9 +200,27 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -201,9 +200,27 @@ public class WorkAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionProcessing
.
class
)
@POST
@POST
@Path
(
"{id}/processing/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
processingMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
ActionProcessing
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionProcessing
().
execute
(
effectivePerson
,
id
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@POST
@Path
(
"process/{processFlag}"
)
@Path
(
"process/{processFlag}"
)
@JaxrsMethodDescribe
(
value
=
"创建工作(创建启动版本的流程)."
,
action
=
ActionCreate
.
class
)
@JaxrsMethodDescribe
(
value
=
"创建工作(创建启动版本的流程)."
,
action
=
ActionCreate
.
class
)
public
void
create
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
public
void
create
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
...
@@ -219,10 +236,10 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -219,10 +236,10 @@ public class WorkAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@POST
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Path
(
"process/{processFlag}/force"
)
@Path
(
"process/{processFlag}/force"
)
@POST
@JaxrsMethodDescribe
(
value
=
"创建工作(强制创建存在的流程)."
,
action
=
ActionCreateForce
.
class
)
@JaxrsMethodDescribe
(
value
=
"创建工作(强制创建存在的流程)."
,
action
=
ActionCreateForce
.
class
)
public
void
createForce
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
public
void
createForce
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"流程标识"
)
@PathParam
(
"processFlag"
)
String
processFlag
,
JsonElement
jsonElement
)
{
@JaxrsParameterDescribe
(
"流程标识"
)
@PathParam
(
"processFlag"
)
String
processFlag
,
JsonElement
jsonElement
)
{
...
@@ -297,6 +314,24 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -297,6 +314,24 @@ public class WorkAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete."
,
action
=
ActionDelete
.
class
)
@GET
@Path
(
"{id}/mockget2delete"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
deleteMockGet2Delete
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
ActionDelete
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionDelete
().
execute
(
effectivePerson
,
id
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"完成工作关闭时候的检查,1.检查是否要删除处于草稿状态的工作,没有保存过任何数据将被认为是草稿.2.检查是否需要释放抢办."
,
action
=
ActionCloseCheck
.
class
)
@JaxrsMethodDescribe
(
value
=
"完成工作关闭时候的检查,1.检查是否要删除处于草稿状态的工作,没有保存过任何数据将被认为是草稿.2.检查是否需要释放抢办."
,
action
=
ActionCloseCheck
.
class
)
@GET
@GET
@Path
(
"{id}/close/check"
)
@Path
(
"{id}/close/check"
)
...
@@ -319,7 +354,7 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -319,7 +354,7 @@ public class WorkAction extends StandardJaxrsAction {
@POST
@POST
@Path
(
"{id}/close/check"
)
@Path
(
"{id}/close/check"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
//
@Consumes(MediaType.APPLICATION_JSON)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
closeCheckPost
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
public
void
closeCheckPost
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
)
{
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
ActionCloseCheck
.
Wo
>
result
=
new
ActionResult
<>();
ActionResult
<
ActionCloseCheck
.
Wo
>
result
=
new
ActionResult
<>();
...
@@ -600,6 +635,24 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -600,6 +635,24 @@ public class WorkAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionRetract
.
class
)
@POST
@Path
(
"{id}/retract/mockPost2Put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
retractMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
ActionRetract
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionRetract
().
execute
(
effectivePerson
,
id
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"将工作调度。"
,
action
=
ActionReroute
.
class
)
@JaxrsMethodDescribe
(
value
=
"将工作调度。"
,
action
=
ActionReroute
.
class
)
@PUT
@PUT
@Path
(
"{id}/reroute/activity/{activityId}/activitytype/{activityType}"
)
@Path
(
"{id}/reroute/activity/{activityId}/activitytype/{activityType}"
)
...
@@ -621,6 +674,27 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -621,6 +674,27 @@ public class WorkAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"将工作调度。"
,
action
=
ActionReroute
.
class
)
@POST
@Path
(
"{id}/reroute/activity/{activityId}/activitytype/{activityType}/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
rerouteMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
,
@JaxrsParameterDescribe
(
"活动标识"
)
@PathParam
(
"activityId"
)
String
activityId
,
@JaxrsParameterDescribe
(
"活动类型"
)
@PathParam
(
"activityType"
)
ActivityType
activityType
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionReroute
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionReroute
().
execute
(
effectivePerson
,
id
,
activityId
,
activityType
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"增加一个会签分支"
,
action
=
ActionAddSplit
.
class
)
@JaxrsMethodDescribe
(
value
=
"增加一个会签分支"
,
action
=
ActionAddSplit
.
class
)
@PUT
@PUT
@Path
(
"{id}/add/split"
)
@Path
(
"{id}/add/split"
)
...
@@ -639,6 +713,24 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -639,6 +713,24 @@ public class WorkAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionAddSplit
.
class
)
@POST
@Path
(
"{id}/add/split/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
addSplitMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
List
<
ActionAddSplit
.
Wo
>>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionAddSplit
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"回滚工作到指定的workLog"
,
action
=
ActionRollback
.
class
)
@JaxrsMethodDescribe
(
value
=
"回滚工作到指定的workLog"
,
action
=
ActionRollback
.
class
)
@PUT
@PUT
@Path
(
"{id}/rollback"
)
@Path
(
"{id}/rollback"
)
...
@@ -657,6 +749,24 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -657,6 +749,24 @@ public class WorkAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionRollback
.
class
)
@POST
@Path
(
"{id}/rollback/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
rollbackMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionRollback
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionRollback
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"列示当前用户创建的工作,可以根据条件过滤,分页."
,
action
=
ActionListMyPaging
.
class
)
@JaxrsMethodDescribe
(
value
=
"列示当前用户创建的工作,可以根据条件过滤,分页."
,
action
=
ActionListMyPaging
.
class
)
@POST
@POST
@Path
(
"list/my/paging/{page}/size/{size}"
)
@Path
(
"list/my/paging/{page}/size/{size}"
)
...
@@ -825,6 +935,24 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -825,6 +935,24 @@ public class WorkAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete."
,
action
=
ActionManageDeleteSingleWork
.
class
)
@GET
@Path
(
"{id}/single/manage/mockget2delete"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageDeleteSingleWorkMockGet2Delete
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
List
<
ActionManageDeleteSingleWork
.
Wo
>>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageDeleteSingleWork
().
execute
(
effectivePerson
,
id
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"删除所有相关联的工作."
,
action
=
ActionManageDeleteRelativeWork
.
class
)
@JaxrsMethodDescribe
(
value
=
"删除所有相关联的工作."
,
action
=
ActionManageDeleteRelativeWork
.
class
)
@DELETE
@DELETE
@Path
(
"{id}/relative/manage"
)
@Path
(
"{id}/relative/manage"
)
...
@@ -843,6 +971,24 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -843,6 +971,24 @@ public class WorkAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete."
,
action
=
ActionManageDeleteRelativeWork
.
class
)
@GET
@Path
(
"{id}/relative/manage/mockget2delete"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageDeleteRelativeWorkMockGet2Delete
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
List
<
ActionManageDeleteRelativeWork
.
Wo
>>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageDeleteRelativeWork
().
execute
(
effectivePerson
,
id
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"获取用于过滤的可选属性值"
,
action
=
ActionManageFilterAttribute
.
class
)
@JaxrsMethodDescribe
(
value
=
"获取用于过滤的可选属性值"
,
action
=
ActionManageFilterAttribute
.
class
)
@GET
@GET
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
...
@@ -942,6 +1088,24 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -942,6 +1088,24 @@ public class WorkAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
V2Reroute
.
class
)
@POST
@Path
(
"v2/{id}/reroute/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
V2RerouteMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
V2Reroute
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
V2Reroute
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"V2_工作召回。"
,
action
=
V2Retract
.
class
)
@JaxrsMethodDescribe
(
value
=
"V2_工作召回。"
,
action
=
V2Retract
.
class
)
@PUT
@PUT
@Path
(
"v2/{id}/retract"
)
@Path
(
"v2/{id}/retract"
)
...
@@ -960,6 +1124,24 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -960,6 +1124,24 @@ public class WorkAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
V2Retract
.
class
)
@POST
@Path
(
"v2/{id}/retract/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
V2RetractMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
V2Retract
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
V2Retract
().
execute
(
effectivePerson
,
id
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"V2_回滚工作."
,
action
=
V2Rollback
.
class
)
@JaxrsMethodDescribe
(
value
=
"V2_回滚工作."
,
action
=
V2Rollback
.
class
)
@PUT
@PUT
@Path
(
"v2/{id}/rollback"
)
@Path
(
"v2/{id}/rollback"
)
...
@@ -978,6 +1160,25 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -978,6 +1160,25 @@ public class WorkAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
V2Rollback
.
class
)
@POST
@Path
(
"v2/{id}/rollback/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
V2RollbackMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
V2Rollback
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
V2Rollback
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"V2_增加一个会签分支"
,
action
=
ActionAddSplit
.
class
)
@JaxrsMethodDescribe
(
value
=
"V2_增加一个会签分支"
,
action
=
ActionAddSplit
.
class
)
@PUT
@PUT
@Path
(
"v2/{id}/add/split"
)
@Path
(
"v2/{id}/add/split"
)
...
@@ -996,6 +1197,25 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -996,6 +1197,25 @@ public class WorkAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionAddSplit
.
class
)
@POST
@Path
(
"v2/{id}/add/split/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
V2AddSplitMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
,
JsonElement
jsonElement
)
{
ActionResult
<
V2AddSplit
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
V2AddSplit
().
execute
(
effectivePerson
,
id
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"管理员替代person操作工作召回。"
,
action
=
V2ManageRetract
.
class
)
@JaxrsMethodDescribe
(
value
=
"管理员替代person操作工作召回。"
,
action
=
V2ManageRetract
.
class
)
@PUT
@PUT
@Path
(
"v2/{id}/person/{person}/retract/manage"
)
@Path
(
"v2/{id}/person/{person}/retract/manage"
)
...
@@ -1015,6 +1235,25 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -1015,6 +1235,25 @@ public class WorkAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
V2ManageRetract
.
class
)
@POST
@Path
(
"v2/{id}/person/{person}/retract/manage/mockpost2put"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
V2ManageRetractMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"id"
)
String
id
,
@JaxrsParameterDescribe
(
"召回工作已办人员(根据流转记录确认)"
)
@PathParam
(
"person"
)
String
person
,
JsonElement
jsonElement
)
{
ActionResult
<
V2ManageRetract
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
V2ManageRetract
().
execute
(
effectivePerson
,
id
,
person
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"V2_根据Work或workCompleted取得内容."
,
action
=
V2GetWorkOrWorkCompleted
.
class
)
@JaxrsMethodDescribe
(
value
=
"V2_根据Work或workCompleted取得内容."
,
action
=
V2GetWorkOrWorkCompleted
.
class
)
@GET
@GET
@Path
(
"v2/workorworkcompleted/{workOrWorkCompleted}"
)
@Path
(
"v2/workorworkcompleted/{workOrWorkCompleted}"
)
...
@@ -1023,22 +1262,15 @@ public class WorkAction extends StandardJaxrsAction {
...
@@ -1023,22 +1262,15 @@ public class WorkAction extends StandardJaxrsAction {
public
void
V2GetWorkOrWorkCompleted
(
@Suspended
final
AsyncResponse
asyncResponse
,
public
void
V2GetWorkOrWorkCompleted
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"workOrWorkCompleted"
)
String
workOrWorkCompleted
)
{
@JaxrsParameterDescribe
(
"工作标识"
)
@PathParam
(
"workOrWorkCompleted"
)
String
workOrWorkCompleted
)
{
// Date s = new Date();
ActionResult
<
V2GetWorkOrWorkCompleted
.
Wo
>
result
=
new
ActionResult
<>();
ActionResult
<
V2GetWorkOrWorkCompleted
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
// System.out.println("!!!!!!!!!!!!!!!!V2GetWorkOrWorkCompleted1:" + ((new
// Date()).getTime() - s.getTime()));
try
{
try
{
result
=
new
V2GetWorkOrWorkCompleted
().
execute
(
effectivePerson
,
workOrWorkCompleted
);
result
=
new
V2GetWorkOrWorkCompleted
().
execute
(
effectivePerson
,
workOrWorkCompleted
);
// System.out.println("!!!!!!!!!!!!!!!!V2GetWorkOrWorkCompleted2:" + ((new
// Date()).getTime() - s.getTime()));
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
result
.
error
(
e
);
}
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
// System.out.println("!!!!!!!!!!!!!!!!V2GetWorkOrWorkCompleted3:" + ((new
// Date()).getTime() - s.getTime()));
}
}
}
}
\ No newline at end of file
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/workcompleted/WorkCompletedAction.java
浏览文件 @
41e22566
...
@@ -305,28 +305,6 @@ public class WorkCompletedAction extends StandardJaxrsAction {
...
@@ -305,28 +305,6 @@ public class WorkCompletedAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
// @JaxrsMethodDescribe(value = "更新WorkCompleted中的extension字段.", action =
// ActionUpdateExtension.class)
// @PUT
// @Path("update/extension")
// @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
// @Consumes(MediaType.APPLICATION_JSON)
// public void updateExtension(@Suspended final AsyncResponse asyncResponse,
// @Context HttpServletRequest request,
// @JaxrsParameterDescribe("标识") @PathParam("id") String id, JsonElement
// jsonElement) {
// ActionResult<ActionUpdateExtension.Wo> result = new ActionResult<>();
// EffectivePerson effectivePerson = this.effectivePerson(request);
// try {
// result = new ActionUpdateExtension().execute(effectivePerson, id,
// jsonElement);
// } catch (Exception e) {
// logger.error(e, effectivePerson, request, jsonElement);
// result.error(e);
// }
// asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
// }
@JaxrsMethodDescribe
(
value
=
"获取工作内容."
,
action
=
ActionManageGet
.
class
)
@JaxrsMethodDescribe
(
value
=
"获取工作内容."
,
action
=
ActionManageGet
.
class
)
@GET
@GET
@Path
(
"{id}/manage"
)
@Path
(
"{id}/manage"
)
...
@@ -441,6 +419,24 @@ public class WorkCompletedAction extends StandardJaxrsAction {
...
@@ -441,6 +419,24 @@ public class WorkCompletedAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Get To Delete."
,
action
=
ActionManageDelete
.
class
)
@GET
@Path
(
"{id}/delete/manage/mockget2delete"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
manageDeleteMockGet2Delete
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"标识"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
List
<
ActionManageDelete
.
Wo
>>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageDelete
().
execute
(
effectivePerson
,
id
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"获取用于过滤的可选属性值"
,
action
=
ActionManageFilterAttribute
.
class
)
@JaxrsMethodDescribe
(
value
=
"获取用于过滤的可选属性值"
,
action
=
ActionManageFilterAttribute
.
class
)
@GET
@GET
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
...
@@ -501,10 +497,10 @@ public class WorkCompletedAction extends StandardJaxrsAction {
...
@@ -501,10 +497,10 @@ public class WorkCompletedAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@POST
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Path
(
"process/{processFlag}"
)
@Path
(
"process/{processFlag}"
)
@POST
@JaxrsMethodDescribe
(
value
=
"创建已完成工作."
,
action
=
ActionCreate
.
class
)
@JaxrsMethodDescribe
(
value
=
"创建已完成工作."
,
action
=
ActionCreate
.
class
)
public
void
create
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
public
void
create
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"流程标识"
)
@PathParam
(
"processFlag"
)
String
processFlag
,
JsonElement
jsonElement
)
{
@JaxrsParameterDescribe
(
"流程标识"
)
@PathParam
(
"processFlag"
)
String
processFlag
,
JsonElement
jsonElement
)
{
...
@@ -519,11 +515,11 @@ public class WorkCompletedAction extends StandardJaxrsAction {
...
@@ -519,11 +515,11 @@ public class WorkCompletedAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@
PUT
@
JaxrsMethodDescribe
(
value
=
"完成工作重新回滚."
,
action
=
ActionRollback
.
class
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
@Path
(
"{flag}/rollback"
)
@Path
(
"{flag}/rollback"
)
@
JaxrsMethodDescribe
(
value
=
"完成工作重新回滚."
,
action
=
ActionRollback
.
class
)
@
PUT
public
void
rollback
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
public
void
rollback
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"流程标识"
)
@PathParam
(
"flag"
)
String
flag
,
JsonElement
jsonElement
)
{
@JaxrsParameterDescribe
(
"流程标识"
)
@PathParam
(
"flag"
)
String
flag
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionRollback
.
Wo
>
result
=
new
ActionResult
<>();
ActionResult
<
ActionRollback
.
Wo
>
result
=
new
ActionResult
<>();
...
@@ -537,6 +533,24 @@ public class WorkCompletedAction extends StandardJaxrsAction {
...
@@ -537,6 +533,24 @@ public class WorkCompletedAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"Mock Post To Put."
,
action
=
ActionRollback
.
class
)
@Path
(
"{flag}/rollback/mockpost2put"
)
@POST
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
rollbackMockPost2Put
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"流程标识"
)
@PathParam
(
"flag"
)
String
flag
,
JsonElement
jsonElement
)
{
ActionResult
<
ActionRollback
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionRollback
().
execute
(
effectivePerson
,
flag
,
jsonElement
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
jsonElement
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"按条件对WorkCompleted分页显示."
,
action
=
ActionManageListFilterPaging
.
class
)
@JaxrsMethodDescribe
(
value
=
"按条件对WorkCompleted分页显示."
,
action
=
ActionManageListFilterPaging
.
class
)
@POST
@POST
@Path
(
"list/filter/{page}/size/{size}/manage"
)
@Path
(
"list/filter/{page}/size/{size}/manage"
)
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/test/ActionTest5.java
0 → 100644
浏览文件 @
41e22566
package
com.x.processplatform.service.processing.jaxrs.test
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.jaxrs.WrapBoolean
;
import
com.x.processplatform.service.processing.ThisApplication
;
class
ActionTest5
extends
BaseAction
{
ActionResult
<
Wo
>
execute
(
EffectivePerson
effectivePerson
,
String
id
)
throws
Exception
{
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
Wo
wo
=
new
Wo
();
System
.
out
.
println
(
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
);
System
.
out
.
println
(
"Action5_id:"
+
id
);
System
.
out
.
println
(
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
);
result
.
setData
(
wo
);
return
result
;
}
public
static
class
Wo
extends
WrapBoolean
{
}
}
\ No newline at end of file
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/test/ActionTest52.java
0 → 100644
浏览文件 @
41e22566
package
com.x.processplatform.service.processing.jaxrs.test
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.jaxrs.WrapBoolean
;
import
com.x.processplatform.service.processing.ThisApplication
;
class
ActionTest52
extends
BaseAction
{
ActionResult
<
Wo
>
execute
(
EffectivePerson
effectivePerson
)
throws
Exception
{
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
Wo
wo
=
new
Wo
();
System
.
out
.
println
(
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
);
System
.
out
.
println
(
"Action52"
);
System
.
out
.
println
(
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
);
result
.
setData
(
wo
);
return
result
;
}
public
static
class
Wo
extends
WrapBoolean
{
}
}
\ No newline at end of file
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/test/TestAction.java
浏览文件 @
41e22566
...
@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
...
@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.GET
;
import
javax.ws.rs.GET
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.PathParam
;
import
javax.ws.rs.Produces
;
import
javax.ws.rs.Produces
;
import
javax.ws.rs.container.AsyncResponse
;
import
javax.ws.rs.container.AsyncResponse
;
import
javax.ws.rs.container.Suspended
;
import
javax.ws.rs.container.Suspended
;
...
@@ -14,6 +15,7 @@ import javax.ws.rs.core.MediaType;
...
@@ -14,6 +15,7 @@ import javax.ws.rs.core.MediaType;
import
com.x.base.core.project.annotation.JaxrsDescribe
;
import
com.x.base.core.project.annotation.JaxrsDescribe
;
import
com.x.base.core.project.annotation.JaxrsMethodDescribe
;
import
com.x.base.core.project.annotation.JaxrsMethodDescribe
;
import
com.x.base.core.project.annotation.JaxrsParameterDescribe
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.http.HttpMediaType
;
import
com.x.base.core.project.http.HttpMediaType
;
...
@@ -231,4 +233,39 @@ public class TestAction extends StandardJaxrsAction {
...
@@ -231,4 +233,39 @@ public class TestAction extends StandardJaxrsAction {
}
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
@JaxrsMethodDescribe
(
value
=
"test1."
,
action
=
ActionTest1
.
class
)
@GET
@Path
(
"test5/{id}"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
test5
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"标识"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
ActionTest5
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionTest5
().
execute
(
effectivePerson
,
id
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"test1."
,
action
=
ActionTest52
.
class
)
@GET
@Path
(
"test5/123"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
test5
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
)
{
ActionResult
<
ActionTest52
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionTest52
().
execute
(
effectivePerson
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录