manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构收藏模块.

Browse Source
This commit is contained in:
lijiahang
2023-09-13 17:49:56 +08:00
parent a64481582f
commit 2ff0d37f07
15 changed files with 249 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/HostConfigService.java
View File

@@ -3,6 +3,7 @@ package com.orion.ops.module.asset.service;
import com.orion.ops.module.asset.entity.dto.host.HostConfigContent;
import com.orion.ops.module.asset.entity.request.host.HostConfigUpdateRequest;
import com.orion.ops.module.asset.entity.vo.HostConfigVO;
import com.orion.ops.module.asset.enums.HostConfigTypeEnum;
import java.util.List;
@@ -29,10 +30,9 @@ public interface HostConfigService {
*
* @param hostId hostId
* @param type type
* @param clazz class
* @return 配置
*/
<T extends HostConfigContent> T getHostConfig(Long hostId, String type, Class<T> clazz);
<T extends HostConfigContent> T getHostConfig(Long hostId, HostConfigTypeEnum type);
/**
* 获取配置

10
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostConfigServiceImpl.java
View File

@@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.lang.reflect.Type;
import java.util.List;
import java.util.stream.Collectors;
@@ -34,6 +35,7 @@ public class HostConfigServiceImpl implements HostConfigService {
@Override
public HostConfigVO getHostConfig(Long hostId, String type) {
Valid.valid(HostConfigTypeEnum::of, type);
// 查询配置
HostConfigDO config = hostConfigDAO.getHostConfigByHostId(hostId, type);
Valid.notNull(config, ErrorMessage.CONFIG_ABSENT);
@@ -44,11 +46,11 @@ public class HostConfigServiceImpl implements HostConfigService {
}
@Override
public <T extends HostConfigContent> T getHostConfig(Long hostId, String type, Class<T> clazz) {
public <T extends HostConfigContent> T getHostConfig(Long hostId, HostConfigTypeEnum type) {
// 查询配置
HostConfigDO config = hostConfigDAO.getHostConfigByHostId(hostId, type);
HostConfigDO config = hostConfigDAO.getHostConfigByHostId(hostId, type.name());
Valid.notNull(config, ErrorMessage.CONFIG_ABSENT);
return JSON.parseObject(config.getConfig(), clazz);
return JSON.parseObject(config.getConfig(), (Type) type.getType());
}
@Override
@@ -64,7 +66,7 @@ public class HostConfigServiceImpl implements HostConfigService {
@Override
public void updateHostConfig(HostConfigUpdateRequest request) {
String typeValue = request.getType();
HostConfigTypeEnum type = HostConfigTypeEnum.of(typeValue);
HostConfigTypeEnum type = Valid.valid(HostConfigTypeEnum::of, typeValue);
HostConfigContent requestConfig = JSON.parseObject(request.getConfig(), type.getType());
// 查询原配置
HostConfigDO record = hostConfigDAO.getHostConfigByHostId(request.getHostId(), typeValue);