Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
c02ab322
o2oa
项目概览
weixin_42566577
/
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,发现更多精彩内容 >>
提交
c02ab322
编写于
3月 14, 2019
作者:
R
roo00
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
脑图修正
上级
97401bd4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
38 addition
and
5 deletion
+38
-5
o2server/x_mind_assemble_control/src/main/java/com/x/mind/assemble/control/service/ServiceMindInfoPersist.java
...mind/assemble/control/service/ServiceMindInfoPersist.java
+3
-1
o2server/x_mind_core_entity/src/main/java/com/x/mind/entity/MindBaseInfo.java
..._entity/src/main/java/com/x/mind/entity/MindBaseInfo.java
+27
-4
o2server/x_mind_core_entity/src/main/java/com/x/mind/entity/MindVersionInfo.java
...tity/src/main/java/com/x/mind/entity/MindVersionInfo.java
+8
-0
未找到文件。
o2server/x_mind_assemble_control/src/main/java/com/x/mind/assemble/control/service/ServiceMindInfoPersist.java
浏览文件 @
c02ab322
...
...
@@ -53,11 +53,13 @@ class ServiceMindInfoPersist{
emc
.
persist
(
oldMindBase
,
CheckPersistType
.
all
);
}
else
{
_mindBaseInfo
.
copyTo
(
oldMindBase
,
JpaObject
.
FieldsUnmodify
);
_mindBaseInfo
.
setId
(
oldMindBase
.
getId
()
);
_mindBaseInfo
.
setCreator_sequence
(
oldMindBase
.
getCreator_sequence
()
);
_mindBaseInfo
.
setFolder_sequence
(
oldMindBase
.
getFolder_sequence
()
);
_mindBaseInfo
.
setCreatorUnit_sequence
(
oldMindBase
.
getCreatorUnit_sequence
()
);
_mindBaseInfo
.
setShared_sequence
(
oldMindBase
.
getShared_sequence
()
);
emc
.
check
(
oldMindBase
,
CheckPersistType
.
all
);
_mindBaseInfo
.
composeSequnces
();
emc
.
check
(
_mindBaseInfo
,
CheckPersistType
.
all
);
}
//保存脑图内容
if
(
oldContent
==
null
){
...
...
o2server/x_mind_core_entity/src/main/java/com/x/mind/entity/MindBaseInfo.java
浏览文件 @
c02ab322
...
...
@@ -59,11 +59,19 @@ public class MindBaseInfo extends SliceJpaObject {
private
String
id
=
createId
();
public
void
onPersist
()
throws
Exception
{
composeSequnces
();
if
(
null
==
this
.
getCreateTime
()
)
{
this
.
setCreateTime
(
new
Date
()
);
}
this
.
setSequence
(
StringUtils
.
join
(
DateTools
.
compact
(
this
.
getCreateTime
()),
this
.
getId
()));
this
.
creator_sequence
=
StringUtils
.
join
(
this
.
creator
,
this
.
getSequence
());
this
.
folder_sequence
=
StringUtils
.
join
(
this
.
getFolderId
(),
this
.
getSequence
());
this
.
creatorUnit_sequence
=
StringUtils
.
join
(
this
.
getCreatorUnit
(),
this
.
getSequence
());
this
.
shared_sequence
=
StringUtils
.
join
(
this
.
getShared
().
toString
(),
this
.
getSequence
());
this
.
cooperative_sequence
=
StringUtils
.
join
(
this
.
getCooperative
().
toString
(),
this
.
getSequence
());
}
public
void
composeSequnces
()
throws
Exception
{
if
(
this
.
getCreateTime
()
==
null
)
{
public
void
composeSequnces
()
{
if
(
null
==
this
.
getCreateTime
()
)
{
this
.
setCreateTime
(
new
Date
()
);
}
this
.
setSequence
(
StringUtils
.
join
(
DateTools
.
compact
(
this
.
getCreateTime
()),
this
.
getId
()));
...
...
@@ -73,7 +81,6 @@ public class MindBaseInfo extends SliceJpaObject {
this
.
shared_sequence
=
StringUtils
.
join
(
this
.
getShared
().
toString
(),
this
.
getSequence
());
this
.
cooperative_sequence
=
StringUtils
.
join
(
this
.
getCooperative
().
toString
(),
this
.
getSequence
());
}
/*
* =============================================================================
* ===== 以上为 JpaObject 默认字段
...
...
@@ -102,6 +109,12 @@ public class MindBaseInfo extends SliceJpaObject {
@Index
(
name
=
TABLE
+
IndexNameMiddle
+
folderId_FIELDNAME
)
@CheckPersist
(
allowEmpty
=
false
)
private
String
folderId
=
""
;
public
static
final
String
icon_FIELDNAME
=
"icon"
;
@FieldDescribe
(
"缩略图信息"
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
icon_FIELDNAME
)
@CheckPersist
(
allowEmpty
=
true
)
private
String
icon
=
""
;
public
static
final
String
description_FIELDNAME
=
"description"
;
@FieldDescribe
(
"备注信息"
)
...
...
@@ -366,4 +379,14 @@ public class MindBaseInfo extends SliceJpaObject {
public
void
setCooperative_sequence
(
String
cooperative_sequence
)
{
this
.
cooperative_sequence
=
cooperative_sequence
;
}
public
String
getIcon
()
{
return
icon
;
}
public
void
setIcon
(
String
icon
)
{
this
.
icon
=
icon
;
}
}
\ No newline at end of file
o2server/x_mind_core_entity/src/main/java/com/x/mind/entity/MindVersionInfo.java
浏览文件 @
c02ab322
package
com.x.mind.entity
;
import
java.util.Date
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
import
javax.persistence.Id
;
...
...
@@ -8,6 +10,7 @@ import javax.persistence.InheritanceType;
import
javax.persistence.Table
;
import
javax.persistence.UniqueConstraint
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.openjpa.persistence.jdbc.Index
;
import
com.x.base.core.entity.JpaObject
;
...
...
@@ -15,6 +18,7 @@ import com.x.base.core.entity.SliceJpaObject;
import
com.x.base.core.entity.annotation.CheckPersist
;
import
com.x.base.core.entity.annotation.ContainerEntity
;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
com.x.base.core.project.tools.DateTools
;
/**
* 脑图版本信息表
...
...
@@ -47,6 +51,10 @@ public class MindVersionInfo extends SliceJpaObject {
private
String
id
=
createId
();
public
void
onPersist
()
throws
Exception
{
if
(
null
==
this
.
getCreateTime
()
)
{
this
.
setCreateTime
(
new
Date
()
);
}
this
.
setSequence
(
StringUtils
.
join
(
DateTools
.
compact
(
this
.
getCreateTime
()),
this
.
getId
()));
}
/*
* =============================================================================
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录