Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DiDi
kafka-manager
提交
74b57005
K
kafka-manager
项目概览
DiDi
/
kafka-manager
大约 1 年 前同步成功
通知
60
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,发现更多精彩内容 >>
未验证
提交
74b57005
编写于
7月 30, 2020
作者:
Z
ZQKC
提交者:
GitHub
7月 30, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #48 from ZQKC/master
扩分区工单详情优化
上级
61f0b67a
ba6abea6
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
52 addition
and
3 deletion
+52
-3
common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/po/OrderPartitionDO.java
...keji/kafka/manager/common/entity/po/OrderPartitionDO.java
+22
-0
dao/src/main/resources/mapper/OrderPartitionDao.xml
dao/src/main/resources/mapper/OrderPartitionDao.xml
+12
-0
doc/create_mysql_table.sql
doc/create_mysql_table.sql
+2
-0
doc/create_postgresql_table.sql
doc/create_postgresql_table.sql
+2
-0
docker/mysql/create_mysql_table.sql
docker/mysql/create_mysql_table.sql
+2
-0
web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/OrderController.java
...eji/kafka/manager/web/api/versionone/OrderController.java
+5
-1
web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/OrderConverter.java
...aojukeji/kafka/manager/web/converters/OrderConverter.java
+7
-2
未找到文件。
common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/po/OrderPartitionDO.java
浏览文件 @
74b57005
...
...
@@ -9,6 +9,10 @@ public class OrderPartitionDO extends BaseDO{
private
String
applicant
;
private
Integer
partitionNum
;
private
String
brokerList
;
private
Long
peakBytesIn
;
private
String
description
;
...
...
@@ -51,6 +55,22 @@ public class OrderPartitionDO extends BaseDO{
this
.
applicant
=
applicant
;
}
public
Integer
getPartitionNum
()
{
return
partitionNum
;
}
public
void
setPartitionNum
(
Integer
partitionNum
)
{
this
.
partitionNum
=
partitionNum
;
}
public
String
getBrokerList
()
{
return
brokerList
;
}
public
void
setBrokerList
(
String
brokerList
)
{
this
.
brokerList
=
brokerList
;
}
public
Long
getPeakBytesIn
()
{
return
peakBytesIn
;
}
...
...
@@ -98,6 +118,8 @@ public class OrderPartitionDO extends BaseDO{
", clusterName='"
+
clusterName
+
'\''
+
", topicName='"
+
topicName
+
'\''
+
", applicant='"
+
applicant
+
'\''
+
", partitionNum="
+
partitionNum
+
", brokerList='"
+
brokerList
+
'\''
+
", peakBytesIn="
+
peakBytesIn
+
", description='"
+
description
+
'\''
+
", orderStatus="
+
orderStatus
+
...
...
dao/src/main/resources/mapper/OrderPartitionDao.xml
浏览文件 @
74b57005
...
...
@@ -11,6 +11,8 @@
<result
column=
"cluster_name"
property=
"clusterName"
/>
<result
column=
"topic_name"
property=
"topicName"
/>
<result
column=
"applicant"
property=
"applicant"
/>
<result
column=
"partition_num"
property=
"partitionNum"
/>
<result
column=
"broker_list"
property=
"brokerList"
/>
<result
column=
"peak_bytes_in"
property=
"peakBytesIn"
/>
<result
column=
"description"
property=
"description"
/>
<result
column=
"order_status"
property=
"orderStatus"
/>
...
...
@@ -38,6 +40,16 @@
cluster_name=#{clusterName},
topic_name=#{topicName},
applicant=#{applicant},
<trim>
<if
test=
"partitionNum!=null"
>
partition_num=#{partitionNum},
</if>
</trim>
<trim>
<if
test=
"brokerList!=null"
>
broker_list=#{brokerList},
</if>
</trim>
peak_bytes_in=#{peakBytesIn},
description=#{description},
order_status=#{orderStatus},
...
...
doc/create_mysql_table.sql
浏览文件 @
74b57005
...
...
@@ -149,6 +149,8 @@ CREATE TABLE `order_partition` (
`cluster_id`
bigint
(
20
)
NOT
NULL
DEFAULT
'-1'
COMMENT
'集群ID'
,
`cluster_name`
varchar
(
128
)
NOT
NULL
DEFAULT
''
COMMENT
'集群名称'
,
`topic_name`
varchar
(
192
)
NOT
NULL
DEFAULT
''
COMMENT
'Topic名称'
,
`broker_list`
varchar
(
256
)
NOT
NULL
DEFAULT
''
COMMENT
'Broker列表, 逗号分割'
,
`partition_num`
int
(
11
)
NOT
NULL
DEFAULT
0
COMMENT
'新增分区数'
,
`applicant`
varchar
(
128
)
NOT
NULL
DEFAULT
''
COMMENT
'申请人'
,
`peak_bytes_in`
bigint
(
20
)
NOT
NULL
DEFAULT
'0'
COMMENT
'峰值流量'
,
`description`
text
COMMENT
'备注信息'
,
...
...
doc/create_postgresql_table.sql
浏览文件 @
74b57005
...
...
@@ -198,6 +198,8 @@ CREATE TABLE order_partition
cluster_name
varchar
(
128
)
NOT
NULL
DEFAULT
''
,
-- '集群名称',
topic_name
varchar
(
192
)
NOT
NULL
DEFAULT
''
,
-- 'Topic名称',
applicant
varchar
(
128
)
NOT
NULL
DEFAULT
''
,
-- '申请人',
partition_num
int
NOT
NULL
DEFAULT
'0'
,
-- '分区数',
broker_list
varchar
(
128
)
NOT
NULL
DEFAULT
''
,
-- 'Broker列表',
peak_bytes_in
bigint
NOT
NULL
DEFAULT
'0'
,
-- '峰值流量',
description
text
,
-- '备注信息',
order_status
int
NOT
NULL
DEFAULT
'0'
,
-- '工单状态',
...
...
docker/mysql/create_mysql_table.sql
浏览文件 @
74b57005
...
...
@@ -149,6 +149,8 @@ CREATE TABLE `order_partition` (
`cluster_id`
bigint
(
20
)
NOT
NULL
DEFAULT
'-1'
COMMENT
'集群ID'
,
`cluster_name`
varchar
(
128
)
NOT
NULL
DEFAULT
''
COMMENT
'集群名称'
,
`topic_name`
varchar
(
192
)
NOT
NULL
DEFAULT
''
COMMENT
'Topic名称'
,
`broker_list`
varchar
(
256
)
NOT
NULL
DEFAULT
''
COMMENT
'Broker列表, 逗号分割'
,
`partition_num`
int
(
11
)
NOT
NULL
DEFAULT
0
COMMENT
'新增分区数'
,
`applicant`
varchar
(
128
)
NOT
NULL
DEFAULT
''
COMMENT
'申请人'
,
`peak_bytes_in`
bigint
(
20
)
NOT
NULL
DEFAULT
'0'
COMMENT
'峰值流量'
,
`description`
text
COMMENT
'备注信息'
,
...
...
web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/OrderController.java
浏览文件 @
74b57005
...
...
@@ -332,7 +332,9 @@ public class OrderController {
return
new
Result
();
}
private
Result
expandTopic
(
ClusterDO
clusterDO
,
OrderPartitionExecModel
reqObj
,
OrderPartitionDO
orderPartitionDO
)
{
private
Result
expandTopic
(
ClusterDO
clusterDO
,
OrderPartitionExecModel
reqObj
,
OrderPartitionDO
orderPartitionDO
)
{
List
<
Integer
>
brokerIdList
=
regionService
.
getFullBrokerId
(
clusterDO
.
getId
(),
reqObj
.
getRegionIdList
(),
reqObj
.
getBrokerIdList
());
try
{
TopicMetadata
topicMetadata
=
new
TopicMetadata
();
...
...
@@ -343,6 +345,8 @@ public class OrderController {
if
(!
AdminTopicStatusEnum
.
SUCCESS
.
equals
(
adminTopicStatusEnum
))
{
return
new
Result
(
StatusCode
.
OPERATION_ERROR
,
adminTopicStatusEnum
.
getMessage
());
}
orderPartitionDO
.
setPartitionNum
(
reqObj
.
getPartitionNum
());
orderPartitionDO
.
setBrokerList
(
ListUtils
.
intList2String
(
brokerIdList
));
}
catch
(
Exception
e
)
{
logger
.
error
(
"expandTopic@OrderController, create failed, req:{}."
,
reqObj
);
return
new
Result
(
StatusCode
.
OPERATION_ERROR
,
Constant
.
KAFKA_MANAGER_INNER_ERROR
);
...
...
web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/OrderConverter.java
浏览文件 @
74b57005
...
...
@@ -86,7 +86,8 @@ public class OrderConverter {
public
static
OrderPartitionVO
convert2OrderPartitionVO
(
OrderPartitionDO
orderPartitionDO
,
TopicMetadata
topicMetadata
,
Long
maxAvgBytes
,
List
<
RegionDO
>
regionDOList
)
{
Long
maxAvgBytes
,
List
<
RegionDO
>
regionDOList
)
{
if
(
orderPartitionDO
==
null
)
{
return
null
;
}
...
...
@@ -100,8 +101,12 @@ public class OrderConverter {
if
(
topicMetadata
==
null
)
{
return
orderPartitionVO
;
}
orderPartitionVO
.
setPartitionNum
(
topicMetadata
.
getPartitionNum
());
orderPartitionVO
.
setPartitionNum
(
null
);
orderPartitionVO
.
setBrokerIdList
(
new
ArrayList
<>(
topicMetadata
.
getBrokerIdSet
()));
if
(
OrderStatusEnum
.
PASSED
.
getCode
().
equals
(
orderPartitionDO
.
getOrderStatus
()))
{
orderPartitionVO
.
setPartitionNum
(
orderPartitionDO
.
getPartitionNum
());
}
if
(
regionDOList
==
null
||
regionDOList
.
isEmpty
())
{
orderPartitionVO
.
setRegionNameList
(
new
ArrayList
<>());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录