Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
454addd5
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,发现更多精彩内容 >>
提交
454addd5
编写于
7月 17, 2020
作者:
Z
zhourui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改管理设置意见接口
上级
f0b23287
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
33 addition
and
56 deletion
+33
-56
o2server/configSample/query.json
o2server/configSample/query.json
+12
-12
o2server/x_attendance_assemble_control/src/main/webapp/WEB-INF/web.xml
...tendance_assemble_control/src/main/webapp/WEB-INF/web.xml
+1
-0
o2server/x_bbs_assemble_control/src/main/webapp/WEB-INF/web.xml
...er/x_bbs_assemble_control/src/main/webapp/WEB-INF/web.xml
+1
-0
o2server/x_calendar_assemble_control/src/main/webapp/WEB-INF/web.xml
...calendar_assemble_control/src/main/webapp/WEB-INF/web.xml
+1
-0
o2server/x_cms_assemble_control/src/main/webapp/WEB-INF/web.xml
...er/x_cms_assemble_control/src/main/webapp/WEB-INF/web.xml
+1
-0
o2server/x_organization_assemble_control/src/main/webapp/WEB-INF/web.xml
...nization_assemble_control/src/main/webapp/WEB-INF/web.xml
+1
-0
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/read/ActionManageOpinion.java
...form/assemble/surface/jaxrs/read/ActionManageOpinion.java
+5
-12
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/ActionManageOpinion.java
...mble/surface/jaxrs/readcompleted/ActionManageOpinion.java
+5
-12
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionManageOpinion.java
...form/assemble/surface/jaxrs/task/ActionManageOpinion.java
+1
-7
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/taskcompleted/ActionManageOpinion.java
...mble/surface/jaxrs/taskcompleted/ActionManageOpinion.java
+5
-13
未找到文件。
o2server/configSample/query.json
浏览文件 @
454addd5
{
"crawlWorkCompleted"
:
{
"enable"
:
fals
e
,
"cron"
:
"50 50 2
2
* * ?"
,
"count"
:
20
00.0
,
"enable"
:
tru
e
,
"cron"
:
"50 50 2
1
* * ?"
,
"count"
:
5
00.0
,
"excludeAttachment"
:
[],
"excludeSite"
:
[],
"maxAttachmentSize"
:
5242880.0
,
"###enable"
:
"是否启用###"
,
"###cron"
:
"定时cron表达式.###"
,
"###count"
:
"每次处理的数量,默认每小时处理所以默认为
20
00,同时每次将重爬最旧的25%,按时间轮询25%.###"
,
"###count"
:
"每次处理的数量,默认每小时处理所以默认为
5
00,同时每次将重爬最旧的25%,按时间轮询25%.###"
,
"###excludeAttachment"
:
"忽略附件名称.###"
,
"###excludeSite"
:
"忽略附件位置.###"
,
"###maxAttachmentSize"
:
"最大附件大小.###"
},
"crawlWork"
:
{
"enable"
:
fals
e
,
"cron"
:
"40 40
7-21
* * ?"
,
"count"
:
10
0.0
,
"enable"
:
tru
e
,
"cron"
:
"40 40
10,12,14,16
* * ?"
,
"count"
:
5
0.0
,
"excludeAttachment"
:
[],
"excludeSite"
:
[],
"maxAttachmentSize"
:
5242880.0
,
"###enable"
:
"是否启用###"
,
"###cron"
:
"定时cron表达式.###"
,
"###count"
:
"每次处理的数量,默认每小时处理所以默认为
10
0,同时每次将重爬最旧的50%,按时间轮询50%.###"
,
"###count"
:
"每次处理的数量,默认每小时处理所以默认为
5
0,同时每次将重爬最旧的50%,按时间轮询50%.###"
,
"###excludeAttachment"
:
"忽略附件名称.###"
,
"###excludeSite"
:
"忽略附件位置.###"
,
"###maxAttachmentSize"
:
"最大附件大小.###"
},
"crawlCms"
:
{
"enable"
:
fals
e
,
"cron"
:
"30 30
7-21
* * ?"
,
"count"
:
10
0.0
,
"enable"
:
tru
e
,
"cron"
:
"30 30
9,12,15,18
* * ?"
,
"count"
:
3
0.0
,
"excludeAttachment"
:
[],
"maxAttachmentSize"
:
5242880.0
,
"###enable"
:
"是否启用###"
,
"###cron"
:
"定时cron表达式.###"
,
"###count"
:
"每次处理的数量,默认每小时处理所以默认为
10
0,同时每次将重爬最旧的50%,按时间轮询50%.###"
,
"###count"
:
"每次处理的数量,默认每小时处理所以默认为
3
0,同时每次将重爬最旧的50%,按时间轮询50%.###"
,
"###excludeAttachment"
:
"忽略附件名称.###"
,
"###maxAttachmentSize"
:
"最大附件大小.###"
},
...
...
o2server/x_attendance_assemble_control/src/main/webapp/WEB-INF/web.xml
0 → 100644
浏览文件 @
454addd5
<?xml version="1.0" encoding="UTF-8"?>
<web-app
id=
"x_attendance_assemble_control"
metadata-complete=
"false"
version=
"3.0"
><display-name>
x_attendance_assemble_control
</display-name><context-param><param-name>
project
</param-name><param-value>
com.x.base.core.project.x_attendance_assemble_control
</param-value></context-param><welcome-file-list><welcome-file>
/index.html
</welcome-file></welcome-file-list></web-app>
\ No newline at end of file
o2server/x_bbs_assemble_control/src/main/webapp/WEB-INF/web.xml
0 → 100644
浏览文件 @
454addd5
<?xml version="1.0" encoding="UTF-8"?>
<web-app
id=
"x_bbs_assemble_control"
metadata-complete=
"false"
version=
"3.0"
><display-name>
x_bbs_assemble_control
</display-name><context-param><param-name>
project
</param-name><param-value>
com.x.base.core.project.x_bbs_assemble_control
</param-value></context-param><welcome-file-list><welcome-file>
/index.html
</welcome-file></welcome-file-list></web-app>
\ No newline at end of file
o2server/x_calendar_assemble_control/src/main/webapp/WEB-INF/web.xml
0 → 100644
浏览文件 @
454addd5
<?xml version="1.0" encoding="UTF-8"?>
<web-app
id=
"x_calendar_assemble_control"
metadata-complete=
"false"
version=
"3.0"
><display-name>
x_calendar_assemble_control
</display-name><context-param><param-name>
project
</param-name><param-value>
com.x.base.core.project.x_calendar_assemble_control
</param-value></context-param><welcome-file-list><welcome-file>
/index.html
</welcome-file></welcome-file-list></web-app>
\ No newline at end of file
o2server/x_cms_assemble_control/src/main/webapp/WEB-INF/web.xml
0 → 100644
浏览文件 @
454addd5
<?xml version="1.0" encoding="UTF-8"?>
<web-app
id=
"x_cms_assemble_control"
metadata-complete=
"false"
version=
"3.0"
><display-name>
x_cms_assemble_control
</display-name><context-param><param-name>
project
</param-name><param-value>
com.x.base.core.project.x_cms_assemble_control
</param-value></context-param><welcome-file-list><welcome-file>
/index.html
</welcome-file></welcome-file-list></web-app>
\ No newline at end of file
o2server/x_organization_assemble_control/src/main/webapp/WEB-INF/web.xml
0 → 100644
浏览文件 @
454addd5
<?xml version="1.0" encoding="UTF-8"?>
<web-app
id=
"x_organization_assemble_control"
metadata-complete=
"false"
version=
"3.0"
><display-name>
x_organization_assemble_control
</display-name><context-param><param-name>
project
</param-name><param-value>
com.x.base.core.project.x_organization_assemble_control
</param-value></context-param><welcome-file-list><welcome-file>
/index.html
</welcome-file></welcome-file-list></web-app>
\ No newline at end of file
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/read/ActionManageOpinion.java
浏览文件 @
454addd5
package
com.x.processplatform.assemble.surface.jaxrs.read
;
import
java.util.Objects
;
import
com.google.gson.JsonElement
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.JpaObject
;
import
com.x.base.core.entity.annotation.CheckPersistType
;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
com.x.base.core.project.exception.ExceptionAccessDenied
;
import
com.x.base.core.project.exception.ExceptionEntityNotExist
;
...
...
@@ -12,13 +12,12 @@ import com.x.base.core.project.gson.GsonPropertyObject;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.jaxrs.WrapBoolean
;
import
com.x.base.core.project.tools.StringTools
;
import
com.x.processplatform.assemble.surface.Business
;
import
com.x.processplatform.core.entity.content.Read
;
import
com.x.processplatform.core.entity.element.Application
;
import
com.x.processplatform.core.entity.element.Process
;
import
java.util.Object
s
;
import
org.apache.commons.lang3.BooleanUtil
s
;
public
class
ActionManageOpinion
extends
BaseAction
{
...
...
@@ -33,17 +32,11 @@ public class ActionManageOpinion extends BaseAction {
}
Process
process
=
business
.
process
().
pick
(
read
.
getProcess
());
Application
application
=
business
.
application
().
pick
(
read
.
getApplication
());
if
(
!
business
.
canManageApplicationOrProcess
(
effectivePerson
,
application
,
process
))
{
if
(
BooleanUtils
.
isFalse
(
business
.
canManageApplicationOrProcess
(
effectivePerson
,
application
,
process
)
))
{
throw
new
ExceptionAccessDenied
(
effectivePerson
);
}
emc
.
beginTransaction
(
Read
.
class
);
if
(
StringTools
.
utf8Length
(
wi
.
getOpinion
())
>
JpaObject
.
length_255B
)
{
read
.
setOpinionLob
(
wi
.
getOpinion
());
read
.
setOpinion
(
StringTools
.
utf8SubString
(
wi
.
getOpinion
(),
JpaObject
.
length_255B
));
}
else
{
read
.
setOpinion
(
Objects
.
toString
(
wi
.
getOpinion
(),
""
));
read
.
setOpinionLob
(
null
);
}
read
.
setOpinion
(
Objects
.
toString
(
wi
.
getOpinion
(),
""
));
emc
.
commit
();
Wo
wo
=
new
Wo
();
wo
.
setValue
(
true
);
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/ActionManageOpinion.java
浏览文件 @
454addd5
package
com.x.processplatform.assemble.surface.jaxrs.readcompleted
;
import
java.util.Objects
;
import
com.google.gson.JsonElement
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.JpaObject
;
import
com.x.base.core.entity.annotation.CheckPersistType
;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
com.x.base.core.project.exception.ExceptionAccessDenied
;
import
com.x.base.core.project.exception.ExceptionEntityNotExist
;
...
...
@@ -12,13 +12,12 @@ import com.x.base.core.project.gson.GsonPropertyObject;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.jaxrs.WrapBoolean
;
import
com.x.base.core.project.tools.StringTools
;
import
com.x.processplatform.assemble.surface.Business
;
import
com.x.processplatform.core.entity.content.ReadCompleted
;
import
com.x.processplatform.core.entity.element.Application
;
import
com.x.processplatform.core.entity.element.Process
;
import
java.util.Object
s
;
import
org.apache.commons.lang3.BooleanUtil
s
;
public
class
ActionManageOpinion
extends
BaseAction
{
...
...
@@ -33,17 +32,11 @@ public class ActionManageOpinion extends BaseAction {
}
Process
process
=
business
.
process
().
pick
(
readCompleted
.
getProcess
());
Application
application
=
business
.
application
().
pick
(
readCompleted
.
getApplication
());
if
(
!
business
.
canManageApplicationOrProcess
(
effectivePerson
,
application
,
process
))
{
if
(
BooleanUtils
.
isFalse
(
business
.
canManageApplicationOrProcess
(
effectivePerson
,
application
,
process
)
))
{
throw
new
ExceptionAccessDenied
(
effectivePerson
);
}
emc
.
beginTransaction
(
ReadCompleted
.
class
);
if
(
StringTools
.
utf8Length
(
wi
.
getOpinion
())
>
JpaObject
.
length_255B
)
{
readCompleted
.
setOpinionLob
(
wi
.
getOpinion
());
readCompleted
.
setOpinion
(
StringTools
.
utf8SubString
(
wi
.
getOpinion
(),
JpaObject
.
length_255B
));
}
else
{
readCompleted
.
setOpinion
(
Objects
.
toString
(
wi
.
getOpinion
(),
""
));
readCompleted
.
setOpinionLob
(
null
);
}
readCompleted
.
setOpinion
(
Objects
.
toString
(
wi
.
getOpinion
(),
""
));
emc
.
commit
();
Wo
wo
=
new
Wo
();
wo
.
setValue
(
true
);
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionManageOpinion.java
浏览文件 @
454addd5
...
...
@@ -40,13 +40,7 @@ public class ActionManageOpinion extends BaseAction {
throw
new
ExceptionAccessDenied
(
effectivePerson
);
}
emc
.
beginTransaction
(
Read
.
class
);
if
(
StringTools
.
utf8Length
(
wi
.
getOpinion
())
>
JpaObject
.
length_255B
)
{
task
.
setOpinionLob
(
wi
.
getOpinion
());
task
.
setOpinion
(
StringTools
.
utf8SubString
(
wi
.
getOpinion
(),
JpaObject
.
length_255B
));
}
else
{
task
.
setOpinion
(
Objects
.
toString
(
wi
.
getOpinion
(),
""
));
task
.
setOpinionLob
(
null
);
}
task
.
setOpinion
(
Objects
.
toString
(
wi
.
getOpinion
(),
""
));
emc
.
commit
();
Wo
wo
=
new
Wo
();
wo
.
setValue
(
true
);
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/taskcompleted/ActionManageOpinion.java
浏览文件 @
454addd5
package
com.x.processplatform.assemble.surface.jaxrs.taskcompleted
;
import
java.util.Objects
;
import
com.google.gson.JsonElement
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.JpaObject
;
import
com.x.base.core.entity.annotation.CheckPersistType
;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
com.x.base.core.project.exception.ExceptionAccessDenied
;
import
com.x.base.core.project.exception.ExceptionEntityNotExist
;
...
...
@@ -14,13 +14,12 @@ import com.x.base.core.project.http.EffectivePerson;
import
com.x.base.core.project.jaxrs.WrapBoolean
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.tools.StringTools
;
import
com.x.processplatform.assemble.surface.Business
;
import
com.x.processplatform.core.entity.content.TaskCompleted
;
import
com.x.processplatform.core.entity.element.Application
;
import
com.x.processplatform.core.entity.element.Process
;
import
java.util.Object
s
;
import
org.apache.commons.lang3.BooleanUtil
s
;
public
class
ActionManageOpinion
extends
BaseAction
{
...
...
@@ -38,18 +37,11 @@ public class ActionManageOpinion extends BaseAction {
Process
process
=
business
.
process
().
pick
(
taskCompleted
.
getProcess
());
Application
application
=
business
.
application
().
pick
(
taskCompleted
.
getApplication
());
if
(
!
business
.
canManageApplicationOrProcess
(
effectivePerson
,
application
,
process
))
{
if
(
BooleanUtils
.
isFalse
(
business
.
canManageApplicationOrProcess
(
effectivePerson
,
application
,
process
)
))
{
throw
new
ExceptionAccessDenied
(
effectivePerson
);
}
emc
.
beginTransaction
(
TaskCompleted
.
class
);
if
(
StringTools
.
utf8Length
(
wi
.
getOpinion
())
>
JpaObject
.
length_255B
)
{
taskCompleted
.
setOpinionLob
(
wi
.
getOpinion
());
taskCompleted
.
setOpinion
(
StringTools
.
utf8SubString
(
wi
.
getOpinion
(),
JpaObject
.
length_255B
));
}
else
{
taskCompleted
.
setOpinion
(
Objects
.
toString
(
wi
.
getOpinion
(),
""
));
taskCompleted
.
setOpinionLob
(
null
);
}
taskCompleted
.
setOpinion
(
Objects
.
toString
(
wi
.
getOpinion
(),
""
));
emc
.
commit
();
Wo
wo
=
new
Wo
();
wo
.
setValue
(
true
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录