[alert,webapp] 告警中心条件查询与搜索支持，支持批量已读未读

alerter/src/main/java/com/usthe/alert/controller/AlertDefineController.java

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.validation.Valid;
 
 import java.util.List;
-import java.util.Map;
 
 import static com.usthe.common.util.CommonConstants.MONITOR_NOT_EXIST_CODE;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;

alerter/src/main/java/com/usthe/alert/controller/AlertsController.java

@@ -14,6 +14,8 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -97,4 +99,16 @@ public class AlertsController {
         return ResponseEntity.ok(message);
     }
 
+    @PutMapping(path = "/status/{status}")
+    @ApiOperation(value = "批量修改告警状态", notes = "批量修改告警状态,设置已读未读")
+    public ResponseEntity<Message<Void>> applyAlertDefinesStatus(
+            @ApiParam(value = "告警状态值", example = "0") @PathVariable Byte status,
+            @ApiParam(value = "告警IDs", example = "6565463543") @RequestParam(required = false) List<Long> ids) {
+        if (ids != null && status != null && !ids.isEmpty()) {
+            alertService.editAlertStatus(status, ids);
+        }
+        Message<Void> message = new Message<>();
+        return ResponseEntity.ok(message);
+    }
+
 }

alerter/src/main/java/com/usthe/alert/dao/AlertDao.java

@@ -3,7 +3,11 @@ package com.usthe.alert.dao;
 import com.usthe.alert.pojo.entity.Alert;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -19,4 +23,13 @@ public interface AlertDao extends JpaRepository<Alert, Long>, JpaSpecificationEx
      */
     void deleteAlertsByIdIn(Set<Long> alertIds);
 
+    /**
+     * 根据告警ID-状态值 更新告警状态
+     * @param status 状态值
+     * @param ids 告警ID列表
+     */
+    @Modifying
+    @Query("update Alert set status = :status where id in :ids")
+    void updateAlertsStatus(@Param(value = "status") Byte status, @Param(value = "ids") List<Long> ids);
+
 }

alerter/src/main/java/com/usthe/alert/pojo/entity/Alert.java

@@ -67,7 +67,7 @@ public class Alert {
     @Length(max = 1024)
     private String content;
 
-    @ApiModelProperty(value = "告警状态: 0-正常告警 1-触发中:阈值触发但未达到告警次数 2-恢复告警",
+    @ApiModelProperty(value = "告警状态: 0-正常告警(未读) 1-阈值触发但未达到告警次数 2-恢复告警 3-已读已知",
             example = "1", accessMode = READ_WRITE, position = 7)
     @Min(0)
     @Max(2)

alerter/src/main/java/com/usthe/alert/service/AlertService.java

@@ -6,6 +6,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;
 
 import java.util.HashSet;
+import java.util.List;
 
 /**
  * 告警信息管理接口
@@ -34,4 +35,11 @@ public interface AlertService {
      * @param ids 告警IDs
      */
     void deleteAlerts(HashSet<Long> ids);
+
+    /**
+     * 根据告警ID-状态值 更新告警状态
+     * @param status 待修改为的告警状态
+     * @param ids 待修改的告警IDs
+     */
+    void editAlertStatus(Byte status, List<Long> ids);
 }

alerter/src/main/java/com/usthe/alert/service/impl/AlertServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashSet;
+import java.util.List;
 
 /**
  * 告警信息服务实现
@@ -40,4 +41,10 @@ public class AlertServiceImpl implements AlertService {
     public void deleteAlerts(HashSet<Long> ids) {
         alertDao.deleteAlertsByIdIn(ids);
     }
+
+    @Override
+    public void editAlertStatus(Byte status, List<Long> ids) {
+        alertDao.updateAlertsStatus(status, ids);
+    }
+
 }