fix: 告警分页信息

1、新增组织信息
2、告警状态可多选

@@ -49,7 +49,7 @@ public class YtAlarmInfoController extends BaseController {
     public YtPageData<YtAlarmEntity> pageAlarmInfo(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
-            @RequestParam(value = "status", required = false) AlarmStatus status,
+            @RequestParam(value = "status", required = false) List<AlarmStatus> status,
             @RequestParam(value = "textSearch", required = false) String textSearch,
             @RequestParam(value = "alarmType", required = false) String alarmType,
             @RequestParam(value = "organizationId", required = false) String organizationId,

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.JsonNode;
+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.utils.YtDateTimeUtils;
 
+import javax.validation.constraints.NotEmpty;
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_COLUMN_FAMILY_NAME;
@@ -78,6 +80,8 @@ public class YtAlarmEntity {
   @TableField()
   private String propagateRelationTypes;
 
+  private String organizationId;
+  private String organizationName;
 
   public String getStartTs() {
     return YtDateTimeUtils.formate(this.startTs);

@@ -42,7 +42,7 @@ public class YtAlarmInfoServiceImpl  implements YtAlarmInfoService  {
 private final YtAlarmMapper ytJpaAarmDao;
 private final OrganizationMapper organizationMapper;
   @Override
-  public YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, String alarmType, Long startTime, Long endTime, AlarmStatus status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId) {
+  public YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, String alarmType, Long startTime, Long endTime, List<AlarmStatus> status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId) {
     IPage<YtAlarmEntity> page= getPage(pageMap, ModelConstants.CREATED_TIME_PROPERTY,false);
     List<String> ids =new ArrayList<>();
     if(StringUtils.isNotBlank(organizationId)){

@@ -28,7 +28,7 @@ public interface YtAlarmMapper extends BaseMapper<YtAlarmEntity> {
           ,@Param("alarmType")String alarmType
           ,@Param("startTime")Long startTime
           ,@Param("endTime")Long endTime
-          ,@Param("status")AlarmStatus status
+          ,@Param("status")List<AlarmStatus> status
           ,@Param("deviceId")String deviceId
           ,@Param("deviceType") DeviceTypeEnum deviceType
           ,@Param("originatorType") EntityType originatorType

@@ -35,7 +35,7 @@ public interface YtAlarmInfoService {
      * @param organizationId    告警所属组织
      * @return
      */
-    YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, String alarmType, Long startTime, Long endTime, AlarmStatus status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId);
+    YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, String alarmType, Long startTime, Long endTime, List<AlarmStatus> status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId);
 
 
     /**

@@ -20,6 +20,9 @@
         <result property="clearTs" column="clear_ts"/>
         <result property="details" column="additional_info" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="propagate" column="propagate"/>
+        <result property="organizationId" column="organization_id"/>
+        <result property="organizationName" column="organization_name"/>
+
     </resultMap>
 
     <resultMap type="org.thingsboard.server.dao.yunteng.entities.SysDict" id="alarmType">
@@ -34,8 +37,10 @@
 
 
     <select id="alarmPage" resultMap="alarmInfo">
-        SELECT d.name AS device_name,d.id device_id,m.*
-        FROM alarm m LEFT JOIN iotfs_device d ON m.originator_id = d.tb_device_id::uuid
+        SELECT d.name AS device_name,d.id device_id,m.*,d.organization_id,org.name organization_name
+        FROM alarm m
+        LEFT JOIN iotfs_device d ON m.originator_id = d.tb_device_id::uuid
+        LEFT JOIN iotfs_organization org ON org.id = d.organization_id
         <where>
             m.tenant_id = #{tenantId}
             <if test="alarmType!=null">
@@ -48,7 +53,10 @@
                 AND created_time 	&lt;= #{endTime}
             </if>
             <if test="status!=null">
-                AND status =  #{status.name}
+                AND status IN
+                <foreach collection="status" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
             </if>
             <if test="deviceId!=null">
                 AND d.id = #{deviceId}