Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DiDi
kafka-manager
提交
65e3782b
K
kafka-manager
项目概览
DiDi
/
kafka-manager
7 个月 前同步成功
通知
58
Star
6372
Fork
1229
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kafka-manager
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
65e3782b
编写于
4月 28, 2021
作者:
Z
zengqiao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
增加App与Topic自动化审批开关
上级
fe5cf2d9
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
16 addition
and
10 deletion
+16
-10
kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/op/AutoHandleTopicOrder.java
.../kafka/manager/task/dispatch/op/AutoHandleTopicOrder.java
+5
-6
kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/op/AutomatedHandleOrder.java
.../kafka/manager/task/dispatch/op/AutomatedHandleOrder.java
+7
-3
kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartBrokerController.java
...b/api/versionone/thirdpart/ThirdPartBrokerController.java
+1
-1
kafka-manager-web/src/main/resources/application.yml
kafka-manager-web/src/main/resources/application.yml
+3
-0
未找到文件。
kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/op/AutoHandleTopicOrder.java
浏览文件 @
65e3782b
package
com.xiaojukeji.kafka.manager.task.dispatch.op
;
import
com.alibaba.fastjson.JSON
;
import
com.xiaojukeji.kafka.manager.bpm.OrderService
;
import
com.xiaojukeji.kafka.manager.bpm.common.OrderStatusEnum
;
import
com.xiaojukeji.kafka.manager.bpm.common.OrderTypeEnum
;
...
...
@@ -11,6 +10,7 @@ import com.xiaojukeji.kafka.manager.common.constant.TopicCreationConstant;
import
com.xiaojukeji.kafka.manager.common.entity.ResultStatus
;
import
com.xiaojukeji.kafka.manager.common.entity.ao.config.CreateTopicElemConfig
;
import
com.xiaojukeji.kafka.manager.bpm.common.entry.apply.OrderExtensionApplyTopicDTO
;
import
com.xiaojukeji.kafka.manager.common.utils.JsonUtils
;
import
com.xiaojukeji.kafka.manager.common.utils.ListUtils
;
import
com.xiaojukeji.kafka.manager.common.utils.ValidateUtils
;
import
com.xiaojukeji.kafka.manager.common.entity.pojo.*
;
...
...
@@ -23,6 +23,7 @@ import com.xiaojukeji.kafka.manager.task.component.EmptyEntry;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
;
import
org.springframework.stereotype.Component
;
import
java.util.Arrays
;
...
...
@@ -35,6 +36,7 @@ import java.util.Properties;
*/
@Component
@CustomScheduled
(
name
=
"autoHandleTopicOrder"
,
cron
=
"0 0/1 * * * ?"
,
threadNum
=
1
)
@ConditionalOnProperty
(
prefix
=
"task.op.order-auto-exec"
,
name
=
"topic-enabled"
,
havingValue
=
"true"
,
matchIfMissing
=
false
)
public
class
AutoHandleTopicOrder
extends
AbstractScheduledTask
<
EmptyEntry
>
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
LogConstant
.
SCHEDULED_TASK_LOGGER
);
...
...
@@ -72,11 +74,8 @@ public class AutoHandleTopicOrder extends AbstractScheduledTask<EmptyEntry> {
Integer
maxPassedOrderNumPerTask
=
configService
.
getAutoPassedTopicApplyOrderNumPerTask
();
for
(
OrderDO
orderDO:
doList
)
{
if
(!
OrderTypeEnum
.
APPLY_TOPIC
.
getCode
().
equals
(
orderDO
.
getType
()))
{
continue
;
}
try
{
if
(!
handleApplyTopicOrder
(
orderDO
))
{
if
(!
OrderTypeEnum
.
APPLY_TOPIC
.
getCode
().
equals
(
orderDO
.
getType
())
&&
!
handleApplyTopicOrder
(
orderDO
))
{
continue
;
}
maxPassedOrderNumPerTask
-=
1
;
...
...
@@ -91,7 +90,7 @@ public class AutoHandleTopicOrder extends AbstractScheduledTask<EmptyEntry> {
}
private
boolean
handleApplyTopicOrder
(
OrderDO
orderDO
)
{
OrderExtensionApplyTopicDTO
dto
=
J
SON
.
parseObject
(
orderDO
.
getExtensions
(),
OrderExtensionApplyTopicDTO
.
class
);
OrderExtensionApplyTopicDTO
dto
=
J
sonUtils
.
stringToObj
(
orderDO
.
getExtensions
(),
OrderExtensionApplyTopicDTO
.
class
);
Long
physicalClusterId
=
logicalClusterMetadataManager
.
getPhysicalClusterId
(
dto
.
getClusterId
(),
dto
.
isPhysicalClusterId
());
...
...
kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/op/AutomatedHandleOrder.java
浏览文件 @
65e3782b
...
...
@@ -20,6 +20,7 @@ import com.xiaojukeji.kafka.manager.task.component.EmptyEntry;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
;
import
org.springframework.stereotype.Component
;
import
java.util.*
;
...
...
@@ -31,6 +32,7 @@ import java.util.*;
*/
@Component
@CustomScheduled
(
name
=
"automatedHandleOrder"
,
cron
=
"0 0/1 * * * ?"
,
threadNum
=
1
)
@ConditionalOnProperty
(
prefix
=
"task.op.order-auto-exec"
,
name
=
"app-enabled"
,
havingValue
=
"true"
,
matchIfMissing
=
false
)
public
class
AutomatedHandleOrder
extends
AbstractScheduledTask
<
EmptyEntry
>
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
LogConstant
.
SCHEDULED_TASK_LOGGER
);
...
...
@@ -51,6 +53,7 @@ public class AutomatedHandleOrder extends AbstractScheduledTask<EmptyEntry> {
public
void
processTask
(
EmptyEntry
entryEntry
)
{
List
<
OrderDO
>
waitDealOrderList
=
orderService
.
getWaitDealOrder
();
if
(
ValidateUtils
.
isEmptyList
(
waitDealOrderList
))
{
LOGGER
.
info
(
"class=AutomatedHandleOrder||method=processTask||msg=waiting deal order is empty"
);
return
;
}
...
...
@@ -65,17 +68,18 @@ public class AutomatedHandleOrder extends AbstractScheduledTask<EmptyEntry> {
}
private
void
handleAppApplyOrder
(
List
<
OrderDO
>
waitDealOrderList
,
List
<
OrderDO
>
passedOrderList
)
{
LOGGER
.
info
(
"
start handle app apply order.
"
);
LOGGER
.
info
(
"
class=AutomatedHandleOrder||method=processTask||msg=start handle app apply order
"
);
if
(
ValidateUtils
.
isEmptyList
(
waitDealOrderList
))
{
return
;
}
Integer
maxNum
=
Constant
.
HANDLE_APP_APPLY_MAX_NUM_DEFAULT
;
ConfigDO
configDO
=
configService
.
getByKey
(
Constant
.
HANDLE_APP_APPLY_MAX_NUM
);
if
(!
ValidateUtils
.
isNull
(
configDO
))
{
try
{
maxNum
=
Integer
.
parseInt
(
configDO
.
getConfigValue
());
}
catch
(
Exception
e
)
{
LOGGER
.
error
(
"
"
,
e
);
LOGGER
.
error
(
"
class=AutomatedHandleOrder||method=processTask||configDO={}||msg=config value illegal"
,
configDO
,
e
);
}
}
int
handleNum
=
Math
.
min
(
maxNum
-
passedOrderList
.
size
(),
waitDealOrderList
.
size
());
...
...
@@ -97,7 +101,7 @@ public class AutomatedHandleOrder extends AbstractScheduledTask<EmptyEntry> {
applyAppOrder
.
updateOrder
(
orderDO
,
baseDTO
,
Constant
.
AUTO_HANDLE_USER_NAME
);
}
}
catch
(
Exception
e
)
{
LOGGER
.
error
(
"
"
,
e
);
LOGGER
.
error
(
"
class=AutomatedHandleOrder||method=processTask||orderDO={}||msg=auto handle app order failed"
,
orderDO
,
e
);
}
}
}
...
...
kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartBrokerController.java
浏览文件 @
65e3782b
...
...
@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
@Api
(
tags
=
"开放接口-Broker相关接口(REST)"
)
@RestController
@RequestMapping
(
ApiPrefix
.
API_V1_THIRD_PART_OP_PREFIX
)
public
class
ThirdPart
Op
BrokerController
{
public
class
ThirdPartBrokerController
{
@Autowired
private
BrokerService
brokerService
;
...
...
kafka-manager-web/src/main/resources/application.yml
浏览文件 @
65e3782b
...
...
@@ -46,6 +46,9 @@ custom:
task
:
op
:
sync-topic-enabled
:
false
# 未落盘的Topic定期同步到DB中
order-auto-exec
:
# 工单自动化审批线程的开关
topic-enabled
:
false
# Topic工单自动化审批开关, false:关闭自动化审批, true:开启
app-enabled
:
false
# App工单自动化审批开关, false:关闭自动化审批, true:开启
account
:
ldap
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录