Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
4e38ce23
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,发现更多精彩内容 >>
提交
4e38ce23
编写于
7月 06, 2021
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
内容管理文档增加预留字段并可在视图中查询
上级
bb41c040
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
140 addition
and
9 deletion
+140
-9
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java
...e/control/jaxrs/document/ActionPersistPublishContent.java
+33
-0
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistSaveDocument.java
...ble/control/jaxrs/document/ActionPersistSaveDocument.java
+33
-0
o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Document.java
..._entity/src/main/java/com/x/cms/core/entity/Document.java
+45
-0
o2server/x_query_core_express/src/main/java/com/x/query/core/express/plan/CmsPlan.java
.../src/main/java/com/x/query/core/express/plan/CmsPlan.java
+28
-8
o2server/x_query_core_express/src/main/java/com/x/query/core/express/plan/FilterEntry.java
.../main/java/com/x/query/core/express/plan/FilterEntry.java
+1
-1
未找到文件。
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java
浏览文件 @
4e38ce23
...
...
@@ -623,6 +623,15 @@ public class ActionPersistPublishContent extends BaseAction {
private
List
<
String
>
pictureList
;
@FieldDescribe
(
"业务数据String值01."
)
private
String
stringValue01
;
@FieldDescribe
(
"业务数据String值02."
)
private
String
stringValue02
;
@FieldDescribe
(
"业务数据String值03."
)
private
String
stringValue03
;
public
String
getId
()
{
return
id
;
}
...
...
@@ -1078,6 +1087,30 @@ public class ActionPersistPublishContent extends BaseAction {
public
void
setNotice
(
Boolean
notice
)
{
isNotice
=
notice
;
}
public
String
getStringValue01
()
{
return
stringValue01
;
}
public
void
setStringValue01
(
String
stringValue01
)
{
this
.
stringValue01
=
stringValue01
;
}
public
String
getStringValue02
()
{
return
stringValue02
;
}
public
void
setStringValue02
(
String
stringValue02
)
{
this
.
stringValue02
=
stringValue02
;
}
public
String
getStringValue03
()
{
return
stringValue03
;
}
public
void
setStringValue03
(
String
stringValue03
)
{
this
.
stringValue03
=
stringValue03
;
}
}
public
static
class
Wo
extends
WoId
{
...
...
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistSaveDocument.java
浏览文件 @
4e38ce23
...
...
@@ -426,6 +426,15 @@ public class ActionPersistSaveDocument extends BaseAction {
@FieldDescribe
(
"不修改权限(跳过权限设置,保留原来的设置),非必填"
)
private
Boolean
skipPermission
=
false
;
@FieldDescribe
(
"业务数据String值01."
)
private
String
stringValue01
;
@FieldDescribe
(
"业务数据String值02."
)
private
String
stringValue02
;
@FieldDescribe
(
"业务数据String值03."
)
private
String
stringValue03
;
public
static
WrapCopier
<
Wi
,
Document
>
copier
=
WrapCopierFactory
.
wi
(
Wi
.
class
,
Document
.
class
,
null
,
JpaObject
.
FieldsUnmodifyExcludeId
);
public
String
getId
()
{
...
...
@@ -566,6 +575,30 @@ public class ActionPersistSaveDocument extends BaseAction {
public
void
setPublishTime
(
Date
publishTime
)
{
this
.
publishTime
=
publishTime
;
}
public
String
getStringValue01
()
{
return
stringValue01
;
}
public
void
setStringValue01
(
String
stringValue01
)
{
this
.
stringValue01
=
stringValue01
;
}
public
String
getStringValue02
()
{
return
stringValue02
;
}
public
void
setStringValue02
(
String
stringValue02
)
{
this
.
stringValue02
=
stringValue02
;
}
public
String
getStringValue03
()
{
return
stringValue03
;
}
public
void
setStringValue03
(
String
stringValue03
)
{
this
.
stringValue03
=
stringValue03
;
}
}
public
static
class
Wo
extends
WoId
{
...
...
o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Document.java
浏览文件 @
4e38ce23
...
...
@@ -428,6 +428,27 @@ public class Document extends SliceJpaObject {
@CheckPersist
(
allowEmpty
=
true
)
private
List
<
String
>
pictureList
;
public
static
final
String
stringValue01_FIELDNAME
=
"stringValue01"
;
@FieldDescribe
(
"业务数据String值01."
)
@Column
(
length
=
length_255B
,
name
=
ColumnNamePrefix
+
stringValue01_FIELDNAME
)
@Index
(
name
=
TABLE
+
IndexNameMiddle
+
stringValue01_FIELDNAME
)
@CheckPersist
(
allowEmpty
=
true
)
private
String
stringValue01
;
public
static
final
String
stringValue02_FIELDNAME
=
"stringValue02"
;
@FieldDescribe
(
"业务数据String值02."
)
@Column
(
length
=
length_255B
,
name
=
ColumnNamePrefix
+
stringValue02_FIELDNAME
)
@Index
(
name
=
TABLE
+
IndexNameMiddle
+
stringValue02_FIELDNAME
)
@CheckPersist
(
allowEmpty
=
true
)
private
String
stringValue02
;
public
static
final
String
stringValue03_FIELDNAME
=
"stringValue03"
;
@FieldDescribe
(
"业务数据String值03."
)
@Column
(
length
=
length_255B
,
name
=
ColumnNamePrefix
+
stringValue03_FIELDNAME
)
@Index
(
name
=
TABLE
+
IndexNameMiddle
+
stringValue03_FIELDNAME
)
@CheckPersist
(
allowEmpty
=
true
)
private
String
stringValue03
;
public
Date
getModifyTime
()
{
return
modifyTime
;
}
...
...
@@ -842,6 +863,30 @@ public class Document extends SliceJpaObject {
this
.
sequenceCreatorUnitName
=
getSequenceString
(
sequenceCreatorUnitName
);
}
public
String
getStringValue01
()
{
return
stringValue01
;
}
public
void
setStringValue01
(
String
stringValue01
)
{
this
.
stringValue01
=
stringValue01
;
}
public
String
getStringValue02
()
{
return
stringValue02
;
}
public
void
setStringValue02
(
String
stringValue02
)
{
this
.
stringValue02
=
stringValue02
;
}
public
String
getStringValue03
()
{
return
stringValue03
;
}
public
void
setStringValue03
(
String
stringValue03
)
{
this
.
stringValue03
=
stringValue03
;
}
// -------------------Reader-------------------------
// -------------------2020-06-12 改为只存储DistinguishedName后两段,第一段可能会在运行过程中修改
public
void
addToReadPersonList
(
String
readPerson
)
{
...
...
o2server/x_query_core_express/src/main/java/com/x/query/core/express/plan/CmsPlan.java
浏览文件 @
4e38ce23
package
com.x.query.core.express.plan
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Set
;
...
...
@@ -267,11 +268,11 @@ public class CmsPlan extends Plan {
private
Predicate
documentPredicate
(
CriteriaBuilder
cb
,
Root
<
Document
>
root
,
Runtime
runtime
,
List
<
FilterEntry
>
filterList
)
throws
Exception
{
List
<
Predicate
>
ps
=
new
TreeList
<>();
ps
.
add
(
this
.
documentPredicate_creator
(
cb
,
root
));
//
ps.add(this.documentPredicate_creator(cb, root));
ps
.
add
(
this
.
documentPredicate_appInfo
(
cb
,
root
));
ps
.
add
(
this
.
documentPredicate_date
(
cb
,
root
));
//
ps.add(this.documentPredicate_date(cb, root));
ps
.
add
(
this
.
documentPredicate_Filter
(
cb
,
root
,
runtime
,
filterList
));
ps
.
add
(
this
.
documentPredicate_draft
(
cb
,
root
));
//
ps.add(this.documentPredicate_draft(cb, root));
Predicate
predicate
=
this
.
documentPredicate_typeScope
(
cb
,
root
);
if
(
predicate
!=
null
)
{
...
...
@@ -386,12 +387,21 @@ public class CmsPlan extends Plan {
private
Predicate
documentPredicate_Filter
(
CriteriaBuilder
cb
,
Root
<
Document
>
root
,
Runtime
runtime
,
List
<
FilterEntry
>
filterList
)
throws
Exception
{
boolean
flag
=
true
;
boolean
orFlag
=
false
;
boolean
andFlag
=
false
;
Predicate
rp
=
cb
.
conjunction
();
Predicate
p
=
cb
.
disjunction
();
for
(
FilterEntry
filterEntry
:
filterList
)
{
List
<
FilterEntry
>
list
=
new
ArrayList
<>();
list
.
addAll
(
filterList
);
if
(
runtime
.
filterList
!=
null
){
list
.
addAll
(
runtime
.
filterList
);
}
for
(
FilterEntry
filterEntry
:
list
)
{
if
(
filterEntry
.
path
.
indexOf
(
"("
)
>
-
1
&&
filterEntry
.
path
.
indexOf
(
")"
)
>
-
1
)
{
flag
=
false
;
String
path
=
StringUtils
.
substringBetween
(
filterEntry
.
path
,
"("
,
")"
).
trim
();
if
(
"readPersonList"
.
equals
(
path
))
{
orFlag
=
true
;
p
=
cb
.
or
(
p
,
cb
.
isMember
(
"所有人"
,
root
.
get
(
Document_
.
readPersonList
)));
p
=
cb
.
or
(
p
,
cb
.
isMember
(
runtime
.
person
,
root
.
get
(
Document_
.
readPersonList
)));
if
(
runtime
.
person
.
indexOf
(
"@"
)
>
-
1
)
{
...
...
@@ -399,18 +409,22 @@ public class CmsPlan extends Plan {
root
.
get
(
Document_
.
readPersonList
)));
}
}
else
if
(
"readUnitList"
.
equals
(
path
))
{
orFlag
=
true
;
if
(
ListTools
.
isNotEmpty
(
runtime
.
unitAllList
))
{
p
=
cb
.
or
(
p
,
root
.
get
(
Document_
.
readUnitList
).
in
(
runtime
.
unitAllList
));
}
}
else
if
(
"readGroupList"
.
equals
(
path
))
{
orFlag
=
true
;
if
(
ListTools
.
isNotEmpty
(
runtime
.
groupList
))
{
p
=
cb
.
or
(
p
,
root
.
get
(
Document_
.
readGroupList
).
in
(
runtime
.
groupList
));
}
}
else
{
Predicate
fp
=
filterEntry
.
toCmsDocumentPredicate
(
cb
,
root
,
runtime
,
path
);
if
(
StringUtils
.
equals
(
"and"
,
filterEntry
.
logic
))
{
p
=
cb
.
and
(
p
,
fp
);
if
(
Comparison
.
isEquals
(
filterEntry
.
logic
))
{
andFlag
=
true
;
rp
=
cb
.
and
(
rp
,
fp
);
}
else
{
orFlag
=
true
;
p
=
cb
.
or
(
p
,
fp
);
}
}
...
...
@@ -419,8 +433,14 @@ public class CmsPlan extends Plan {
if
(
flag
)
{
return
null
;
}
return
p
;
if
(
andFlag
){
if
(
orFlag
){
rp
=
cb
.
and
(
rp
,
p
);
}
}
else
{
rp
=
p
;
}
return
rp
;
}
}
}
o2server/x_query_core_express/src/main/java/com/x/query/core/express/plan/FilterEntry.java
浏览文件 @
4e38ce23
...
...
@@ -630,7 +630,7 @@ public class FilterEntry extends GsonPropertyObject {
public
Predicate
toCmsDocumentPredicate
(
CriteriaBuilder
cb
,
Root
<
Document
>
root
,
Runtime
runtime
,
String
paramName
)
throws
Exception
{
Predicate
p
=
cb
.
dis
junction
();
Predicate
p
=
cb
.
con
junction
();
String
compareValue
=
this
.
compareValue
(
runtime
);
String
compareOtherValue
=
this
.
compareOtherValue
(
runtime
);
if
(
StringUtils
.
equals
(
this
.
formatType
,
FORMAT_BOOLEANVALUE
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录