update web.mgr.machine module

web/src/main/java/cn/reghao/devops/web/mgr/machine/db/repository/MachineInfoRepository.java

@@ -17,6 +17,7 @@ public interface MachineInfoRepository extends JpaRepository<MachineInfo, Intege
     @Query("update MachineInfo u set u.stat=:stat where u.machineId=:machineId")
     @Modifying
     void updateMachineInfoByMachineId(@Param("machineId") String machineId, @Param("stat") int stat);
+    void deleteByMachineId(String machineId);
 
     MachineInfo findByMachineId(String machineId);
     List<MachineInfo> findByStat(int stat);

web/src/main/java/cn/reghao/devops/web/mgr/machine/model/po/MachineStat.java

@@ -1,23 +0,0 @@
-package cn.reghao.devops.web.mgr.machine.model.po;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author reghao
- * @date 2023-03-01 14:26:15
- */
-@Setter
-@Getter
-@Deprecated
-public class MachineStat {
-    private MachineHost machineHost;
-    private long bootTime;
-    private String status;
-
-    public MachineStat(MachineHost machineHost, String status) {
-        this.machineHost = machineHost;
-        this.bootTime = machineHost.getMachineInfo().getBootTime();
-        this.status = status;
-    }
-}

web/src/main/java/cn/reghao/devops/web/mgr/machine/service/MachineHostServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.reghao.devops.web.mgr.machine.service;
 
+import cn.reghao.devops.web.mgr.app.db.repository.log.DeployLogRepository;
 import cn.reghao.devops.web.mgr.app.service.config.AppDeployConfigService;
 import cn.reghao.devops.web.mgr.machine.db.repository.MachineHostRepository;
 import cn.reghao.devops.web.mgr.machine.db.repository.MachineInfoRepository;
@@ -25,6 +26,7 @@ public class MachineHostServiceImpl implements MachineHostService {
     private final MachineInfoRepository machineInfoRepository;
     private final MachineService machineService;
     private final AppDeployConfigService deployConfigService;
+    private DeployLogRepository deployLogRepository;
 
     public MachineHostServiceImpl(MachineHostRepository machineHostRepository,
                                   MachineInfoRepository machineInfoRepository,
@@ -69,13 +71,15 @@ public class MachineHostServiceImpl implements MachineHostService {
         return Result.result(ResultStatus.SUCCESS);
     }
 
+    private void checkDependencies(MachineHost machineHost) {
+        // AppDeploying -> AppDeployConfig -> DeployLog
+    }
+
     private void deleteMachine(MachineHost machineHost) {
+        deployLogRepository.deleteByMachineHost(machineHost);
         machineHostRepository.delete(machineHost);
         String machineId = machineHost.getMachineId();
-        MachineInfo machineInfo = machineInfoRepository.findByMachineId(machineId);
-        if (machineInfo != null) {
-            machineInfoRepository.delete(machineInfo);
-        }
+        machineInfoRepository.deleteByMachineId(machineId);
     }
 
     @Transactional

web/src/main/java/cn/reghao/devops/web/ws/event/MachineEventService.java

@@ -65,7 +65,7 @@ public class MachineEventService {
         }
     }
 
-    // TODO 根据 MachineStat 中的信息检查系统负载，CPU，内存，磁盘等使用情况(暂未实现)
+    // TODO 根据 EvtAgentHeartbeat 中的信息检查系统负载，CPU，内存，磁盘等使用情况(暂未实现)
     public void heartbeat(EvtAgentHeartbeat evtAgentHeartbeat) {
         String machineId = evtAgentHeartbeat.getMachineId();
         long timestamp = evtAgentHeartbeat.getTimestamp();