feat: 告警中心

1、添加UUID数据处理函数
2、日期时间格式化工具
3、告警接口基于Mybatis实现

@@ -15,6 +15,7 @@
  */
  */
 package org.thingsboard.server.controller;
 package org.thingsboard.server.controller;
 
 
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -71,6 +72,7 @@ import static org.thingsboard.server.controller.ControllerConstants.UUID_WIKI_LI
 @RestController
 @RestController
 @TbCoreComponent
 @TbCoreComponent
 @RequestMapping("/api")
 @RequestMapping("/api")
+@Api(tags = {"告警"})
 public class AlarmController extends BaseController {
 public class AlarmController extends BaseController {
 
 
     public static final String ALARM_ID = "alarmId";
     public static final String ALARM_ID = "alarmId";
@@ -102,7 +104,7 @@ public class AlarmController extends BaseController {
         }
         }
     }
     }
 
 
-    @ApiOperation(value = "Get Alarm Info (getAlarmInfoById)",
+    @ApiOperation(value = "详情",
             notes = "Fetch the Alarm Info object based on the provided Alarm Id. " +
             notes = "Fetch the Alarm Info object based on the provided Alarm Id. " +
                     ALARM_SECURITY_CHECK + ALARM_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
                     ALARM_SECURITY_CHECK + ALARM_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@@ -178,7 +180,7 @@ public class AlarmController extends BaseController {
         }
         }
     }
     }
 
 
-    @ApiOperation(value = "Acknowledge Alarm (ackAlarm)",
+    @ApiOperation(value = "处理",
             notes = "Acknowledge the Alarm. " +
             notes = "Acknowledge the Alarm. " +
                     "Once acknowledged, the 'ack_ts' field will be set to current timestamp and special rule chain event 'ALARM_ACK' will be generated. " +
                     "Once acknowledged, the 'ack_ts' field will be set to current timestamp and special rule chain event 'ALARM_ACK' will be generated. " +
                     "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
                     "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -202,7 +204,7 @@ public class AlarmController extends BaseController {
         }
         }
     }
     }
 
 
