Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
82ed92c3
o2oa
项目概览
fuyue82
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
82ed92c3
编写于
11月 23, 2020
作者:
O
o2null
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
reldatedForm关联错误修复
上级
0641bc52
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
84 addition
and
34 deletion
+84
-34
o2server/commons
o2server/commons
+1
-0
o2server/jvm
o2server/jvm
+1
-0
o2server/x_calendar_core_entity/.gitignore
o2server/x_calendar_core_entity/.gitignore
+2
-0
o2server/x_component_assemble_control/.gitignore
o2server/x_component_assemble_control/.gitignore
+2
-0
o2server/x_processplatform_assemble_bam/.gitignore
o2server/x_processplatform_assemble_bam/.gitignore
+2
-0
o2server/x_processplatform_assemble_designer/.gitignore
o2server/x_processplatform_assemble_designer/.gitignore
+2
-0
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/BaseAction.java
...ocessplatform/assemble/surface/jaxrs/form/BaseAction.java
+0
-34
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2Get.java
.../x/processplatform/assemble/surface/jaxrs/form/V2Get.java
+35
-0
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2GetMobile.java
...cessplatform/assemble/surface/jaxrs/form/V2GetMobile.java
+35
-0
o2server/x_program_center/.gitignore
o2server/x_program_center/.gitignore
+2
-0
o2server/x_query_service_processing/.gitignore
o2server/x_query_service_processing/.gitignore
+2
-0
未找到文件。
o2server/commons
0 → 120000
浏览文件 @
82ed92c3
/O2/evn-o2server-commons/commons
\ No newline at end of file
o2server/jvm
0 → 120000
浏览文件 @
82ed92c3
/O2/evn-o2server-jvm/jvm
\ No newline at end of file
o2server/x_calendar_core_entity/.gitignore
0 → 100644
浏览文件 @
82ed92c3
/.apt_generated/
/.apt_generated_tests/
o2server/x_component_assemble_control/.gitignore
0 → 100644
浏览文件 @
82ed92c3
/.apt_generated/
/.apt_generated_tests/
o2server/x_processplatform_assemble_bam/.gitignore
0 → 100644
浏览文件 @
82ed92c3
/.apt_generated/
/.apt_generated_tests/
o2server/x_processplatform_assemble_designer/.gitignore
0 → 100644
浏览文件 @
82ed92c3
/.apt_generated/
/.apt_generated_tests/
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/BaseAction.java
浏览文件 @
82ed92c3
...
...
@@ -27,7 +27,6 @@ abstract class BaseAction extends StandardJaxrsAction {
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
BaseAction
.
class
);
CacheCategory
cacheCategory
=
new
CacheCategory
(
Form
.
class
,
Script
.
class
,
com
.
x
.
portal
.
core
.
entity
.
Script
.
class
,
com
.
x
.
cms
.
core
.
entity
.
element
.
Script
.
class
);
...
...
@@ -67,38 +66,6 @@ abstract class BaseAction extends StandardJaxrsAction {
}
protected
Map
<
String
,
RelatedScript
>
convertScript
(
Business
bus
,
FormProperties
properties
)
throws
Exception
{
Map
<
String
,
RelatedScript
>
map
=
new
TreeMap
<>();
for
(
Entry
<
String
,
String
>
entry
:
properties
.
getMobileRelatedScriptMap
().
entrySet
())
{
switch
(
entry
.
getValue
())
{
case
WorkCompletedProperties
.
RelatedScript
.
TYPE_PROCESSPLATFORM
:
Script
pp
=
bus
.
script
().
pick
(
entry
.
getKey
());
if
(
null
!=
pp
)
{
map
.
put
(
entry
.
getKey
(),
new
RelatedScript
(
pp
.
getId
(),
pp
.
getName
(),
pp
.
getAlias
(),
pp
.
getText
(),
entry
.
getValue
()));
}
break
;
case
WorkCompletedProperties
.
RelatedScript
.
TYPE_CMS
:
com
.
x
.
cms
.
core
.
entity
.
element
.
Script
cms
=
bus
.
cms
().
script
().
pick
(
entry
.
getKey
());
if
(
null
!=
cms
)
{
map
.
put
(
entry
.
getKey
(),
new
RelatedScript
(
cms
.
getId
(),
cms
.
getName
(),
cms
.
getAlias
(),
cms
.
getText
(),
entry
.
getValue
()));
}
break
;
case
WorkCompletedProperties
.
RelatedScript
.
TYPE_PORTAL
:
com
.
x
.
portal
.
core
.
entity
.
Script
p
=
bus
.
portal
().
script
().
pick
(
entry
.
getKey
());
if
(
null
!=
p
)
{
map
.
put
(
entry
.
getKey
(),
new
RelatedScript
(
p
.
getId
(),
p
.
getName
(),
p
.
getAlias
(),
p
.
getText
(),
entry
.
getValue
()));
}
break
;
default
:
break
;
}
}
return
map
;
}
protected
List
<
String
>
convertScriptToCacheTag
(
Business
business
,
Map
<
String
,
String
>
map
)
throws
Exception
{
List
<
String
>
list
=
new
ArrayList
<>();
for
(
Entry
<
String
,
String
>
entry
:
map
.
entrySet
())
{
...
...
@@ -128,5 +95,4 @@ abstract class BaseAction extends StandardJaxrsAction {
return
list
;
}
}
\ No newline at end of file
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2Get.java
浏览文件 @
82ed92c3
...
...
@@ -3,6 +3,7 @@ package com.x.processplatform.assemble.surface.jaxrs.form;
import
java.util.Map
;
import
java.util.Optional
;
import
java.util.TreeMap
;
import
java.util.Map.Entry
;
import
java.util.concurrent.CompletableFuture
;
import
java.util.concurrent.TimeUnit
;
...
...
@@ -17,10 +18,12 @@ import com.x.base.core.project.logger.Logger;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.processplatform.assemble.surface.Business
;
import
com.x.processplatform.core.entity.content.WorkCompletedProperties
;
import
com.x.processplatform.core.entity.content.WorkCompletedProperties.RelatedForm
;
import
com.x.processplatform.core.entity.content.WorkCompletedProperties.RelatedScript
;
import
com.x.processplatform.core.entity.element.Form
;
import
com.x.processplatform.core.entity.element.FormProperties
;
import
com.x.processplatform.core.entity.element.Script
;
class
V2Get
extends
BaseAction
{
...
...
@@ -93,6 +96,38 @@ class V2Get extends BaseAction {
});
}
private
Map
<
String
,
RelatedScript
>
convertScript
(
Business
bus
,
FormProperties
properties
)
throws
Exception
{
Map
<
String
,
RelatedScript
>
map
=
new
TreeMap
<>();
for
(
Entry
<
String
,
String
>
entry
:
properties
.
getRelatedScriptMap
().
entrySet
())
{
switch
(
entry
.
getValue
())
{
case
WorkCompletedProperties
.
RelatedScript
.
TYPE_PROCESSPLATFORM
:
Script
pp
=
bus
.
script
().
pick
(
entry
.
getKey
());
if
(
null
!=
pp
)
{
map
.
put
(
entry
.
getKey
(),
new
RelatedScript
(
pp
.
getId
(),
pp
.
getName
(),
pp
.
getAlias
(),
pp
.
getText
(),
entry
.
getValue
()));
}
break
;
case
WorkCompletedProperties
.
RelatedScript
.
TYPE_CMS
:
com
.
x
.
cms
.
core
.
entity
.
element
.
Script
cms
=
bus
.
cms
().
script
().
pick
(
entry
.
getKey
());
if
(
null
!=
cms
)
{
map
.
put
(
entry
.
getKey
(),
new
RelatedScript
(
cms
.
getId
(),
cms
.
getName
(),
cms
.
getAlias
(),
cms
.
getText
(),
entry
.
getValue
()));
}
break
;
case
WorkCompletedProperties
.
RelatedScript
.
TYPE_PORTAL
:
com
.
x
.
portal
.
core
.
entity
.
Script
p
=
bus
.
portal
().
script
().
pick
(
entry
.
getKey
());
if
(
null
!=
p
)
{
map
.
put
(
entry
.
getKey
(),
new
RelatedScript
(
p
.
getId
(),
p
.
getName
(),
p
.
getAlias
(),
p
.
getText
(),
entry
.
getValue
()));
}
break
;
default
:
break
;
}
}
return
map
;
}
public
static
class
Wo
extends
AbstractWo
{
private
static
final
long
serialVersionUID
=
2776033956637839042L
;
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2GetMobile.java
浏览文件 @
82ed92c3
...
...
@@ -3,6 +3,7 @@ package com.x.processplatform.assemble.surface.jaxrs.form;
import
java.util.Map
;
import
java.util.Optional
;
import
java.util.TreeMap
;
import
java.util.Map.Entry
;
import
java.util.concurrent.CompletableFuture
;
import
java.util.concurrent.TimeUnit
;
...
...
@@ -17,10 +18,12 @@ import com.x.base.core.project.logger.Logger;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.processplatform.assemble.surface.Business
;
import
com.x.processplatform.core.entity.content.WorkCompletedProperties
;
import
com.x.processplatform.core.entity.content.WorkCompletedProperties.RelatedForm
;
import
com.x.processplatform.core.entity.content.WorkCompletedProperties.RelatedScript
;
import
com.x.processplatform.core.entity.element.Form
;
import
com.x.processplatform.core.entity.element.FormProperties
;
import
com.x.processplatform.core.entity.element.Script
;
class
V2GetMobile
extends
BaseAction
{
...
...
@@ -93,6 +96,38 @@ class V2GetMobile extends BaseAction {
return
map
;
});
}
private
Map
<
String
,
RelatedScript
>
convertScript
(
Business
bus
,
FormProperties
properties
)
throws
Exception
{
Map
<
String
,
RelatedScript
>
map
=
new
TreeMap
<>();
for
(
Entry
<
String
,
String
>
entry
:
properties
.
getMobileRelatedScriptMap
().
entrySet
())
{
switch
(
entry
.
getValue
())
{
case
WorkCompletedProperties
.
RelatedScript
.
TYPE_PROCESSPLATFORM
:
Script
pp
=
bus
.
script
().
pick
(
entry
.
getKey
());
if
(
null
!=
pp
)
{
map
.
put
(
entry
.
getKey
(),
new
RelatedScript
(
pp
.
getId
(),
pp
.
getName
(),
pp
.
getAlias
(),
pp
.
getText
(),
entry
.
getValue
()));
}
break
;
case
WorkCompletedProperties
.
RelatedScript
.
TYPE_CMS
:
com
.
x
.
cms
.
core
.
entity
.
element
.
Script
cms
=
bus
.
cms
().
script
().
pick
(
entry
.
getKey
());
if
(
null
!=
cms
)
{
map
.
put
(
entry
.
getKey
(),
new
RelatedScript
(
cms
.
getId
(),
cms
.
getName
(),
cms
.
getAlias
(),
cms
.
getText
(),
entry
.
getValue
()));
}
break
;
case
WorkCompletedProperties
.
RelatedScript
.
TYPE_PORTAL
:
com
.
x
.
portal
.
core
.
entity
.
Script
p
=
bus
.
portal
().
script
().
pick
(
entry
.
getKey
());
if
(
null
!=
p
)
{
map
.
put
(
entry
.
getKey
(),
new
RelatedScript
(
p
.
getId
(),
p
.
getName
(),
p
.
getAlias
(),
p
.
getText
(),
entry
.
getValue
()));
}
break
;
default
:
break
;
}
}
return
map
;
}
public
static
class
Wo
extends
AbstractWo
{
...
...
o2server/x_program_center/.gitignore
0 → 100644
浏览文件 @
82ed92c3
/.apt_generated/
/.apt_generated_tests/
o2server/x_query_service_processing/.gitignore
0 → 100644
浏览文件 @
82ed92c3
/.apt_generated/
/.apt_generated_tests/
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录