Skip to content

Commit ea9018c

Browse files
author
isacc
committed
[ADD] add flink node
1 parent bfc927a commit ea9018c

File tree

12 files changed

+157
-11
lines changed

12 files changed

+157
-11
lines changed

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,11 @@
143143
<artifactId>mapstruct</artifactId>
144144
<version>${org.mapstruct.version}</version>
145145
</dependency>
146+
<dependency>
147+
<groupId>com.alibaba</groupId>
148+
<artifactId>transmittable-thread-local</artifactId>
149+
<version>2.11.0</version>
150+
</dependency>
146151

147152
</dependencies>
148153

src/main/java/com/github/codingdebugallday/client/api/dto/ClusterDTO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class ClusterDTO implements Serializable {
2929

3030
private static final long serialVersionUID = 854464206375410197L;
3131

32-
public static final String FIELD_CLUSTER_ID = "clusterId";
32+
public static final String FIELD_CLUSTER_ID = "cluster_id";
3333

3434
private Long clusterId;
3535

src/main/java/com/github/codingdebugallday/client/api/dto/NodeDTO.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public class NodeDTO implements Serializable {
3737

3838
/**
3939
* {
40+
* "host": "xxx"
4041
* "username": "xxx",
4142
* "password": "xxx"
4243
* }

src/main/java/com/github/codingdebugallday/client/api/dto/NodeSettingInfo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
@JsonInclude(JsonInclude.Include.NON_NULL)
2020
public class NodeSettingInfo {
2121

22+
private String host;
2223
private String username;
2324
private String password;
2425
}

src/main/java/com/github/codingdebugallday/client/domain/entity/Node.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ public class Node implements Serializable {
3030

3131
private static final long serialVersionUID = 854464206375410197L;
3232

33-
public static final String FIELD_NODE_ID = "nodeId";
33+
public static final String FIELD_NODE_ID = "node_id";
34+
public static final String FIELD_CLUSTER_CODE = "cluster_code";
35+
public static final String FIELD_TENANT_ID = "tenant_id";
3436

3537
@TableId(type = IdType.AUTO)
3638
private Long nodeId;

src/main/java/com/github/codingdebugallday/client/domain/repository/ClusterRepository.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public interface ClusterRepository {
4444
* 根据clusterCode获取唯一条
4545
*
4646
* @param clusterCode clusterCode
47+
* @param tenantId 租户id
4748
* @return org.abigballofmud.flink.client.api.dto.ClusterDTO
4849
*/
49-
ClusterDTO selectOne(String clusterCode);
50+
ClusterDTO selectOne(String clusterCode, Long tenantId);
5051
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.github.codingdebugallday.client.domain.repository;
2+
3+
import java.util.List;
4+
5+
import com.github.codingdebugallday.client.api.dto.NodeDTO;
6+
7+
/**
8+
* <p>
9+
* description
10+
* </p>
11+
*
12+
* @author isacc 2020/03/28 2:20
13+
* @since 1.0
14+
*/
15+
public interface NodeRepository {
16+
17+
/**
18+
* 根据clusterCode获取flink节点集合
19+
*
20+
* @param clusterCode clusterCode
21+
* @param tenantId 租户id
22+
* @return org.abigballofmud.flink.client.api.dto.ClusterDTO
23+
*/
24+
List<NodeDTO> selectByClusterCode(String clusterCode, Long tenantId);
25+
}

src/main/java/com/github/codingdebugallday/client/infra/autoconfigure/FlinkApiAutoConfiguration.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package com.github.codingdebugallday.client.infra.autoconfigure;
22

33
import com.github.codingdebugallday.client.domain.repository.ClusterRepository;
4-
import com.github.codingdebugallday.client.infra.exceptions.RestTemplateErrorHandler;
4+
import com.github.codingdebugallday.client.domain.repository.NodeRepository;
55
import com.github.codingdebugallday.client.infra.context.FlinkApiContext;
6+
import com.github.codingdebugallday.client.infra.exceptions.RestTemplateErrorHandler;
67
import org.mybatis.spring.annotation.MapperScan;
78
import org.springframework.context.annotation.Bean;
89
import org.springframework.context.annotation.ComponentScan;
@@ -27,8 +28,10 @@
2728
public class FlinkApiAutoConfiguration {
2829

2930
@Bean
30-
public FlinkApiContext flinkApiContext(RestTemplate restTemplate, ClusterRepository clusterRepository) {
31-
return new FlinkApiContext(restTemplate, clusterRepository);
31+
public FlinkApiContext flinkApiContext(RestTemplate restTemplate,
32+
ClusterRepository clusterRepository,
33+
NodeRepository nodeRepository) {
34+
return new FlinkApiContext(restTemplate, clusterRepository, nodeRepository);
3235
}
3336

3437
@Bean("flinkRestTemplate")

src/main/java/com/github/codingdebugallday/client/infra/context/FlinkApiContext.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
import java.util.Objects;
55
import java.util.concurrent.ConcurrentHashMap;
66

7-
import com.github.codingdebugallday.client.domain.repository.ClusterRepository;
7+
import com.github.codingdebugallday.client.api.dto.ClusterDTO;
88
import com.github.codingdebugallday.client.app.service.FlinkApi;
9+
import com.github.codingdebugallday.client.domain.repository.ClusterRepository;
10+
import com.github.codingdebugallday.client.domain.repository.NodeRepository;
911
import org.springframework.web.client.RestTemplate;
1012

1113
/**
@@ -23,17 +25,22 @@ public class FlinkApiContext {
2325
private final RestTemplate flinkRestTemplate;
2426

2527
private final ClusterRepository clusterRepository;
28+
private final NodeRepository nodeRepository;
2629

2730
public FlinkApiContext(RestTemplate flinkRestTemplate,
28-
ClusterRepository clusterRepository) {
31+
ClusterRepository clusterRepository,
32+
NodeRepository nodeRepository) {
2933
this.flinkRestTemplate = flinkRestTemplate;
3034
this.clusterRepository = clusterRepository;
35+
this.nodeRepository = nodeRepository;
3136
}
3237

33-
public FlinkApi get(String clusterCode) {
38+
public FlinkApi get(String clusterCode, Long tenantId) {
3439
if (Objects.isNull(flinkApiMap.get(clusterCode))) {
3540
FlinkApi flinkApi = new FlinkApi(flinkRestTemplate);
36-
flinkApi.getApiClient().setClusterDTO(clusterRepository.selectOne(clusterCode));
41+
ClusterDTO clusterDTO = clusterRepository.selectOne(clusterCode, tenantId);
42+
clusterDTO.setNodeDTOList(nodeRepository.selectByClusterCode(clusterCode, tenantId));
43+
flinkApi.getApiClient().setClusterDTO(clusterDTO);
3744
flinkApiMap.put(clusterCode, flinkApi);
3845
return flinkApi;
3946
}

src/main/java/com/github/codingdebugallday/client/infra/repository/impl/ClusterRepositoryImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,10 @@ public ClusterDTO detail(Long tenantId, Long clusterId) {
5555
}
5656

5757
@Override
58-
public ClusterDTO selectOne(String clusterCode) {
58+
public ClusterDTO selectOne(String clusterCode,Long tenantId) {
5959
QueryWrapper<Cluster> queryWrapper = new QueryWrapper<>();
6060
queryWrapper.eq(Cluster.FIELD_CLUSTER_CODE, clusterCode);
61+
queryWrapper.eq(Cluster.FIELD_TENANT_ID, tenantId);
6162
Cluster cluster = clusterMapper.selectOne(queryWrapper);
6263
return ClusterConvertMapper.INSTANCE.entityToDTO(cluster);
6364
}

0 commit comments

Comments
 (0)