feat: 提供组态告警分页查询

@@ -3,16 +3,15 @@ package org.thingsboard.server.controller.yunteng;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.ConfigurationAlarmPageDTO;
 import org.thingsboard.server.common.data.yunteng.dto.SysDictDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
@@ -46,11 +45,11 @@ public class TkAlarmInfoController extends BaseController {
   public TkPageData<TkAlarmEntity> pageAlarmInfo(
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE) int page,
-      @RequestParam(value = "status", required = false) List<AlarmStatus> status,
+      @RequestParam(value = "status", required = false) AlarmStatus status,
       @RequestParam(value = "alarmType", required = false) String alarmType,
       @RequestParam(value = "severity", required = false) AlarmSeverity severity,
       @RequestParam(value = "organizationId", required = false) String organizationId,
-      @RequestParam(value = "deviceIds", required = false) List<String> deviceIds,
+      @RequestParam(value = "deviceId", required = false) String deviceId,
       @RequestParam(value = "deviceName", required = false) String deviceName,
       @RequestParam(value = "deviceType", required = false) DeviceTypeEnum deviceType,
       @RequestParam(value = "startTime", required = false) Long startTime,
@@ -63,7 +62,15 @@ public class TkAlarmInfoController extends BaseController {
     pageFilter.put(PAGE, page);
     pageFilter.put(ORDER_FILED, orderBy);
     pageFilter.put(ORDER_TYPE, orderType);
-
+    List<String> deviceIds = null;
+    List<AlarmStatus> statuses = null;
+    if(!StringUtils.isEmpty(deviceId))
+    {
+      deviceIds = List.of(deviceId);
+    }
+    if(null !=status){
+      statuses = List.of(status);
+    }
     UUID customerId = null;
     if (getCurrentUser().isCustomerUser()) {
       customerId = getCurrentUser().getCustomerId().getId();
@@ -76,13 +83,53 @@ public class TkAlarmInfoController extends BaseController {
         alarmType,
         startTime,
         endTime,
-        status,
+        statuses,
         deviceIds,
         deviceName,
         deviceType,
         EntityType.DEVICE,
         organizationId);
   }
+  @ApiOperation(value = "组态告警查询")
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
+  @PostMapping("/configuration/page")
+  public TkPageData<TkAlarmEntity> pageAlarmInfoForConfiguration(@RequestBody ConfigurationAlarmPageDTO page) throws ThingsboardException {
+    Map<String, Object> pageFilter = new HashMap<>();
+    pageFilter.put(PAGE_SIZE, page.getPageSize());
+    pageFilter.put(PAGE, page.getPage());
+    pageFilter.put(ORDER_FILED, page.getOrderBy());
+    pageFilter.put(ORDER_TYPE, page.getOrderType());
+    UUID customerId = null;
+    if (getCurrentUser().isCustomerUser()) {
+      customerId = getCurrentUser().getCustomerId().getId();
+    }
+    AlarmSeverity severity = page.getSeverity();
+    AlarmStatus status = page.getStatus();
+    List<AlarmStatus> statuses = null;
+    if(null !=status){
+      statuses = List.of(status);
+    }
+    String alarmType = page.getAlarmType();
+    Long startTime = page.getStartTime();
+    Long endTime = page.getEndTime();
+    String deviceName = page.getDeviceName();
+    String organizationId = page.getOrganizationId();
+    DeviceTypeEnum deviceType = page.getDeviceType();
+    return alarmInfoService.alarmPage(
+            pageFilter,
+            getCurrentUser().getTenantId(),
+            customerId,
+            severity,
+            alarmType,
+            startTime,
+            endTime,
+            statuses,
+            page.getDeviceIds(),
+            deviceName,
+            deviceType,
+            EntityType.DEVICE,
+            organizationId);
+  }
 
   @ApiOperation(value = "告警类型")
   @GetMapping()

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class BasePageDTO {
+  @ApiModelProperty(required = true)
+  @NotNull(message = "分页大小不能为空")
+  private int pageSize;
+
+  @NotNull(message = "分页不能为空")
+  @ApiModelProperty(required = true)
+  private int page;
+
+  private String orderBy;
+  private OrderTypeEnum orderType;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Data
+public class ConfigurationAlarmPageDTO extends BasePageDTO {
+  private AlarmStatus status;
+  private String alarmType;
+  private String organizationId;
+
+  @ApiModelProperty(required = true)
+  @NotEmpty(message = "告警设备列表不能为空")
+  private List<String> deviceIds;
+
+  private String deviceName;
+  private DeviceTypeEnum deviceType;
+  private Long startTime;
+  private Long endTime;
+  private AlarmSeverity severity;
+}