Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Improvement][datasophon-service]The rack information displayed in the host management shows the actual name instead of the rack #436

Merged
merged 7 commits into from
Oct 25, 2023
Merged

[Improvement][datasophon-service]The rack information displayed in the host management shows the actual name instead of the rack #436

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8385d7e
Improve host-level service startup
thomasg19930417 Sep 28, 2023
910423a
Merge branch 'datavane:dev' into dev
thomasg19930417 Oct 13, 2023
5f3009e
Merge branch 'datavane:dev' into dev
thomasg19930417 Oct 23, 2023
a81e46f
Integrating Apache Kyuubi service.
thomasg19930417 Oct 23, 2023
b690628
Add ApacheKyuubi doc
thomasg19930417 Oct 24, 2023
3dafc4e
The rack information displayed in the host management shows the actua…
thomasg19930417 Oct 24, 2023
9bc85ee
Merge branch 'datavane:dev' into dev
thomasg19930417 Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ...on-service/src/main/java/com/datasophon/api/service/host/impl/ClusterHostServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.datasophon.api.master.ActorUtils;
import com.datasophon.api.master.PrometheusActor;
import com.datasophon.api.master.RackActor;
import com.datasophon.api.service.ClusterRackService;
import com.datasophon.api.service.host.ClusterHostService;
import com.datasophon.api.service.ClusterInfoService;
import com.datasophon.api.service.ClusterServiceRoleInstanceService;
Expand All @@ -39,6 +40,7 @@
import com.datasophon.common.utils.Result;
import com.datasophon.dao.entity.ClusterHostDO;
import com.datasophon.dao.entity.ClusterInfoEntity;
import com.datasophon.dao.entity.ClusterRack;
import com.datasophon.dao.entity.ClusterServiceRoleInstanceEntity;
import com.datasophon.domain.host.enums.HostState;
import com.datasophon.dao.enums.RoleType;
Expand Down Expand Up @@ -74,6 +76,9 @@ public class ClusterHostServiceImpl extends ServiceImpl<ClusterHostMapper, Clust
@Autowired
ClusterInfoService clusterInfoService;

@Autowired
ClusterRackService clusterRackService;

private final String IP = "ip";

@Override
Expand All @@ -96,6 +101,10 @@ public Result listByPage(Integer clusterId, String hostname, String ip, String c
.orderByAsc("asc".equals(orderType), orderField)
.orderByDesc("desc".equals(orderType), orderField)
.last("limit " + offset + "," + pageSize));

// 回显rack的名称 而不是ID
Map<String, String> rackMap = clusterRackService.queryClusterRack(clusterId).stream()
.collect(Collectors.toMap(obj->obj.getId()+"", ClusterRack::getRack));
for (ClusterHostDO clusterHostDO : list) {
QueryHostListPageDTO queryHostListPageDTO = new QueryHostListPageDTO();
BeanUtils.copyProperties(clusterHostDO,queryHostListPageDTO);
Expand All @@ -104,6 +113,7 @@ public Result listByPage(Integer clusterId, String hostname, String ip, String c
.eq(Constants.HOSTNAME, clusterHostDO.getHostname()));
queryHostListPageDTO.setServiceRoleNum(serviceRoleNum);
queryHostListPageDTO.setHostState(clusterHostDO.getHostState().getValue());
queryHostListPageDTO.setRack(rackMap.getOrDefault(queryHostListPageDTO.getRack(),"/default-rack"));
hostListPageDTOS.add(queryHostListPageDTO);
}
int count = this.count(new QueryWrapper<ClusterHostDO>().eq(Constants.CLUSTER_ID, clusterId)
Expand Down