|
|
@@ -3,7 +3,6 @@ package cn.reghao.devops.web.mgr.machine.service.impl;
|
|
|
import cn.reghao.devops.common.msg.constant.NodeStatus;
|
|
|
import cn.reghao.devops.common.msg.event.EvtAgentHeartbeat;
|
|
|
import cn.reghao.devops.common.msg.event.EvtAgentStart;
|
|
|
-import cn.reghao.devops.web.mgr.app.service.AppDeployService;
|
|
|
import cn.reghao.devops.web.mgr.machine.db.query.MachineQuery;
|
|
|
import cn.reghao.devops.web.mgr.machine.db.repository.MachineHostRepository;
|
|
|
import cn.reghao.devops.web.mgr.machine.db.repository.MachineInfoRepository;
|
|
|
@@ -32,15 +31,12 @@ import java.util.stream.Collectors;
|
|
|
public class MachineServiceImpl implements MachineService {
|
|
|
private final MachineHostRepository machineHostRepository;
|
|
|
private final MachineInfoRepository machineInfoRepository;
|
|
|
- private final AppDeployService appDeployService;
|
|
|
private final MachineQuery machineQuery;
|
|
|
|
|
|
- public MachineServiceImpl(MachineHostRepository machineHostRepository,
|
|
|
- MachineInfoRepository machineInfoRepository,
|
|
|
- AppDeployService appDeployService, MachineQuery machineQuery) {
|
|
|
+ public MachineServiceImpl(MachineHostRepository machineHostRepository, MachineInfoRepository machineInfoRepository,
|
|
|
+ MachineQuery machineQuery) {
|
|
|
this.machineHostRepository = machineHostRepository;
|
|
|
this.machineInfoRepository = machineInfoRepository;
|
|
|
- this.appDeployService = appDeployService;
|
|
|
this.machineQuery = machineQuery;
|
|
|
}
|
|
|
|
|
|
@@ -132,7 +128,6 @@ public class MachineServiceImpl implements MachineService {
|
|
|
return Result.result(ResultStatus.FAIL, "只能删除 Deprecated 状态的机器");
|
|
|
}
|
|
|
|
|
|
- appDeployService.deleteByMachineHost(machineHost);
|
|
|
machineHostRepository.deleteByMachineId(machineId);
|
|
|
machineInfoRepository.deleteByMachineId(machineId);
|
|
|
return Result.result(ResultStatus.SUCCESS);
|