Merge branch 'fix/add-history-limit' into 'main'

fix: 查询历史数据，如果是历史数据聚合，添加limit50000限制传入后端进行查询

See merge request yunteng/thingskit-scada!267

@@ -56,6 +56,7 @@ export interface ChartOptionType {
   queryType?: SocketSubscriberEnum
   queryType?: SocketSubscriberEnum
   agg?: AggregateTypeEnum
   agg?: AggregateTypeEnum
   unit?: string
   unit?: string
+  limit?: number
 }
 }
 
 
 export interface FlowMeterColorItemType {
 export interface FlowMeterColorItemType {

@@ -32,7 +32,7 @@ export default class Config implements CreateComponentType {
 export const dataSubscribers: ComponentConfigModuleType['dataSubscribers'] = (telemetryService, nodeData) => {
 export const dataSubscribers: ComponentConfigModuleType['dataSubscribers'] = (telemetryService, nodeData) => {
   const { dataSourceJson, configurationNodeId } = nodeData
   const { dataSourceJson, configurationNodeId } = nodeData
   const { deviceId, attr, chartOption } = dataSourceJson
   const { deviceId, attr, chartOption } = dataSourceJson
-  const { agg, interval, effectScope = 0 } = chartOption!
+  const { agg, interval, effectScope = 0, limit = 50000 } = chartOption!
   const subscribe = TelemetrySubscriber.createHistorySubscription(telemetryService, { id: deviceId, entityType: EntityType.DEVICE }, attr, telemetryService.getCommandSource(configurationNodeId, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
   const subscribe = TelemetrySubscriber.createHistorySubscription(telemetryService, { id: deviceId, entityType: EntityType.DEVICE }, attr, telemetryService.getCommandSource(configurationNodeId, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
 
 
   const subscriptionCommand = subscribe.subscriptionCommand as HistorySubscriptionCmd
   const subscriptionCommand = subscribe.subscriptionCommand as HistorySubscriptionCmd
@@ -40,6 +40,7 @@ export const dataSubscribers: ComponentConfigModuleType['dataSubscribers'] = (te
   subscriptionCommand.interval = interval
   subscriptionCommand.interval = interval
   subscriptionCommand.startTs = Date.now() - effectScope
   subscriptionCommand.startTs = Date.now() - effectScope
   subscriptionCommand.endTs = Date.now()
   subscriptionCommand.endTs = Date.now()
+  subscriptionCommand.limit = limit
 
 
   return [subscribe]
   return [subscribe]
 }
 }

@@ -32,7 +32,7 @@ export default class Config implements CreateComponentType {
 export const dataSubscribers: ComponentConfigModuleType['dataSubscribers'] = (telemetryService, nodeData) => {
 export const dataSubscribers: ComponentConfigModuleType['dataSubscribers'] = (telemetryService, nodeData) => {
   const { dataSourceJson, configurationNodeId } = nodeData
   const { dataSourceJson, configurationNodeId } = nodeData
   const { deviceId, attr, chartOption } = dataSourceJson
   const { deviceId, attr, chartOption } = dataSourceJson
-  const { agg, interval, effectScope = 0, queryType } = chartOption!
+  const { agg, interval, effectScope = 0, queryType, limit = 50000 } = chartOption!
 
 
   let subscribe
   let subscribe
   if (queryType === SocketSubscriberEnum.HISTORY_CMDS)
   if (queryType === SocketSubscriberEnum.HISTORY_CMDS)
@@ -47,6 +47,7 @@ export const dataSubscribers: ComponentConfigModuleType['dataSubscribers'] = (te
   if (queryType === SocketSubscriberEnum.HISTORY_CMDS) {
   if (queryType === SocketSubscriberEnum.HISTORY_CMDS) {
     subscriptionCommand.startTs = Date.now() - effectScope
     subscriptionCommand.startTs = Date.now() - effectScope
     subscriptionCommand.endTs = Date.now()
     subscriptionCommand.endTs = Date.now()
+    subscriptionCommand.limit = limit
   }
   }
 
 
   return [subscribe]
   return [subscribe]

@@ -234,6 +234,7 @@ export enum FormFieldEnum {
   QUERY_TYPE = 'queryType',
   QUERY_TYPE = 'queryType',
   AGG = 'agg',
   AGG = 'agg',
   UNIT = 'unit',
   UNIT = 'unit',
+  LIMIT = 'limit',
 }
 }
 
 
 export function getPacketIntervalByValue(value: number) {
 export function getPacketIntervalByValue(value: number) {
@@ -255,6 +256,7 @@ export const formSchemas = (chartType?: ChartComponentEnum): FormSchema[] => {
 
 
     return item
     return item
   })
   })
+
   return [
   return [
     {
     {
       label: t('dataType'),
       label: t('dataType'),
@@ -320,6 +322,13 @@ export const formSchemas = (chartType?: ChartComponentEnum): FormSchema[] => {
 
 
       },
       },
     },
     },
+    {
+      label: '数据聚合',
+      field: FormFieldEnum.LIMIT,
+      component: ComponentEnum.INPUT,
+      ifShow: false,
+      defaultValue: (chartType === ChartComponentEnum.HISTOGRAM || chartType === ChartComponentEnum.LINE) ? 50000 : null,
+    },
 
 
   ]
   ]
 }
 }