Merge pull request #137 from stelin/main

Fixed bug

Author: stelin

openjob-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>openjob</artifactId>
         <groupId>io.openjob</groupId>
-        <version>1.0.4</version>
+        <version>1.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openjob-common</artifactId>

openjob-server/openjob-server-admin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>openjob-server</artifactId>
         <groupId>io.openjob</groupId>
-        <version>1.0.4</version>
+        <version>1.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openjob-server-admin</artifactId>

openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/AlertRuleController.java

@@ -0,0 +1,73 @@
+package io.openjob.server.admin.controller;
+
+import io.openjob.common.response.Result;
+import io.openjob.server.admin.request.alert.AddAlertRuleRequest;
+import io.openjob.server.admin.request.alert.DeleteAlertRuleRequest;
+import io.openjob.server.admin.request.alert.ListAlertRuleRequest;
+import io.openjob.server.admin.request.alert.UpdateAlertRuleRequest;
+import io.openjob.server.admin.request.alert.UpdateAlertRuleStatusRequest;
+import io.openjob.server.admin.service.AlertRuleService;
+import io.openjob.server.admin.vo.alert.AddAlertRuleVO;
+import io.openjob.server.admin.vo.alert.DeleteAlertRuleVO;
+import io.openjob.server.admin.vo.alert.ListAlertRuleVO;
+import io.openjob.server.admin.vo.alert.UpdateAlertRuleStatusVO;
+import io.openjob.server.admin.vo.alert.UpdateAlertRuleVO;
+import io.openjob.server.common.vo.PageVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * @author stelin [email protected]
+ * @since 1.0.5
+ */
+@Api(value = "Alert Rule", tags = "AlertRule")
+@RestController
+@RequestMapping("/admin/alert-rule")
+public class AlertRuleController {
+
+    private final AlertRuleService alertRuleService;
+
+    @Autowired
+    public AlertRuleController(AlertRuleService alertRuleService) {
+        this.alertRuleService = alertRuleService;
+    }
+
+    @ApiOperation("Add")
+    @PostMapping("/add")
+    public Result<AddAlertRuleVO> add(@Valid @RequestBody AddAlertRuleRequest request) {
+        return Result.success(this.alertRuleService.add(request));
+    }
+
+    @ApiOperation("Delete")
+    @PostMapping("/delete")
+    public Result<DeleteAlertRuleVO> delete(@Valid @RequestBody DeleteAlertRuleRequest request) {
+        return Result.success(this.alertRuleService.delete(request));
+    }
+
+    @ApiOperation("Update")
+    @PostMapping("/update")
+    public Result<UpdateAlertRuleVO> update(@Valid @RequestBody UpdateAlertRuleRequest request) {
+        return Result.success(this.alertRuleService.update(request));
+    }
+
+    @ApiOperation("Update status")
+    @PostMapping("/update-status")
+    public Result<UpdateAlertRuleStatusVO> updateStatus(@Valid @RequestBody UpdateAlertRuleStatusRequest request) {
+        return Result.success(this.alertRuleService.updateStatus(request));
+    }
+
+    @ApiOperation("List")
+    @GetMapping("/list")
+    public Result<PageVO<ListAlertRuleVO>> list(@Valid @ModelAttribute ListAlertRuleRequest request) {
+        return Result.success(this.alertRuleService.list(request));
+    }
+}

openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/alert/AddAlertRuleRequest.java

@@ -0,0 +1,49 @@
+package io.openjob.server.admin.request.alert;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @author stelin [email protected]
+ * @since 1.0.5
+ */
+@Data
+@ApiModel
+public class AddAlertRuleRequest {
+    @NotBlank
+    @ApiModelProperty(value = "Name", required = true)
+    private String name;
+
+    @NotNull
+    @ApiModelProperty(value = "Name", required = true)
+    private List<Integer> namespaceAppIds;
+
+    @NotNull
+    @ApiModelProperty(value = "Events")
+    private List<String> events;
+
+    @NotNull
+    @ApiModelProperty(value = "metrics")
+    private List<AlertRuleMetricsRequest> metrics;
+
+    @NotBlank
+    @ApiModelProperty(value = "Method", required = true)
+    private String method;
+
+    @NotBlank
+    @ApiModelProperty(value = "Url", required = true)
+    private String url;
+
+    @NotNull
+    @ApiModelProperty(value = "Status", required = true)
+    private Integer status;
+
+    protected static class AlertRuleMetricsRequest {
+
+    }
+}

openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/alert/DeleteAlertRuleRequest.java

@@ -0,0 +1,19 @@
+package io.openjob.server.admin.request.alert;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author stelin [email protected]
+ * @since 1.0.5
+ */
+@Data
+@ApiModel
+public class DeleteAlertRuleRequest {
+    @NotNull
+    @ApiModelProperty(value = "Id", required = true)
+    private Long id;
+}

openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/alert/ListAlertRuleRequest.java

@@ -0,0 +1,20 @@
+package io.openjob.server.admin.request.alert;
+
+import io.openjob.server.admin.request.PageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author stelin [email protected]
+ * @since 1.0.5
+ */
+@Data
+@ApiModel
+@EqualsAndHashCode(callSuper = true)
+public class ListAlertRuleRequest extends PageRequest {
+
+    @ApiModelProperty(value = "Name", required = true)
+    private String name;
+}

openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/alert/UpdateAlertRuleRequest.java

@@ -0,0 +1,22 @@
+package io.openjob.server.admin.request.alert;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author stelin [email protected]
+ * @since 1.0.5
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel
+public class UpdateAlertRuleRequest extends AddAlertRuleRequest {
+
+    @NotNull
+    @ApiModelProperty(value = "Id", required = true)
+    private Long id;
+}

openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/alert/UpdateAlertRuleStatusRequest.java

@@ -0,0 +1,24 @@
+package io.openjob.server.admin.request.alert;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author stelin [email protected]
+ * @since 1.0.5
+ */
+@Data
+@ApiModel
+public class UpdateAlertRuleStatusRequest {
+
+    @NotNull
+    @ApiModelProperty(value = "Id", required = true)
+    private Long id;
+
+    @NotNull
+    @ApiModelProperty(value = "status", required = true)
+    private Integer status;
+}

openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/AddDelayRequest.java

@@ -1,5 +1,6 @@
 package io.openjob.server.admin.request.delay;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -12,6 +13,7 @@
  * @since 1.0.0
  */
 @Data
+@ApiModel
 public class AddDelayRequest {
     @NotNull
     @ApiModelProperty(value = "Namespace id", required = true)

openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AlertRuleService.java

@@ -0,0 +1,60 @@
+package io.openjob.server.admin.service;
+
+import io.openjob.server.admin.request.alert.AddAlertRuleRequest;
+import io.openjob.server.admin.request.alert.DeleteAlertRuleRequest;
+import io.openjob.server.admin.request.alert.ListAlertRuleRequest;
+import io.openjob.server.admin.request.alert.UpdateAlertRuleRequest;
+import io.openjob.server.admin.request.alert.UpdateAlertRuleStatusRequest;
+import io.openjob.server.admin.vo.alert.AddAlertRuleVO;
+import io.openjob.server.admin.vo.alert.DeleteAlertRuleVO;
+import io.openjob.server.admin.vo.alert.ListAlertRuleVO;
+import io.openjob.server.admin.vo.alert.UpdateAlertRuleStatusVO;
+import io.openjob.server.admin.vo.alert.UpdateAlertRuleVO;
+import io.openjob.server.common.vo.PageVO;
+
+/**
+ * @author stelin [email protected]
+ * @since 1.0.5
+ */
+public interface AlertRuleService {
+
+    /**
+     * Add alert rule
+     *
+     * @param request request
+     * @return ListAlertRuleVO
+     */
+    AddAlertRuleVO add(AddAlertRuleRequest request);
+
+    /**
+     * Delete alert rule
+     *
+     * @param request request
+     * @return ListAlertRuleVO
+     */
+    DeleteAlertRuleVO delete(DeleteAlertRuleRequest request);
+
+    /**
+     * Update alert rule
+     *
+     * @param request request
+     * @return ListAlertRuleVO
+     */
+    UpdateAlertRuleVO update(UpdateAlertRuleRequest request);
+
+    /**
+     * Update alert rule status
+     *
+     * @param request request
+     * @return ListAlertRuleVO
+     */
+    UpdateAlertRuleStatusVO updateStatus(UpdateAlertRuleStatusRequest request);
+
+    /**
+     * List alert rule
+     *
+     * @param request request
+     * @return PageVO
+     */
+    PageVO<ListAlertRuleVO> list(ListAlertRuleRequest request);
+}