feat: 告警类型

1、设备告警类型

@@ -4,6 +4,7 @@ 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.apache.commons.lang3.StringUtils;
+import org.springframework.http.ResponseEntity;
 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;
@@ -14,15 +15,14 @@ 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.exception.ThingsboardException;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.common.data.yunteng.dto.SysDictDTO;
 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.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 java.util.*;
 
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 
@@ -70,4 +70,13 @@ public class YtAlarmInfoController extends BaseController {
 
 
 
 
 
 
+    @ApiOperation(value="告警类型")
+    @GetMapping()
+    public ResponseEntity<List<SysDictDTO>> alarmType() throws ThingsboardException {
+        List result = alarmInfoService.alarmType(getCurrentUser().getTenantId());
+        return ResponseEntity.ok(result);
+    }
+
+
+
 }
 }

@@ -15,7 +15,9 @@ 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.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
+import org.thingsboard.server.common.data.yunteng.dto.SysDictDTO;
 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.ReflectUtils;
 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.AlarmContact;
 import org.thingsboard.server.dao.yunteng.entities.AlarmContact;
 import org.thingsboard.server.dao.yunteng.entities.YtAlarmEntity;
 import org.thingsboard.server.dao.yunteng.entities.YtAlarmEntity;
@@ -87,4 +89,8 @@ private final OrganizationMapper organizationMapper;
     }
     }
   }
   }
 
 
+  @Override
+  public List<SysDictDTO> alarmType(TenantId tenantId) {
+    return ReflectUtils.sourceToTarget(ytJpaAarmDao.alarmType(tenantId.getId()), SysDictDTO.class);
+  }
 }
 }

@@ -11,6 +11,7 @@ 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.MenuDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 import org.thingsboard.server.dao.yunteng.entities.Menu;
 import org.thingsboard.server.dao.yunteng.entities.Menu;
+import org.thingsboard.server.dao.yunteng.entities.SysDict;
 import org.thingsboard.server.dao.yunteng.entities.YtAlarmEntity;
 import org.thingsboard.server.dao.yunteng.entities.YtAlarmEntity;
 
 
 import java.util.Collection;
 import java.util.Collection;
@@ -32,4 +33,6 @@ public interface YtAlarmMapper extends BaseMapper<YtAlarmEntity> {
           ,@Param("originatorType") EntityType originatorType
           ,@Param("originatorType") EntityType originatorType
           ,@Param("organizationId")List<String> organizationId
           ,@Param("organizationId")List<String> organizationId
           );
           );
+
+    List<SysDict> alarmType(@Param("tenantId") UUID tenantId);
 }
 }

@@ -7,9 +7,11 @@ 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.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.dto.SysDictDTO;
 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 org.thingsboard.server.dao.yunteng.entities.YtAlarmEntity;
 
 
+import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.UUID;
 import java.util.UUID;
 
 
@@ -33,4 +35,12 @@ public interface YtAlarmInfoService {
      */
      */
     YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, String alarmType, Long startTime, Long endTime, AlarmStatus status, String deviceId, EntityType originatorType, String organizationId);
     YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, String alarmType, Long startTime, Long endTime, AlarmStatus status, String deviceId, EntityType originatorType, String organizationId);
 
 
+
+    /**
+     * 设备告警类型
+     * @param tenantId
+     * @return
+     */
+    List<SysDictDTO> alarmType(TenantId tenantId);
+
 }
 }

@@ -22,6 +22,11 @@
         <result property="propagate" column="propagate"/>
         <result property="propagate" column="propagate"/>
     </resultMap>
     </resultMap>
 
 
+    <resultMap type="org.thingsboard.server.dao.yunteng.entities.SysDict" id="alarmType">
+        <result property="dictName" column="dict_name"/>
+        <result property="dictCode" column="dict_code"/>
+    </resultMap>
+
 
 
     <select id="alarmPage" resultMap="alarmInfo">
     <select id="alarmPage" resultMap="alarmInfo">
         SELECT d.name AS device_name,d.id device_id,m.*
         SELECT d.name AS device_name,d.id device_id,m.*
@@ -32,7 +37,7 @@
                 AND type LIKE CONCAT('%',#{alarmType},'%')
                 AND type LIKE CONCAT('%',#{alarmType},'%')
             </if>
             </if>
             <if test="startTime!=null">
             <if test="startTime!=null">
-                AND created_time >= #{tenantId}
+                AND created_time >= #{startTime}
             </if>
             </if>
             <if test="endTime!=null">
             <if test="endTime!=null">
                 AND created_time 	&lt;= #{endTime}
                 AND created_time 	&lt;= #{endTime}
@@ -55,4 +60,14 @@
 
 
         </where>
         </where>
     </select>
     </select>
+
+
+    <select id="alarmType" resultMap="alarmType">
+        SELECT DISTINCT m.type AS dict_name,m.type AS dict_code
+        FROM alarm m
+        <where>
+            m.tenant_id = #{tenantId}
+        </where>
+    </select>
+
 </mapper>
 </mapper>