设置监控模块结构

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/controller/MachineHostController.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.machine.controller;
 
-import cn.reghao.autodop.dmaster.machine.service.MachineService;
+import cn.reghao.autodop.dmaster.machine.service.MachineHostService;
 import cn.reghao.jdkutil.result.WebBody;
 import cn.reghao.autodop.dmaster.machine.model.po.SshAuth;
 import cn.reghao.autodop.dmaster.notification.model.po.NotifyGroup;
@@ -23,9 +23,9 @@ import java.util.List;
 @RestController
 @RequestMapping("/api/machine/host")
 public class MachineHostController {
-    private final MachineService machineService;
+    private final MachineHostService machineService;
 
-    public MachineHostController(MachineService machineService) {
+    public MachineHostController(MachineHostService machineService) {
         this.machineService = machineService;
     }
 
@@ -44,15 +44,6 @@ public class MachineHostController {
         return ResponseEntity.ok().body(WebBody.success());
     }
 
-    @ApiOperation(value = "设置机器通知")
-    @PostMapping(value = "/notify/{machineId}", produces = MediaType.APPLICATION_JSON_VALUE)
-    @ResponseBody
-    public ResponseEntity<String> setMonitorNotify(@PathVariable("machineId") String machineId,
-                                                   @RequestParam("groupId") List<NotifyGroup> notifyGroups) {
-        machineService.setMachineNotify(machineId, notifyGroups);
-        return ResponseEntity.ok().body(WebBody.success());
-    }
-
     @ApiOperation(value = "删除机器")
     @DeleteMapping(value = "/{machineId}", produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<String> machine(@PathVariable("machineId") String machineId) {

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/service/MachineService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/service/MachineHostService.java

@@ -1,16 +1,12 @@
 package cn.reghao.autodop.dmaster.machine.service;
 
 import cn.reghao.autodop.dmaster.machine.model.po.SshAuth;
-import cn.reghao.autodop.dmaster.notification.model.po.NotifyGroup;
-
-import java.util.List;
 
 /**
  * @author reghao
  * @date 2019-11-15 08:48:04
  */
-public interface MachineService {
+public interface MachineHostService {
     void setEnv(String machineId, String env);
     void setSshAuth(String machineId, SshAuth sshAuth);
-    void setMachineNotify(String machineId, List<NotifyGroup> notifyGroups);
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/service/MachineServiceImpl.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/service/MachineHostServiceImpl.java

@@ -4,21 +4,18 @@ import cn.reghao.autodop.dmaster.machine.db.crud.MachineHostCrud;
 import cn.reghao.autodop.dmaster.machine.db.query.MachineHostQuery;
 import cn.reghao.autodop.dmaster.machine.model.po.MachineHost;
 import cn.reghao.autodop.dmaster.machine.model.po.SshAuth;
-import cn.reghao.autodop.dmaster.notification.model.po.NotifyGroup;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * @author reghao
  * @date 2019-11-15 08:48:04
  */
 @Service
-public class MachineServiceImpl implements MachineService {
+public class MachineHostServiceImpl implements MachineHostService {
     private final MachineHostQuery hostQuery;
     private final MachineHostCrud hostCrud;
 
-    public MachineServiceImpl(MachineHostQuery hostQuery, MachineHostCrud hostCrud) {
+    public MachineHostServiceImpl(MachineHostQuery hostQuery, MachineHostCrud hostCrud) {
         this.hostQuery = hostQuery;
         this.hostCrud = hostCrud;
     }
@@ -40,10 +37,4 @@ public class MachineServiceImpl implements MachineService {
         machineHost.setSshAuth(sshAuth);
         hostCrud.save(machineHost);
     }
-
-    @Override
-    public void setMachineNotify(String machineId, List<NotifyGroup> notifyGroups) {
-        MachineHost machineHost = hostQuery.findByMachineId(machineId);
-        hostCrud.save(machineHost);
-    }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/MonitorJob.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/service/task/MonitorJob.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.monitor;
+package cn.reghao.autodop.dmaster.monitor.service.task;
 
 import lombok.Getter;
 import lombok.Setter;

dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/MonitorJobData.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/service/task/MonitorJobData.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.monitor;
+package cn.reghao.autodop.dmaster.monitor.service.task;
 
 import cn.reghao.autodop.common.http.DefaultWebRequest;
 import cn.reghao.autodop.dmaster.app.db.query.AppRunningQuery;

dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/MonitorScheduler.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/service/task/MonitorScheduler.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.monitor;
+package cn.reghao.autodop.dmaster.monitor.service.task;
 
-import cn.reghao.autodop.dmaster.monitor.job.AppHealthCheckJob;
+import cn.reghao.autodop.dmaster.monitor.service.task.job.AppHealthCheckJob;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.*;
 import org.quartz.impl.StdSchedulerFactory;

dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/job/AppHealthCheckJob.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/service/task/job/AppHealthCheckJob.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.monitor.job;
+package cn.reghao.autodop.dmaster.monitor.service.task.job;
 
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Job;

dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/job/MachineStatCheckJob.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/service/task/job/MachineStatCheckJob.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.monitor.job;
+package cn.reghao.autodop.dmaster.monitor.service.task.job;
 
 import cn.reghao.autodop.dmaster.notification.service.NotifyService;
 import lombok.extern.slf4j.Slf4j;

dmaster/src/main/resources/templates/machine/host/notify.html

@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="/common/template :: header(~{::title},~{::link},~{::style})">
-    <style>
-        .layui-input-block{
-            margin-left: 20px;
-            margin-right: 20px;
-            margin-bottom: 70px;
-        }
-        .timo-compile .timo-finally{
-            position: fixed;
-            bottom: 0;
-            left: 0;
-            right: 0;
-            padding-bottom: 14px;
-            margin-bottom: 0;
-            background-color: #ffffff;
-        }
-    </style>
-</head>
-<body>
-<div class="layui-form timo-compile">
-    <form th:action="@{'/api/machine/host/notify/'+ ${machineId}}">
-        <div class="layui-form-item">
-            <div class="layui-input-block">
-                <input th:each="item:${list}" type="checkbox" name="groupId" th:title="${item.groupId}"
-                       th:value="${item.id}" th:checked="${#sets.contains(currentSet, item)}" lay-skin="primary">
-            </div>
-        </div>
-        <div class="layui-form-item timo-finally">
-            <button class="layui-btn ajax-submit"><i class="fa fa-check-circle"></i> 保存</button>
-            <button class="layui-btn btn-secondary close-popup"><i class="fa fa-times-circle"></i> 关闭</button>
-        </div>
-    </form>
-</div>
-<script th:replace="/common/template :: script"></script>
-</body>
-</html>