feat: 组态增加sourceOption拓展新组件，V1.1.2将重构组态功能，便于组件扩展

@@ -50,7 +50,7 @@ public class TkAlarmInfoController extends BaseController {
       @RequestParam(value = "alarmType", required = false) String alarmType,
       @RequestParam(value = "severity", required = false) AlarmSeverity severity,
       @RequestParam(value = "organizationId", required = false) String organizationId,
-      @RequestParam(value = "deviceId", required = false) String deviceId,
+      @RequestParam(value = "deviceIds", required = false) List<String> deviceIds,
       @RequestParam(value = "deviceName", required = false) String deviceName,
       @RequestParam(value = "deviceType", required = false) DeviceTypeEnum deviceType,
       @RequestParam(value = "startTime", required = false) Long startTime,
@@ -77,7 +77,7 @@ public class TkAlarmInfoController extends BaseController {
         startTime,
         endTime,
         status,
-        deviceId,
+        deviceIds,
         deviceName,
         deviceType,
         EntityType.DEVICE,

@@ -51,4 +51,7 @@ public class ConfigurationDatasourceDTO extends ConfigurationDTO {
 
   @ApiModelProperty(value = "数据源高级配置说明")
   private JsonNode additional;
+
+  @ApiModelProperty(value = "数据源配置选项")
+  private JsonNode sourceOption;
 }

@@ -27,5 +27,6 @@ public class TkConfigurationDatasourceEntity extends ConfigurationBaseEntity {
     private String attr;
     @TableField(typeHandler = JacksonTypeHandler.class)
     private JsonNode additional;
-
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JsonNode sourceOption;
 }

@@ -51,7 +51,7 @@ public class TkAlarmInfoServiceImpl implements TkAlarmInfoService {
       Long startTime,
       Long endTime,
       List<AlarmStatus> status,
-      String deviceId,
+      List<String> deviceIds,
       String deviceName,
       DeviceTypeEnum deviceType,
       EntityType originatorType,
@@ -80,7 +80,7 @@ public class TkAlarmInfoServiceImpl implements TkAlarmInfoService {
             startTime,
             endTime,
             status,
-            deviceId,
+            deviceIds,
             deviceName,
             deviceType,
             originatorType,

@@ -26,7 +26,7 @@ public interface TkAlarmMapper extends BaseMapper<TkAlarmEntity> {
           ,@Param("startTime")Long startTime
           ,@Param("endTime")Long endTime
           ,@Param("status")List<AlarmStatus> status
-          ,@Param("deviceId")String deviceId
+          ,@Param("deviceIds")List<String> deviceIds
           ,@Param("deviceName")String deviceName
           ,@Param("deviceType") DeviceTypeEnum deviceType
           ,@Param("originatorType") EntityType originatorType

@@ -25,7 +25,7 @@ public interface TkAlarmInfoService {
    * @param startTime 过滤区间开始时间
    * @param endTime 过滤区间结束时间
    * @param status 告警状态
-   * @param deviceId 告警设备ID，设备告警使用
+   * @param deviceIds 告警设备ID，设备告警使用
    * @param deviceName 告警设备名称
    * @param originatorType 告警源类型
    * @param organizationId 告警所属组织
@@ -40,7 +40,7 @@ public interface TkAlarmInfoService {
       Long startTime,
       Long endTime,
       List<AlarmStatus> status,
-      String deviceId,
+      List<String> deviceIds,
       String deviceName,
       DeviceTypeEnum deviceType,
       EntityType originatorType,

@@ -64,8 +64,11 @@
                     #{id}
                 </foreach>
             </if>
-            <if test="deviceId!=null">
-                AND d.id = #{deviceId}
+            <if test="deviceIds!=null">
+                AND d.id IN
+                <foreach collection="deviceIds" item="deviceId" index="index" open="(" close=")" separator=",">
+                    #{deviceId}
+                </foreach>
             </if>
             <if test="deviceName!=null">
                 AND d.name LIKE concat('%',#{deviceName},'%')