fix: 告警信息

1.告警信息分页接口

@@ -379,7 +379,7 @@ public abstract class BaseController {
         }
     }
 
-    TimePageLink createTimePageLink(int pageSize, int page, String textSearch,
+    protected TimePageLink createTimePageLink(int pageSize, int page, String textSearch,
                                     String sortProperty, String sortOrder, Long startTime, Long endTime) throws ThingsboardException {
         PageLink pageLink = this.createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         return new TimePageLink(pageLink, startTime, endTime);

@@ -7,14 +7,17 @@ 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.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
+import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmStatus;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.YtAlarmInfoService;
 
-import java.util.HashMap;
-
-import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE;
-import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE_SIZE;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 /**
  * @Description 告警中心
@@ -22,66 +25,34 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  * @Date 2021/11/11 9:23
  */
 @RestController
-@RequestMapping("/api/yt/alarmInfo")
+@RequestMapping("/api/yt/alarm")
 @RequiredArgsConstructor
-@Api(value = "告警中心")
-public class YtAlarmInfoController {
+@Api(tags = "告警中心")
+public class YtAlarmInfoController extends BaseController {
 
     private final YtAlarmInfoService alarmInfoService;
 
-    /*@ApiOperation(value = "增加或修改告警中心")
-    @PostMapping
-    @PreAuthorize("hasRole('ROLE_TENANT_ADMIN')")
-    public ResponseEntity<AlarmInfoDTO> saveAlarmInfo(@RequestBody AlarmInfoDTO alarmInfoDto){
-
-        AlarmInfoDTO newalarmInfoDto = alarmInfoService.insertOrUpdate(alarmInfoDto);
-        return Optional.ofNullable(newalarmInfoDto)
-                .map(
-                        dto -> {
-                            URI location =
-                                    ServletUriComponentsBuilder.fromCurrentRequest()
-                                            .path("/{id}")
-                                            .buildAndExpand(newalarmInfoDto.getId())
-                                            .toUri();
-                            return ResponseEntity.created(location).body(newalarmInfoDto);
-                        })
-                .orElse(ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build());
-    }
 
-*/
     //分页测试通过
-    @ApiOperation(value="分页查询告警中心数据")
+    @ApiOperation(value="设备告警信息")
     @GetMapping(params = {PAGE_SIZE, PAGE})
-    public YtPageData<AlarmInfoDTO> pageAlarmInfo(
+    public YtPageData<AlarmInfo> pageAlarmInfo(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
-            @RequestParam(value = "sortProperty", required = false) String sortProperty,
-            @RequestParam(value = "status", required = false) String status,
-            @RequestParam(value = "sortOrder", required = false) String sortOrder,
-            @RequestParam(value = "searchStatus", required = false) String searchStatus,
+            @RequestParam(value = "status", required = false) AlarmStatus status,
             @RequestParam(value = "textSearch", required = false) String textSearch,
-            @RequestParam(value = "startTime", required = false) String startTime,
-            @RequestParam(value = "fetchOriginator", required = false) String fetchOriginator,
-            @RequestParam(value = "endTime", required = false) String endTime){
-        HashMap<String, Object> queryMap = new HashMap<>();
-        queryMap.put(PAGE_SIZE, pageSize);
-        queryMap.put(PAGE, page);
-        queryMap.put("sortProperty", sortProperty);
-        queryMap.put("sortOrder", sortOrder);
-        queryMap.put("searchStatus", searchStatus);
-        queryMap.put("status", status);
-        queryMap.put("textSearch", textSearch);
-        queryMap.put("startTime", startTime);
-        queryMap.put("endTime", endTime);
-        queryMap.put("fetchOriginator", fetchOriginator);
-        return alarmInfoService.page(queryMap);
+            @RequestParam(value = "alarmType", required = false) String alarmType,
+            @RequestParam(value = "organizationId", required = false) String organizationId,
+            @RequestParam(value = "deviceId", required = false) String deviceId,
+            @RequestParam(value = "startTime", required = false) Long startTime,
+            @RequestParam(value = "endTime", required = false) Long endTime,
+            @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+            @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);
+
+        return alarmInfoService.page(pageLink,getCurrentUser().getTenantId(),alarmType,status,organizationId,deviceId);
     }
-    /*@ApiOperation(value = "删除告警中心数据")
-    @DeleteMapping
-    public void deleteAlarmInfo(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO){
 
-        alarmInfoService.deleteAlarm(deleteDTO.getIds());
-    }*/
 
 
 }

@@ -28,8 +28,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @Configuration
 @EnableAutoConfiguration
 @ComponentScan("org.thingsboard.server.dao.sql")
-@EnableJpaRepositories({"org.thingsboard.server.dao.sql", "org.thingsboard.server.dao.yunteng.repository"})
-@EntityScan("org.thingsboard.server.dao.model.sql")
+@EnableJpaRepositories({"org.thingsboard.server.dao.sql", "org.thingsboard.server.dao.yunteng.jpa.repository"})
+@EntityScan({"org.thingsboard.server.dao.model.sql","org.thingsboard.server.dao.yunteng.jpa.entity"})
 @EnableTransactionManagement
 public class JpaDaoConfig {
 

@@ -3,206 +3,30 @@ package org.thingsboard.server.dao.yunteng.impl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
-import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
-import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
-import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
+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.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.service.YtAlarmInfoService;
 
-import java.util.List;
-import java.util.Map;
-
 /** @Description 告警中心业务实现 @Author cxy @Date 2021/11/10 16:56 */
 @Service
 @RequiredArgsConstructor
 @Slf4j
 public class YtAlarmInfoServiceImpl implements YtAlarmInfoService {
-//  private final TBConfig tbConfig;
-//  private final TBConnectService tbConnectService;
-//
-//
-//
-//  private LambdaQueryWrapper<YtAlarmInfo> tenantWapper(String tenantCode) {
-//    return new QueryWrapper<AlarmInfo>().lambda().eq(AlarmInfo::getTenantId, tenantCode);
-//  }
-
-  /**
-   * 封装修改
-   *
-   * @param alarmInfoDto 告警对象
-   * @return return alarmInfo.getDTO(AlarmInfoDto.class);
-   */
- /* private AlarmInfoDTO update(AlarmInfoDTO alarmInfoDto) {
-    AlarmInfo alarmInfo = baseMapper.selectById(alarmInfoDto.getId());
-    if (!alarmInfo.getTenantId().equals(SecurityContext.getCurrentUser().getTenantId())) {
-      return null;
-    }
-    alarmInfoDto.copyToEntity(alarmInfo);
-    baseMapper.updateById(alarmInfo);
-    alarmInfo.copyToDTO(alarmInfoDto);
-    return alarmInfo.getDTO(AlarmInfoDTO.class);
-  }*/
-  /**
-   * 封装新增
-   *
-   * @param alarmInfoDto 告警对象
-   * @return alarmInfoDto
-   */
-  /*private AlarmInfoDTO insert(AlarmInfoDTO alarmInfoDto) {
-    String tenantCode = SecurityContext.getCurrentUser().getTenantId();
-    LambdaQueryWrapper<AlarmInfo> Wrapper =
-        tenantWapper(tenantCode)
-            .eq(AlarmInfo::getStatus, alarmInfoDto.getStatus())
-            .eq(AlarmInfo::getSeverity, alarmInfoDto.getSeverity());
-    int Count = baseMapper.selectCount(Wrapper);
-    if (Count > 0) {
-      throw new DataValidationException("告警中心数据已经存在");
-    }
-    // 保存租户编码
-    alarmInfoDto.setTenantId(tenantCode);
-    AlarmInfo alarmInfo = alarmInfoDto.getEntity(AlarmInfo.class);
-
-    int insertCount = baseMapper.insert(alarmInfo);
-    if (insertCount > 0) {
-      alarmInfo.copyToDTO(alarmInfoDto);
-      return alarmInfoDto;
-    }
-
-    return alarmInfoDto;
-  }
-*/
-  /**
-   * 新增或者修改告警中心
-   *
-   * @param alarmInfoDto 告警对象
-   * @return alarmInfoDto
-   */
-  /*@Override
-  @Transactional
-  public AlarmInfoDTO insertOrUpdate(AlarmInfoDTO alarmInfoDto) {
-    // 判断为空,则新增告警信息
-    if (StringUtils.isBlank(alarmInfoDto.getId())) {
-      return insert(alarmInfoDto);
-    } else {
-      // 不为空则执行修改操作
-      return update(alarmInfoDto);
-    }
-  }*/
-
-  /**
-   * 删除告警中心数据
-   *
-   * @param
-   * @return boolean
-   */
- /* @Override
-  public boolean deleteAlarm(Set<String> alarmIds) {
-    LambdaQueryWrapper<AlarmInfo> queryWrapper =
-        new QueryWrapper<AlarmInfo>()
-            .lambda()
-            .eq(AlarmInfo::getTenantId, SecurityContext.getCurrentUser().getTenantId())
-            .in(AlarmInfo::getId, alarmIds);
-    baseMapper.delete(queryWrapper);
-    return true;
-  }*/
 
-    /**
-     * 分页查询数据
-     *
-     * @param queryMap 集合
-     * @return PageData
-     */
+private final YtJpaAarmDao ytJpaAarmDao;
   @Override
-  public YtPageData<AlarmInfoDTO> page(Map<String, Object> queryMap) {
-  /*  queryMap.put("tenantCode", SecurityContext.getCurrentUser().getTenantId());
-    IPage<AlarmInfo> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME,false);
-    IPage<AlarmInfo> alarmInfoIPage = alarmInfoBaseMapper.selectPage(page,queryMap);*/
-
-//    try {
-//      TBPageData tbPageData = null;//tbConnectService.getAlarmInfos(queryMap).get();
-//      System.out.println("==================tbPageData:" + tbPageData);
-//      List<AlarmInfoDTO> alarmInfoDTOS = ReflectUtils.sourceToTarget(tbPageData.getData(), AlarmInfoDTO.class);
-//      YtPageData<AlarmInfoDTO> ytPageData = new YtPageData();
-//      ytPageData.setItems(alarmInfoDTOS);
-//
-//      System.out.println("==================alarmInfoDTOS:" + alarmInfoDTOS);
-//      return ytPageData;
-//    } catch (Exception e) {
-//      log.error("create TBAlarmInfo error {}", e.getMessage());
-//      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-//    }
-    //return getPageData(alarmInfoIPage,AlarmInfoDTO.class);
-    return null;
+  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());
+    return result;
   }
 
 
-
-  /**
-   * 查询告警中心集合
-   *
-   * @param alarmInfoDto 过滤参数
-   * @return AlarmInfoDto
-   */
-  /*@Override
-  public List<AlarmInfoDTO> findAlarmInfo(AlarmInfoDTO alarmInfoDto) {
-    List<AlarmInfo> alarmInfoList =
-            baseMapper.selectList(
-                    new QueryWrapper<AlarmInfo>()
-                            .lambda()
-                            .eq(AlarmInfo::getTenantId, SecurityContext.getCurrentUser().getTenantId())
-                            .like(
-                                    StringUtils.isNotBlank(alarmInfoDto.getStatus()),
-                                    AlarmInfo::getStatus,
-                                    alarmInfoDto.getStatus()));
-    return ReflectUtils.sourceToTarget(alarmInfoList, AlarmInfoDTO.class);
-  }*/
-
-  /**
-   * 创建调用TBAlarmInfo需要的参数
-   *
-   * @param alarmInfoDto 页面接收的参数
-   * @return 封装的tbAlarmInfo
-   */
-//  private TBAlarmInfo buildTbAlarmInfoFromAlarmInfoDto(AlarmInfoDTO alarmInfoDto) {
-//    // 新建tbAlarmInfo对象获取数据
-//    TBAlarmInfo tbAlarmInfo = new TBAlarmInfo();
-//    tbAlarmInfo.setDetails(alarmInfoDto.getDetails());
-//    tbAlarmInfo.setEndTs(alarmInfoDto.getEndTs());
-//    tbAlarmInfo.setSeverity(alarmInfoDto.getSeverity());
-//    tbAlarmInfo.setStatus(alarmInfoDto.getStatus());
-//    tbAlarmInfo.setType(alarmInfoDto.getType());
-//    tbAlarmInfo.setStartTs(alarmInfoDto.getStartTs());
-//    Id alarmInfoId = new Id();
-//    alarmInfoId.setEntityType(EntityType.TENANT);
-//    alarmInfoId.setId(alarmInfoId.getId());
-//    Id id = new Id();
-//    id.setId(alarmInfoId.getId());
-//    tbAlarmInfo.setTenantId(id);
-//    return tbAlarmInfo;
-//  }
-
-  /**
-   * 调用TB来保存
-   *
-   * @param alarmInfoDto 告警对象
-   */
-  private void saveOrUpdateTblarmInfo(AlarmInfoDTO alarmInfoDto) throws InterruptedException {
-    // 启用则创建连接对象
-//    if (tbConfig.isEnabled()) {
-//      TBAlarmInfo tbAlarmInfo = buildTbAlarmInfoFromAlarmInfoDto(alarmInfoDto);
-//      try {
-//        // 得到连接对象
-//        TBAlarmInfo newtbAlarmInfo = tbConnectService.saveOrUpdateAlarmInfo(tbAlarmInfo).get();
-//        // 为空
-//        if (null == newtbAlarmInfo) {
-//          throw new FastIotException(
-//              ErrorMessage.CONNECT_TO_TB_ERROR.setMessage("update tb alarmInfo error"));
-//        }
-//      } catch (ExecutionException e) {
-//        log.error("create TBAlarmInfo error {}", e.getMessage());
-//        throw new FastIotException(ErrorMessage.CONNECT_TO_TB_ERROR);
-//      }
-//    }
-  }
 }

+/**
+ * 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);
+    }
+
+
+
+
+}

+package org.thingsboard.server.dao.yunteng.jpa.entity;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Data;
+import org.hibernate.annotations.Type;
+import org.hibernate.annotations.TypeDef;
+import org.hibernate.annotations.TypeDefs;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+import org.thingsboard.server.dao.util.mapping.JsonBinaryType;
+import org.thingsboard.server.dao.util.mapping.JsonStringType;
+
+import javax.persistence.*;
+import java.util.UUID;
+
+@Data
+@Entity
+@Table(name = ModelConstants.Table.IOTFS_DEVICE_TABLE_NAME)
+@TypeDefs({
+        @TypeDef(name = "json", typeClass = JsonStringType.class),
+        @TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)
+})
+public class YtJpaDeviceEntity {
+
+  @Id
+  @Column(name = org.thingsboard.server.dao.model.ModelConstants.ID_PROPERTY)
+  private String id;
+
+  @Column(name="tenant_id")
+  private String tenantId;
+
+  private String name;
+
+  @Column(name="organization_id")
+  private String organizationId;
+
+  @Column(name="tb_device_id")
+  private String tbDeviceId;
+
+  @Column
+  @Type(type="json")
+  private JsonNode deviceInfo;
+
+  @Column(name="device_type_id")
+  @Enumerated
+  private DeviceTypeEnum deviceType;
+
+}

+/**
+ * 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.service;
 
+import org.thingsboard.server.common.data.alarm.Alarm;
+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.TimePageLink;
 import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 
@@ -8,34 +13,16 @@ import java.util.Map;
 /** @Description 告警中心数据业务层 @Author cxy @Date 2021/11/10 16:51 */
 public interface YtAlarmInfoService {
 
-  /**
-   * 新增或修改告警中心数据
-   *
-   * @param alarmInfoDto 对象
-   * @return alarmInfoDto
-   */
-/*  AlarmInfoDTO insertOrUpdate(AlarmInfoDTO alarmInfoDto);*/
 
   /**
-   * 删除告警中心数据
-   *
-   * @param ids id
-   * @return true和false
+   *  告警信息分页数据
+   * @param pageLink        分页信息
+   * @param tenantId        租户ID
+   * @param alarmType       告警类型
+   * @param status          告警状态
+   * @param organizationId  组织ID
+   * @return
    */
-  /*boolean deleteAlarm(Set<String> ids);*/
+  YtPageData<AlarmInfo> page(TimePageLink pageLink,TenantId tenantId, String alarmType,  AlarmStatus status, String organizationId,String deviceId);
 
-  /**
-   * 分页数据
-   *
-   * @param queryMap 集合对象
-   * @return AlarmInfoDto
-   */
-  YtPageData<AlarmInfoDTO> page(Map<String, Object> queryMap);
-  /**
-   * 查询告警中心所有数据
-   *
-   * @param alarmInfoDto 过滤参数
-   * @return List<AlarmCenterDto>
-   */
-  /*List<AlarmInfoDTO> findAlarmInfo(AlarmInfoDTO alarmInfoDto);*/
 }