-    @ApiOperation(value = "Clear Alarm (clearAlarm)",
+    @ApiOperation(value = "清除",
             notes = "Clear the Alarm. " +
             notes = "Clear the Alarm. " +
                     "Once cleared, the 'clear_ts' field will be set to current timestamp and special rule chain event 'ALARM_CLEAR' will be generated. " +
                     "Once cleared, the 'clear_ts' field will be set to current timestamp and special rule chain event 'ALARM_CLEAR' will be generated. " +
                     "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
                     "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)

@@ -3,10 +3,12 @@ package org.thingsboard.server.controller.yunteng;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
+import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
@@ -15,8 +17,13 @@ import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.entities.YtAlarmEntity;
 import org.thingsboard.server.dao.yunteng.service.YtAlarmInfoService;
 import org.thingsboard.server.dao.yunteng.service.YtAlarmInfoService;
 
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 
 /**
 /**
@@ -34,9 +41,9 @@ public class YtAlarmInfoController extends BaseController {
 
 
 
 
     //分页测试通过
     //分页测试通过
-    @ApiOperation(value="设备告警信息")
+    @ApiOperation(value="查询")
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @GetMapping(params = {PAGE_SIZE, PAGE})
-    public YtPageData<AlarmInfo> pageAlarmInfo(
+    public YtPageData<YtAlarmEntity> pageAlarmInfo(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
             @RequestParam(PAGE) int page,
             @RequestParam(value = "status", required = false) AlarmStatus status,
             @RequestParam(value = "status", required = false) AlarmStatus status,
@@ -49,8 +56,16 @@ public class YtAlarmInfoController extends BaseController {
             @RequestParam(value = ORDER_FILED, required = false) String orderBy,
             @RequestParam(value = ORDER_FILED, required = false) String orderBy,
             @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) throws ThingsboardException {
             @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) throws ThingsboardException {
         TimePageLink pageLink = createTimePageLink(pageSize, page > 1 ? page - 1 : 0, textSearch, orderBy, orderType == null ? "" : orderType.name(), startTime, endTime);
         TimePageLink pageLink = createTimePageLink(pageSize, page > 1 ? page - 1 : 0, textSearch, orderBy, orderType == null ? "" : orderType.name(), startTime, endTime);
+        Map<String, Object> pageFilter = new HashMap<>();
+        pageFilter.put(PAGE_SIZE, pageSize);
+        pageFilter.put(PAGE, page);
+        pageFilter.put(ORDER_FILED, orderBy);
+        if (orderType != null) {
+            pageFilter.put(ORDER_TYPE, orderType.name());
+        }
+
 
 
-        return alarmInfoService.page(pageLink,getCurrentUser().getTenantId(),alarmType,status,organizationId,deviceId);
+        return alarmInfoService.alarmPage(pageFilter,getCurrentUser().getTenantId(),alarmType,startTime,endTime,status,deviceId, EntityType.DEVICE,organizationId);
     }
     }
 
 
 
 

+package org.thingsboard.server.common.data.yunteng.utils;
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @version V1.0
+ * @Description :
+ * 1.其它地方抛出异常，交由控制层统一处理
+ * 2.服务层注意持久化的事务管理
+ * @Dependency: 依赖包
+ * @Author: junlianglee
+ * @Date Created in 2021/12/28$
+ * @Copyright 2016-2018  - Powered By 李唐源研发中心
+ */
+public class YtDateTimeUtils {
+    public static final String PATTERN_DATE_FORMATE="yyyy-MM-dd HH:mm:ss";
+
+    public static String formate(Long nacosTime) {
+        if(nacosTime == null){
+            return null;
+        }
+        LocalDateTime createTime = LocalDateTime.ofEpochSecond(nacosTime/1000,0, OffsetDateTime.now().getOffset());
+        return createTime.format(DateTimeFormatter.ofPattern(PATTERN_DATE_FORMATE));
+    }
+
+}

+package org.thingsboard.server.dao.yunteng.entities;
+
+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 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 java.util.UUID;
+
+import static org.thingsboard.server.dao.model.ModelConstants.ALARM_COLUMN_FAMILY_NAME;
+
+@Data
+@TableName(ALARM_COLUMN_FAMILY_NAME)
+public class YtAlarmEntity {
+
+  private static final long serialVersionUID = -4922707705163155569L;
+
+  @TableId()
+  private UUID id;
+  private UUID tenantId;
+
+  @TableField()
+  private String creator;
+
+  @TableField()
+  private String updater;
+
+  @TableField()
+  private long createdTime;
+
+  @TableField()
+  private long updatedTime;
+
+
+  @TableField()
+  private UUID customerId;
+
+  @TableField()
+  private UUID tbDeviceId;
+  @TableField()
+  private int originatorType;
+  @TableField()
+  private String deviceId;
+
+  private String deviceName;
+
+  @TableField()
+  private String type;
+
+  @TableField()
+  private AlarmSeverity severity;
+
+  @TableField()
+  private AlarmStatus status;
+
+  @TableField()
+  private Long startTs;
+
+  @TableField()
+  private Long endTs;
+
+  @TableField()
+  private Long ackTs;
+
+  @TableField()
+  private Long clearTs;
+
+  @TableField()
+  private JsonNode details;
+
+  @TableField()
+  private Boolean propagate;
+
+  @TableField()
+  private String propagateRelationTypes;
+
+
+  public String getStartTs() {
+    return YtDateTimeUtils.formate(this.startTs);
+  }
+
+  public String getEndTs() {
+    return YtDateTimeUtils.formate(this.endTs);
+  }
+
+  public String getAckTs() {
+    return YtDateTimeUtils.formate(this.ackTs);
+  }
+
+  public String getClearTs() {
+    return YtDateTimeUtils.formate(this.clearTs);
+  }
+
+  public String getCreatedTime() {
+    return YtDateTimeUtils.formate(this.createdTime);
+  }
+
+  public String getUpdatedTime() {
+    return YtDateTimeUtils.formate(this.updatedTime);
+  }
+}

 package org.thingsboard.server.dao.yunteng.impl;
 package org.thingsboard.server.dao.yunteng.impl;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
-import org.thingsboard.server.dao.service.Validator;
-import org.thingsboard.server.dao.yunteng.jpa.dao.YtJpaAarmDao;
+import org.thingsboard.server.dao.yunteng.entities.AlarmContact;
+import org.thingsboard.server.dao.yunteng.entities.YtAlarmEntity;
+import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
+import org.thingsboard.server.dao.yunteng.mapper.YtAlarmMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.YtAlarmInfoService;
 import org.thingsboard.server.dao.yunteng.service.YtAlarmInfoService;
 
 
+import java.util.*;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
+
 /** @Description 告警中心业务实现 @Author cxy @Date 2021/11/10 16:56 */
 /** @Description 告警中心业务实现 @Author cxy @Date 2021/11/10 16:56 */
 @Service
 @Service
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 @Slf4j
 @Slf4j
-public class YtAlarmInfoServiceImpl implements YtAlarmInfoService {
+public class YtAlarmInfoServiceImpl  implements YtAlarmInfoService  {
 
 
-private final YtJpaAarmDao ytJpaAarmDao;
+private final YtAlarmMapper ytJpaAarmDao;
+private final OrganizationMapper organizationMapper;
   @Override
   @Override
-  public YtPageData<AlarmInfo> page(TimePageLink pageLink, TenantId tenantId, String alarmType, AlarmStatus status, String organizationId,String deviceId) {
-    Validator.validatePageLink(pageLink);
-    PageData<AlarmInfo> tbDatas = ytJpaAarmDao.pageAlarms(pageLink,tenantId,alarmType,status,null,deviceId);
-    YtPageData<AlarmInfo> result = new YtPageData<>(tbDatas.getData(), tbDatas.getTotalPages());
+  public YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, String alarmType, Long startTime, Long endTime, AlarmStatus status, String deviceId, EntityType originatorType, String organizationId) {
+    IPage<YtAlarmEntity> page= getPage(pageMap, FastIotConstants.DefaultOrder.CREATE_TIME,false);
+    List<String> ids =new ArrayList<>();
+    if(StringUtils.isNotBlank(organizationId)){
+      Collection filter = Collections.emptyList();
+      filter.add(organizationId);
+      List<OrganizationDTO> all =organizationMapper.findOrganizationTreeList(tenantId.getId().toString(),filter);
+      for(OrganizationDTO item:all){
+        ids.add(item.getId());
+      }
+
+    }
+
+    IPage<YtAlarmEntity> tbDatas = ytJpaAarmDao.alarmPage(page,tenantId.getId(),alarmType,startTime,endTime,status,deviceId, originatorType,ids.size()>0?ids:null);
+    YtPageData<YtAlarmEntity> result = new YtPageData<>(tbDatas.getRecords(), tbDatas.getTotal());
     return result;
     return result;
   }
   }
 
 
 
 
+  protected IPage<YtAlarmEntity> getPage(Map<String, Object> params, String defaultOrderField, boolean isAsc) {
+    int curPage = 1;
+    int limit = 10;
+    if (params.get(PAGE) != null) {
+      curPage = Integer.parseInt(params.get(PAGE).toString());
+    }
+
+    if (params.get(PAGE_SIZE) != null) {
+      limit = Integer.parseInt(params.get(PAGE_SIZE).toString());
+    }
+
+    Page<YtAlarmEntity> page = new Page<>(curPage, limit);
+    String orderField = (String) params.get(ORDER_FILED);
+    String order = (String) params.get(ORDER_TYPE);
+    if (StringUtils.isNotBlank(orderField) && StringUtils.isNotBlank(order)) {
+      return OrderTypeEnum.ASC.name().equalsIgnoreCase(order)
+              ? page.addOrder(OrderItem.asc(orderField))
+              : page.addOrder(OrderItem.desc(orderField));
+    } else if (StringUtils.isBlank(defaultOrderField)) {
+      return page;
+    } else {
+      if (isAsc) {
+        page.addOrder(OrderItem.asc(defaultOrderField));
+      } else {
+        page.addOrder(OrderItem.desc(defaultOrderField));
+      }
+      return page;
+    }
+  }
+
 }
 }

-/**
- * Copyright © 2016-2021 The Thingsboard Authors
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.dao.yunteng.jpa.dao;
-
-import lombok.AllArgsConstructor;
-import org.springframework.context.annotation.Primary;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.StringUtils;
-import org.thingsboard.server.common.data.alarm.AlarmInfo;
-import org.thingsboard.server.common.data.alarm.AlarmStatus;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.page.PageData;
-import org.thingsboard.server.common.data.page.TimePageLink;
-import org.thingsboard.server.dao.DaoUtil;
-import org.thingsboard.server.dao.model.sql.AlarmInfoEntity;
-import org.thingsboard.server.dao.sql.alarm.JpaAlarmDao;
-import org.thingsboard.server.dao.yunteng.jpa.repository.YtAlarmRepository;
-
-import java.util.*;
-
-@Component
-@Primary
-@AllArgsConstructor
-public class YtJpaAarmDao extends JpaAlarmDao {
-
-    private final YtAlarmRepository ytAlarmRepository;
-
-    public PageData<AlarmInfo> pageAlarms(TimePageLink pageLink, TenantId tenantId, String alarmType, AlarmStatus statu, List<String> organizationId, String entityId){
-
-        Set<AlarmStatus> status = new HashSet<>();
-        if(statu != null){
-            status.add(statu);
-        }
-        Page<AlarmInfoEntity> datas =null;
-        try{
-            datas = ytAlarmRepository.alarmsByOrganization(tenantId.getId()
-                    , Optional.ofNullable(entityId).map(id ->{
-                        return UUID.fromString(entityId);
-                    }).orElse(null)
-                    , EntityType.DEVICE.name()
-                    ,Optional.ofNullable(organizationId).map(ids ->{
-                        Set<String> result = new HashSet<>();
-                        for(String item:ids){
-                            if(StringUtils.isNotEmpty(item)){
-                                result.add(item);
-                            }
-                        }
-                        return result;
-                    }).orElse(null)
-//                    , org.apache.commons.lang3.StringUtils.isEmpty(alarmType)?null:alarmType
-                    ,pageLink.getStartTime(),pageLink.getEndTime(),
-                    status
-                    ,DaoUtil.toPageable(pageLink));
-
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        return DaoUtil.toPageData(datas);
-    }
-
-
-
-
-}

-/**
- * Copyright © 2016-2021 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.dao.yunteng.jpa.repository;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.query.Param;
-import org.thingsboard.server.common.data.alarm.AlarmSeverity;
-import org.thingsboard.server.common.data.alarm.AlarmStatus;
-import org.thingsboard.server.dao.model.sql.AlarmEntity;
-import org.thingsboard.server.dao.model.sql.AlarmInfoEntity;
-
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-/**
- * Created by Valerii Sosliuk on 5/21/2017.
- */
-public interface YtAlarmRepository extends CrudRepository<AlarmEntity, UUID> {
-
-
-
-    @Query(value = "SELECT new org.thingsboard.server.dao.model.sql.AlarmInfoEntity(a) FROM AlarmEntity a " +
-            "LEFT JOIN  YtJpaDeviceEntity yd ON a.originatorId  = uuid(yd.tbDeviceId)   " +
-            "LEFT JOIN RelationEntity re ON a.id = re.toId " +
-            "AND re.relationTypeGroup = 'ALARM' " +
-            "AND re.toType = 'ALARM' " +
-            "AND re.fromId = :affectedEntityId " +
-            "AND re.fromType = :affectedEntityType " +
-            "WHERE a.tenantId = :tenantId " +
-            "AND (a.originatorId = :affectedEntityId or re.fromId IS NOT NULL) " +
-            "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
-            "AND (:endTime IS NULL OR a.createdTime <= :endTime) "
-          +  "AND ((:alarmStatuses) IS NULL OR a.status in (:alarmStatuses)) "
-//            + " AND (:affectedEntityType IS NULL OR a.originatorType = :affectedEntityType) "
-            + " AND (:organizationId IS NULL OR yd.organizationId in (:organizationId)) "
-//            + " AND (:alarmType IS NULL OR a.type = :alarmType) "
-//            "AND (LOWER(a.type) LIKE LOWER(CONCAT('%', :alarmType, '%')) "
-//            + "  OR LOWER(a.severity) LIKE LOWER(CONCAT('%', :searchText, '%'))) "
-            ,
-            countQuery = "" +
-                    "SELECT count(a) + " + //alarms with relations only
-                    " (SELECT count(a) FROM AlarmEntity a " + //alarms WITHOUT any relations
-                    "LEFT JOIN  YtJpaDeviceEntity yd ON a.originatorId  = uuid(yd.tbDeviceId)    " +
-                    "    LEFT JOIN RelationEntity re ON a.id = re.toId " +
-                    "    AND re.relationTypeGroup = 'ALARM' " +
-                    "    AND re.toType = 'ALARM' " +
-                    "    AND re.fromId = :affectedEntityId " +
-                    "    AND re.fromType = :affectedEntityType " +
-                    "    WHERE a.tenantId = :tenantId " +
-                    "    AND (a.originatorId = :affectedEntityId) " +
-                    "    AND (re.fromId IS NULL) " + //anti join
-                    "    AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
-                    "    AND (:endTime IS NULL OR a.createdTime <= :endTime) "
-                   +"    AND ((:alarmStatuses) IS NULL OR a.status in (:alarmStatuses)) "
-//                    + " AND (:affectedEntityType IS NULL OR a.originatorType = :affectedEntityType) "
-                    + " AND (:organizationId IS NULL OR yd.organizationId in (:organizationId)) "
-//                    + " AND (:alarmType IS NULL OR a.type = :alarmType) "
-                    +" )" +
-                    "FROM AlarmEntity a " +
-                    "LEFT JOIN  YtJpaDeviceEntity yd ON a.originatorId  = uuid(yd.tbDeviceId)  " +
-                    "INNER JOIN RelationEntity re ON a.id = re.toId " +
-                    "AND re.relationTypeGroup = 'ALARM' " +
-                    "AND re.toType = 'ALARM' " +
-                    "AND re.fromId = :affectedEntityId " +
-                    "AND re.fromType = :affectedEntityType " +
-                    "WHERE a.tenantId = :tenantId " +
-                    "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
-                    "AND (:endTime IS NULL OR a.createdTime <= :endTime) "
-                    +"AND ((:alarmStatuses) IS NULL OR a.status in (:alarmStatuses)) "
-//                    + " AND (:affectedEntityType IS NULL OR a.originatorType = :affectedEntityType) "
-                    + " AND (:organizationId IS NULL OR yd.organizationId in (:organizationId)) "
-//                    + " AND (:alarmType IS NULL OR a.type = :alarmType) "
-    )
-    Page<AlarmInfoEntity> alarmsByOrganization(@Param("tenantId") UUID tenantId,
-                                               @Param("affectedEntityId") UUID affectedEntityId,
-                                               @Param("affectedEntityType") String affectedEntityType,
-                                               @Param("organizationId") Set<String> organizationId,
-//                                               @Param("alarmType") String alarmType,
-                                               @Param("startTime") Long startTime,
-                                               @Param("endTime") Long endTime,
-                                               @Param("alarmStatuses") Set<AlarmStatus> alarmStatuses,
-                                     Pageable pageable);
-
-
-
-
-
-
-
-
-
-}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+/**
+ * @version V1.0
+ * @Description :
+ * 1.其它地方抛出异常，交由控制层统一处理
+ * 2.服务层注意持久化的事务管理
+ * @Dependency: 依赖包
+ * @Author: junlianglee
+ * @Date Created in 2021/12/28$
+ * @Copyright 2016-2018  - Powered By 云腾五洲
+ */
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.UUID;
+
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+public class UUIDTypeHandler extends BaseTypeHandler {
+
+    @Override
+    public Object getNullableResult(ResultSet rs, String columnName)
+            throws SQLException {
+        return UUID.fromString(rs.getString(columnName));
+    }
+
+    @Override
+    public Object getNullableResult(ResultSet resultSet, int i) throws SQLException {
+        return UUID.fromString((resultSet.getString(i)));
+    }
+
+    @Override
+    public Object getNullableResult(CallableStatement cs, int columnIndex)
+            throws SQLException {
+        return UUID.fromString((cs.getString(columnIndex)));
+    }
+
+    @Override
+    public void setNonNullParameter(PreparedStatement ps, int i,
+                                    Object parameter, JdbcType jdbcType) throws SQLException {
+        ps.setString(i, ((UUID) parameter).toString());
+    }
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
+import org.thingsboard.server.dao.yunteng.entities.Menu;
+import org.thingsboard.server.dao.yunteng.entities.YtAlarmEntity;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+@Mapper
+public interface YtAlarmMapper extends BaseMapper<YtAlarmEntity> {
+
+  IPage<YtAlarmEntity> alarmPage(
+          IPage<?> page
+          ,@Param("tenantId") UUID tenantId
+          ,@Param("alarmType")String alarmType
+          ,@Param("startTime")Long startTime
+          ,@Param("endTime")Long endTime
+          ,@Param("status")AlarmStatus status
+          ,@Param("deviceId")String deviceId
+          ,@Param("originatorType") EntityType originatorType
+          ,@Param("organizationId")List<String> organizationId
+          );
+}

 package org.thingsboard.server.dao.yunteng.service;
 package org.thingsboard.server.dao.yunteng.service;
 
 
+import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
@@ -7,22 +8,29 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
 import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.dao.yunteng.entities.YtAlarmEntity;
 
 
 import java.util.Map;
 import java.util.Map;
+import java.util.UUID;
 
 
-/** @Description 告警中心数据业务层 @Author cxy @Date 2021/11/10 16:51 */
+/**
+ * @Description 告警中心数据业务层 @Author cxy @Date 2021/11/10 16:51
+ */
 public interface YtAlarmInfoService {
 public interface YtAlarmInfoService {
 
 
 
 
-  /**
-   *  告警信息分页数据
-   * @param pageLink        分页信息
-   * @param tenantId        租户ID
-   * @param alarmType       告警类型
-   * @param status          告警状态
-   * @param organizationId  组织ID
-   * @return
-   */
-  YtPageData<AlarmInfo> page(TimePageLink pageLink,TenantId tenantId, String alarmType,  AlarmStatus status, String organizationId,String deviceId);
+    /**
+     * @param pageMap          分页排序信息
+     * @param tenantId         租户ID
+     * @param alarmType        告警类型
+     * @param startTime        过滤区间开始时间
+     * @param endTime          过滤区间结束时间
+     * @param status           告警状态
+     * @param deviceId     告警设备ID，设备告警使用
+     * @param originatorType    告警源类型
+     * @param organizationId    告警所属组织
+     * @return
+     */
+    YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, String alarmType, Long startTime, Long endTime, AlarmStatus status, String deviceId, EntityType originatorType, String organizationId);
 
 
 }
 }

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.thingsboard.server.dao.yunteng.mapper.YtAlarmMapper">
+
+    <resultMap type="org.thingsboard.server.dao.yunteng.entities.YtAlarmEntity" id="alarmInfo">
+        <result property="id" column="id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
+        <result property="tenantId" column="tenant_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
+        <result property="deviceName" column="device_name"/>
+        <result property="customerId" column="customer_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
+        <result property="type" column="type"/>
+        <result property="deviceId" column="device_id" />
+        <result property="originatorType" column="originator_type"/>
+        <result property="tbDeviceId" column="originator_Id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
+        <result property="severity" column="severity" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+        <result property="status" column="status" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+        <result property="startTs" column="start_ts"/>
+        <result property="endTs" column="end_ts"/>
+        <result property="ackTs" column="ack_ts"/>
+        <result property="clearTs" column="clear_ts"/>
+        <result property="details" column="details" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+        <result property="propagate" column="propagate"/>
+    </resultMap>
+
+
+    <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
+        <where>
+            m.tenant_id = #{tenantId}
+            <if test="alarmType!=null">
+                AND type LIKE CONCAT('%',#{alarmType},'%')
+            </if>
+            <if test="startTime!=null">
+                AND created_time >= #{tenantId}
+            </if>
+            <if test="endTime!=null">
+                AND created_time 	&lt;= #{endTime}
+            </if>
+            <if test="status!=null">
+                AND status =  #{status.name}
+            </if>
+            <if test="deviceId!=null">
+                AND d.id = #{deviceId}
+            </if>
+            <if test="originatorType!=null">
+                AND originator_type = #{originatorType.ordinal}
+            </if>
+            <if test="organizationId!=null">
+                AND d.organization_id IN
+                <foreach collection="organizationId" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+
+        </where>
+    </select>
+</mapper>