diff --git a/application/pom.xml b/application/pom.xml
index 7fa427cd89..adc3f1e801 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 3.6.3-SNAPSHOT
+ 3.7.0-SNAPSHOT
thingsboard
application
@@ -49,7 +49,6 @@
io.netty
netty-transport-native-epoll
- ${netty.version}
linux-x86_64
@@ -212,7 +211,15 @@
com.sun.mail
- javax.mail
+ jakarta.mail
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+
+
+ javax.xml.bind
+ jaxb-api
com.twilio.sdk
@@ -255,8 +262,8 @@
opensmpp-core
- org.thingsboard
- springfox-boot-starter
+ org.springdoc
+ springdoc-openapi-starter-webmvc-ui
com.sun.winsw
diff --git a/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json b/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json
index c84faa359e..83a96c6fe6 100644
--- a/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json
+++ b/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json
@@ -5,104 +5,50 @@
"mobileOrder": null,
"configuration": {
"widgets": {
- "81987f19-3eac-e4ce-b790-d96e9b54d9a0": {
+ "5eb79712-5c24-3060-7e4f-6af36b8f842d": {
"type": "timeseries",
- "sizeX": 12,
- "sizeY": 7,
+ "sizeX": 24,
+ "sizeY": 5,
"config": {
"datasources": [
{
"type": "entity",
"dataKeys": [
{
- "name": "successfulMsgs",
+ "name": "ruleEngineException",
"type": "timeseries",
- "label": "${entityName} Successful",
- "color": "#4caf50",
+ "label": "Rule Chain",
+ "color": "#2196f3",
"settings": {
- "excludeFromStacking": false,
- "hideDataByDefault": false,
- "disableDataHiding": false,
- "removeFromLegend": false,
- "showLines": true,
- "fillLines": false,
- "showPoints": false,
- "showPointShape": "circle",
- "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
- "showPointsLineWidth": 5,
- "showPointsRadius": 3,
- "showSeparateAxis": false,
- "axisPosition": "left",
- "thresholds": [
- {
- "thresholdValueSource": "predefinedValue"
- }
- ],
- "comparisonSettings": {
- "showValuesForComparison": true
- }
+ "useCellStyleFunction": false,
+ "useCellContentFunction": true,
+ "cellContentFunction": "return JSON.parse(value).ruleChainName;"
},
- "_hash": 0.15490750967648736
+ "_hash": 0.9954481282345906
},
{
- "name": "failedMsgs",
+ "name": "ruleEngineException",
"type": "timeseries",
- "label": "${entityName} Permanent Failures",
- "color": "#ef5350",
+ "label": "Rule Node",
+ "color": "#4caf50",
"settings": {
- "excludeFromStacking": false,
- "hideDataByDefault": false,
- "disableDataHiding": false,
- "removeFromLegend": false,
- "showLines": true,
- "fillLines": false,
- "showPoints": false,
- "showPointShape": "circle",
- "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
- "showPointsLineWidth": 5,
- "showPointsRadius": 3,
- "showSeparateAxis": false,
- "axisPosition": "left",
- "thresholds": [
- {
- "thresholdValueSource": "predefinedValue"
- }
- ],
- "comparisonSettings": {
- "showValuesForComparison": true
- }
+ "useCellStyleFunction": false,
+ "useCellContentFunction": true,
+ "cellContentFunction": "return JSON.parse(value).ruleNodeName;"
},
- "_hash": 0.4186621166514697
+ "_hash": 0.18580357036589978
},
{
- "name": "tmpFailed",
+ "name": "ruleEngineException",
"type": "timeseries",
- "label": "${entityName} Processing Failures",
- "color": "#ffc107",
+ "label": "Latest Error",
+ "color": "#f44336",
"settings": {
- "excludeFromStacking": false,
- "hideDataByDefault": false,
- "disableDataHiding": false,
- "removeFromLegend": false,
- "showLines": true,
- "fillLines": false,
- "showPoints": false,
- "showPointShape": "circle",
- "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
- "showPointsLineWidth": 5,
- "showPointsRadius": 3,
- "showSeparateAxis": false,
- "axisPosition": "left",
- "thresholds": [
- {
- "thresholdValueSource": "predefinedValue"
- }
- ],
- "comparisonSettings": {
- "showValuesForComparison": true
- }
+ "useCellStyleFunction": false,
+ "useCellContentFunction": true,
+ "cellContentFunction": "return JSON.parse(value).message;"
},
- "_hash": 0.49891007198715376
+ "_hash": 0.7255162989552142
}
],
"entityAliasId": "140f23dd-e3a0-ed98-6189-03c49d2d8018"
@@ -111,312 +57,905 @@
"timewindow": {
"realtime": {
"interval": 1000,
- "timewindowMs": 300000
+ "timewindowMs": 86400000
},
"aggregation": {
"type": "NONE",
- "limit": 8640
- },
- "hideInterval": false,
- "hideAggregation": false,
- "hideAggInterval": false
+ "limit": 200
+ }
},
"showTitle": true,
- "backgroundColor": "#fff",
+ "backgroundColor": "rgb(255, 255, 255)",
"color": "rgba(0, 0, 0, 0.87)",
"padding": "8px",
"settings": {
- "shadowSize": 4,
- "fontColor": "#545454",
- "fontSize": 10,
- "xaxis": {
- "showLabels": true,
- "color": "#545454"
- },
- "yaxis": {
- "showLabels": true,
- "color": "#545454"
- },
- "grid": {
- "color": "#545454",
- "tickColor": "#DDDDDD",
- "verticalLines": true,
- "horizontalLines": true,
- "outlineWidth": 1
- },
- "stack": false,
- "tooltipIndividual": false,
- "timeForComparison": "months",
- "xaxisSecond": {
- "axisPosition": "top",
- "showLabels": true
- },
- "showLegend": true,
- "legendConfig": {
- "direction": "column",
- "position": "bottom",
- "showMin": true,
- "showMax": true,
- "showAvg": false,
- "showTotal": true
- }
+ "showTimestamp": true,
+ "displayPagination": true,
+ "defaultPageSize": 10
},
- "title": "Queue Stats",
+ "title": "Exceptions",
"dropShadow": true,
"enableFullscreen": true,
"titleStyle": {
"fontSize": "16px",
"fontWeight": 400
},
- "mobileHeight": null,
+ "useDashboardTimewindow": false,
+ "showLegend": false,
+ "widgetStyle": {},
+ "actions": {},
"showTitleIcon": false,
"titleIcon": null,
"iconColor": "rgba(0, 0, 0, 0.87)",
"iconSize": "24px",
"titleTooltip": "",
- "widgetStyle": {},
- "useDashboardTimewindow": false,
- "displayTimewindow": true,
- "actions": {}
+ "displayTimewindow": true
},
- "id": "81987f19-3eac-e4ce-b790-d96e9b54d9a0",
- "typeFullFqn": "system.charts.basic_timeseries"
+ "id": "5eb79712-5c24-3060-7e4f-6af36b8f842d",
+ "typeFullFqn": "system.cards.timeseries_table"
},
- "5eb79712-5c24-3060-7e4f-6af36b8f842d": {
+ "42face47-730d-f930-fef5-2a1ef6304b16": {
+ "typeFullFqn": "system.time_series_chart",
"type": "timeseries",
- "sizeX": 24,
+ "sizeX": 8,
"sizeY": 5,
"config": {
"datasources": [
{
"type": "entity",
+ "entityAliasId": "140f23dd-e3a0-ed98-6189-03c49d2d8018",
"dataKeys": [
{
- "name": "ruleEngineException",
+ "name": "successfulMsgs",
"type": "timeseries",
- "label": "Rule Chain",
- "color": "#2196f3",
+ "label": "{i18n:api-usage.successful}",
+ "color": "#4caf50",
"settings": {
- "useCellStyleFunction": false,
- "useCellContentFunction": true,
- "cellContentFunction": "return JSON.parse(value).ruleChainName;"
+ "yAxisId": "default",
+ "showInLegend": true,
+ "dataHiddenByDefault": false,
+ "type": "line",
+ "lineSettings": {
+ "showLine": true,
+ "step": false,
+ "stepType": "start",
+ "smooth": false,
+ "lineType": "solid",
+ "lineWidth": 2.5,
+ "showPoints": false,
+ "showPointLabel": false,
+ "pointLabelPosition": "top",
+ "pointLabelFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "pointLabelColor": "rgba(0, 0, 0, 0.76)",
+ "pointShape": "circle",
+ "pointSize": 12,
+ "fillAreaSettings": {
+ "type": "none",
+ "opacity": 0.4,
+ "gradient": {
+ "start": 100,
+ "end": 0
+ }
+ }
+ },
+ "barSettings": {
+ "showBorder": false,
+ "borderWidth": 2,
+ "borderRadius": 0,
+ "showLabel": false,
+ "labelPosition": "top",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.76)",
+ "backgroundSettings": {
+ "type": "none",
+ "opacity": 0.4,
+ "gradient": {
+ "start": 100,
+ "end": 0
+ }
+ }
+ }
},
- "_hash": 0.9954481282345906
+ "_hash": 0.15490750967648736,
+ "aggregationType": null,
+ "units": null,
+ "decimals": null,
+ "funcBody": null,
+ "usePostProcessing": null,
+ "postFuncBody": null
},
{
- "name": "ruleEngineException",
+ "name": "failedMsgs",
"type": "timeseries",
- "label": "Rule Node",
- "color": "#4caf50",
+ "label": "{i18n:api-usage.permanent-failures}",
+ "color": "#ef5350",
"settings": {
- "useCellStyleFunction": false,
- "useCellContentFunction": true,
- "cellContentFunction": "return JSON.parse(value).ruleNodeName;"
+ "yAxisId": "default",
+ "showInLegend": true,
+ "dataHiddenByDefault": false,
+ "type": "line",
+ "lineSettings": {
+ "showLine": true,
+ "step": false,
+ "stepType": "start",
+ "smooth": false,
+ "lineType": "solid",
+ "lineWidth": 2.5,
+ "showPoints": false,
+ "showPointLabel": false,
+ "pointLabelPosition": "top",
+ "pointLabelFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "pointLabelColor": "rgba(0, 0, 0, 0.76)",
+ "pointShape": "circle",
+ "pointSize": 12,
+ "fillAreaSettings": {
+ "type": "none",
+ "opacity": 0.4,
+ "gradient": {
+ "start": 100,
+ "end": 0
+ }
+ }
+ },
+ "barSettings": {
+ "showBorder": false,
+ "borderWidth": 2,
+ "borderRadius": 0,
+ "showLabel": false,
+ "labelPosition": "top",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.76)",
+ "backgroundSettings": {
+ "type": "none",
+ "opacity": 0.4,
+ "gradient": {
+ "start": 100,
+ "end": 0
+ }
+ }
+ }
},
- "_hash": 0.18580357036589978
+ "_hash": 0.4186621166514697,
+ "aggregationType": null,
+ "units": null,
+ "decimals": null,
+ "funcBody": null,
+ "usePostProcessing": null,
+ "postFuncBody": null
},
{
- "name": "ruleEngineException",
+ "name": "tmpFailed",
"type": "timeseries",
- "label": "Latest Error",
- "color": "#f44336",
+ "label": "{i18n:api-usage.processing-failures}",
+ "color": "#ffc107",
"settings": {
- "useCellStyleFunction": false,
- "useCellContentFunction": true,
- "cellContentFunction": "return JSON.parse(value).message;"
+ "yAxisId": "default",
+ "showInLegend": true,
+ "dataHiddenByDefault": false,
+ "type": "line",
+ "lineSettings": {
+ "showLine": true,
+ "step": false,
+ "stepType": "start",
+ "smooth": false,
+ "lineType": "solid",
+ "lineWidth": 2.5,
+ "showPoints": false,
+ "showPointLabel": false,
+ "pointLabelPosition": "top",
+ "pointLabelFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "pointLabelColor": "rgba(0, 0, 0, 0.76)",
+ "pointShape": "circle",
+ "pointSize": 12,
+ "fillAreaSettings": {
+ "type": "none",
+ "opacity": 0.4,
+ "gradient": {
+ "start": 100,
+ "end": 0
+ }
+ }
+ },
+ "barSettings": {
+ "showBorder": false,
+ "borderWidth": 2,
+ "borderRadius": 0,
+ "showLabel": false,
+ "labelPosition": "top",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.76)",
+ "backgroundSettings": {
+ "type": "none",
+ "opacity": 0.4,
+ "gradient": {
+ "start": 100,
+ "end": 0
+ }
+ }
+ }
},
- "_hash": 0.7255162989552142
+ "_hash": 0.49891007198715376,
+ "aggregationType": null,
+ "units": null,
+ "decimals": null,
+ "funcBody": null,
+ "usePostProcessing": null,
+ "postFuncBody": null
}
],
- "entityAliasId": "140f23dd-e3a0-ed98-6189-03c49d2d8018"
+ "alarmFilterConfig": {
+ "statusList": [
+ "ACTIVE"
+ ]
+ }
}
],
"timewindow": {
+ "hideInterval": false,
+ "hideLastInterval": false,
+ "hideQuickInterval": false,
+ "hideAggregation": false,
+ "hideAggInterval": false,
+ "hideTimezone": false,
+ "selectedTab": 0,
"realtime": {
- "interval": 1000,
- "timewindowMs": 86400000
+ "realtimeType": 0,
+ "timewindowMs": 300000,
+ "quickInterval": "CURRENT_DAY",
+ "interval": 1000
},
"aggregation": {
"type": "NONE",
- "limit": 200
+ "limit": 8640
}
},
"showTitle": true,
- "backgroundColor": "rgb(255, 255, 255)",
+ "backgroundColor": "#FFFFFF",
"color": "rgba(0, 0, 0, 0.87)",
- "padding": "8px",
+ "padding": "0px",
"settings": {
- "showTimestamp": true,
- "displayPagination": true,
- "defaultPageSize": 10
+ "yAxes": {
+ "default": {
+ "units": null,
+ "decimals": 0,
+ "show": true,
+ "label": "",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "600",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.54)",
+ "position": "left",
+ "showTickLabels": true,
+ "tickLabelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "tickLabelColor": "rgba(0, 0, 0, 0.54)",
+ "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n {key: 'Q', value: Math.pow(10, 15)},\n {key: 'T', value: Math.pow(10, 12)},\n {key: 'B', value: Math.pow(10, 9)},\n {key: 'M', value: Math.pow(10, 6)},\n {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n var reduced = value / powers[i].value;\n reduced = Math.round(reduced * rounder) / rounder;\n if (reduced >= 1) {\n value = reduced;\n key = powers[i].key;\n break;\n }\n}\nreturn value + key;",
+ "showTicks": true,
+ "ticksColor": "rgba(0, 0, 0, 0.54)",
+ "showLine": true,
+ "lineColor": "rgba(0, 0, 0, 0.54)",
+ "showSplitLines": true,
+ "splitLinesColor": "rgba(0, 0, 0, 0.12)",
+ "id": "default",
+ "order": 0,
+ "min": null,
+ "max": null
+ }
+ },
+ "thresholds": [],
+ "dataZoom": true,
+ "stack": false,
+ "xAxis": {
+ "show": true,
+ "label": "",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "600",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.54)",
+ "position": "bottom",
+ "showTickLabels": true,
+ "tickLabelFont": {
+ "family": "Roboto",
+ "size": 10,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "tickLabelColor": "rgba(0, 0, 0, 0.54)",
+ "showTicks": true,
+ "ticksColor": "rgba(0, 0, 0, 0.54)",
+ "showLine": true,
+ "lineColor": "rgba(0, 0, 0, 0.54)",
+ "showSplitLines": true,
+ "splitLinesColor": "rgba(0, 0, 0, 0.12)"
+ },
+ "noAggregationBarWidthSettings": {
+ "strategy": "group",
+ "groupWidth": {
+ "relative": false,
+ "relativeWidth": 2,
+ "absoluteWidth": 1800000
+ },
+ "barWidth": {
+ "relative": true,
+ "relativeWidth": 2,
+ "absoluteWidth": 1000
+ }
+ },
+ "showLegend": true,
+ "legendLabelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "16px"
+ },
+ "legendLabelColor": "rgba(0, 0, 0, 0.76)",
+ "legendConfig": {
+ "direction": "column",
+ "position": "bottom",
+ "sortDataKeys": false,
+ "showMin": true,
+ "showMax": true,
+ "showAvg": false,
+ "showTotal": true,
+ "showLatest": false
+ },
+ "showTooltip": true,
+ "tooltipTrigger": "axis",
+ "tooltipValueFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "500",
+ "lineHeight": "16px"
+ },
+ "tooltipValueColor": "rgba(0, 0, 0, 0.76)",
+ "tooltipShowDate": true,
+ "tooltipDateFormat": {
+ "format": "yyyy-MM-dd HH:mm:ss",
+ "lastUpdateAgo": false,
+ "custom": false
+ },
+ "tooltipDateFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "16px"
+ },
+ "tooltipDateColor": "rgba(0, 0, 0, 0.76)",
+ "tooltipDateInterval": true,
+ "tooltipBackgroundColor": "rgba(255, 255, 255, 0.76)",
+ "tooltipBackgroundBlur": 4,
+ "animation": {
+ "animation": true,
+ "animationThreshold": 2000,
+ "animationDuration": 300,
+ "animationEasing": "cubicOut",
+ "animationDelay": 0,
+ "animationDurationUpdate": 300,
+ "animationEasingUpdate": "cubicOut",
+ "animationDelayUpdate": 0
+ },
+ "background": {
+ "type": "color",
+ "color": "#fff",
+ "overlay": {
+ "enabled": false,
+ "color": "rgba(255,255,255,0.72)",
+ "blur": 3
+ }
+ },
+ "padding": "12px"
},
- "title": "Exceptions",
+ "title": "{i18n:api-usage.queue-stats}",
"dropShadow": true,
"enableFullscreen": true,
- "titleStyle": {
- "fontSize": "16px",
- "fontWeight": 400
- },
- "useDashboardTimewindow": false,
- "showLegend": false,
- "widgetStyle": {},
+ "titleStyle": null,
+ "configMode": "basic",
"actions": {},
"showTitleIcon": false,
- "titleIcon": null,
- "iconColor": "rgba(0, 0, 0, 0.87)",
- "iconSize": "24px",
+ "titleIcon": "thermostat",
+ "iconColor": "#1F6BDD",
+ "useDashboardTimewindow": false,
+ "displayTimewindow": true,
+ "titleFont": {
+ "size": 16,
+ "sizeUnit": "px",
+ "family": "Roboto",
+ "weight": "500",
+ "style": "normal",
+ "lineHeight": "24px"
+ },
+ "titleColor": "rgba(0, 0, 0, 0.87)",
"titleTooltip": "",
- "displayTimewindow": true
+ "widgetStyle": {},
+ "widgetCss": "",
+ "pageSize": 1024,
+ "units": "",
+ "decimals": null,
+ "noDataDisplayMessage": "",
+ "timewindowStyle": {
+ "showIcon": false,
+ "iconSize": "24px",
+ "icon": null,
+ "iconPosition": "left",
+ "font": {
+ "size": 12,
+ "sizeUnit": "px",
+ "family": "Roboto",
+ "weight": "400",
+ "style": "normal",
+ "lineHeight": "16px"
+ },
+ "color": "rgba(0, 0, 0, 0.38)",
+ "displayTypePrefix": true
+ },
+ "margin": "0px",
+ "borderRadius": "0px",
+ "iconSize": "0px"
},
- "id": "5eb79712-5c24-3060-7e4f-6af36b8f842d",
- "typeFullFqn": "system.cards.timeseries_table"
+ "row": 0,
+ "col": 0,
+ "id": "42face47-730d-f930-fef5-2a1ef6304b16"
},
- "ad3f1417-87a8-750e-fc67-49a2de1466d4": {
+ "6a74ab56-cb36-e75e-c094-a51a896da94a": {
+ "typeFullFqn": "system.time_series_chart",
"type": "timeseries",
- "sizeX": 12,
- "sizeY": 7,
+ "sizeX": 8,
+ "sizeY": 5,
"config": {
"datasources": [
{
"type": "entity",
+ "entityAliasId": "140f23dd-e3a0-ed98-6189-03c49d2d8018",
"dataKeys": [
{
"name": "timeoutMsgs",
"type": "timeseries",
- "label": "${entityName} Permanent Timeouts",
+ "label": "{i18n:api-usage.permanent-timeouts}",
"color": "#4caf50",
"settings": {
- "excludeFromStacking": false,
- "hideDataByDefault": false,
- "disableDataHiding": false,
- "removeFromLegend": false,
- "showLines": true,
- "fillLines": false,
- "showPoints": false,
- "showPointShape": "circle",
- "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
- "showPointsLineWidth": 5,
- "showPointsRadius": 3,
- "showSeparateAxis": false,
- "axisPosition": "left",
- "thresholds": [
- {
- "thresholdValueSource": "predefinedValue"
+ "yAxisId": "default",
+ "showInLegend": true,
+ "dataHiddenByDefault": false,
+ "type": "line",
+ "lineSettings": {
+ "showLine": true,
+ "step": false,
+ "stepType": "start",
+ "smooth": false,
+ "lineType": "solid",
+ "lineWidth": 2.5,
+ "showPoints": false,
+ "showPointLabel": false,
+ "pointLabelPosition": "top",
+ "pointLabelFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "pointLabelColor": "rgba(0, 0, 0, 0.76)",
+ "pointShape": "circle",
+ "pointSize": 12,
+ "fillAreaSettings": {
+ "type": "none",
+ "opacity": 0.4,
+ "gradient": {
+ "start": 100,
+ "end": 0
+ }
+ }
+ },
+ "barSettings": {
+ "showBorder": false,
+ "borderWidth": 2,
+ "borderRadius": 0,
+ "showLabel": false,
+ "labelPosition": "top",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.76)",
+ "backgroundSettings": {
+ "type": "none",
+ "opacity": 0.4,
+ "gradient": {
+ "start": 100,
+ "end": 0
+ }
}
- ],
- "comparisonSettings": {
- "showValuesForComparison": true
}
},
- "_hash": 0.565222981550328
+ "_hash": 0.565222981550328,
+ "aggregationType": null,
+ "units": null,
+ "decimals": null,
+ "funcBody": null,
+ "usePostProcessing": null,
+ "postFuncBody": null
},
{
"name": "tmpTimeout",
"type": "timeseries",
- "label": "${entityName} Processing Timeouts",
+ "label": "{i18n:api-usage.processing-timeouts}",
"color": "#9c27b0",
"settings": {
- "excludeFromStacking": false,
- "hideDataByDefault": false,
- "disableDataHiding": false,
- "removeFromLegend": false,
- "showLines": true,
- "fillLines": false,
- "showPoints": false,
- "showPointShape": "circle",
- "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
- "showPointsLineWidth": 5,
- "showPointsRadius": 3,
- "showSeparateAxis": false,
- "axisPosition": "left",
- "thresholds": [
- {
- "thresholdValueSource": "predefinedValue"
+ "yAxisId": "default",
+ "showInLegend": true,
+ "dataHiddenByDefault": false,
+ "type": "line",
+ "lineSettings": {
+ "showLine": true,
+ "step": false,
+ "stepType": "start",
+ "smooth": false,
+ "lineType": "solid",
+ "lineWidth": 2.5,
+ "showPoints": false,
+ "showPointLabel": false,
+ "pointLabelPosition": "top",
+ "pointLabelFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "pointLabelColor": "rgba(0, 0, 0, 0.76)",
+ "pointShape": "circle",
+ "pointSize": 12,
+ "fillAreaSettings": {
+ "type": "none",
+ "opacity": 0.4,
+ "gradient": {
+ "start": 100,
+ "end": 0
+ }
+ }
+ },
+ "barSettings": {
+ "showBorder": false,
+ "borderWidth": 2,
+ "borderRadius": 0,
+ "showLabel": false,
+ "labelPosition": "top",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.76)",
+ "backgroundSettings": {
+ "type": "none",
+ "opacity": 0.4,
+ "gradient": {
+ "start": 100,
+ "end": 0
+ }
}
- ],
- "comparisonSettings": {
- "showValuesForComparison": true
}
},
- "_hash": 0.2679547062508352
+ "_hash": 0.2679547062508352,
+ "aggregationType": null,
+ "units": null,
+ "decimals": null,
+ "funcBody": null,
+ "usePostProcessing": null,
+ "postFuncBody": null
}
],
- "entityAliasId": "140f23dd-e3a0-ed98-6189-03c49d2d8018"
+ "alarmFilterConfig": {
+ "statusList": [
+ "ACTIVE"
+ ]
+ }
}
],
"timewindow": {
+ "hideInterval": false,
+ "hideLastInterval": false,
+ "hideQuickInterval": false,
+ "hideAggregation": false,
+ "hideAggInterval": false,
+ "hideTimezone": false,
+ "selectedTab": 0,
"realtime": {
- "interval": 1000,
- "timewindowMs": 300000
+ "realtimeType": 0,
+ "timewindowMs": 300000,
+ "quickInterval": "CURRENT_DAY",
+ "interval": 1000
},
"aggregation": {
"type": "NONE",
"limit": 8640
- },
- "hideInterval": false,
- "hideAggregation": false,
- "hideAggInterval": false
+ }
},
"showTitle": true,
- "backgroundColor": "#fff",
+ "backgroundColor": "#FFFFFF",
"color": "rgba(0, 0, 0, 0.87)",
- "padding": "8px",
+ "padding": "0px",
"settings": {
- "shadowSize": 4,
- "fontColor": "#545454",
- "fontSize": 10,
- "xaxis": {
- "showLabels": true,
- "color": "#545454"
- },
- "yaxis": {
- "showLabels": true,
- "color": "#545454"
- },
- "grid": {
- "color": "#545454",
- "tickColor": "#DDDDDD",
- "verticalLines": true,
- "horizontalLines": true,
- "outlineWidth": 1
+ "yAxes": {
+ "default": {
+ "units": null,
+ "decimals": 0,
+ "show": true,
+ "label": "",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "600",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.54)",
+ "position": "left",
+ "showTickLabels": true,
+ "tickLabelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "tickLabelColor": "rgba(0, 0, 0, 0.54)",
+ "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n {key: 'Q', value: Math.pow(10, 15)},\n {key: 'T', value: Math.pow(10, 12)},\n {key: 'B', value: Math.pow(10, 9)},\n {key: 'M', value: Math.pow(10, 6)},\n {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n var reduced = value / powers[i].value;\n reduced = Math.round(reduced * rounder) / rounder;\n if (reduced >= 1) {\n value = reduced;\n key = powers[i].key;\n break;\n }\n}\nreturn value + key;",
+ "showTicks": true,
+ "ticksColor": "rgba(0, 0, 0, 0.54)",
+ "showLine": true,
+ "lineColor": "rgba(0, 0, 0, 0.54)",
+ "showSplitLines": true,
+ "splitLinesColor": "rgba(0, 0, 0, 0.12)",
+ "id": "default",
+ "order": 0,
+ "min": null,
+ "max": null
+ }
},
+ "thresholds": [],
+ "dataZoom": true,
"stack": false,
- "tooltipIndividual": false,
- "timeForComparison": "months",
- "xaxisSecond": {
- "axisPosition": "top",
- "showLabels": true
+ "xAxis": {
+ "show": true,
+ "label": "",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "600",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.54)",
+ "position": "bottom",
+ "showTickLabels": true,
+ "tickLabelFont": {
+ "family": "Roboto",
+ "size": 10,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "tickLabelColor": "rgba(0, 0, 0, 0.54)",
+ "showTicks": true,
+ "ticksColor": "rgba(0, 0, 0, 0.54)",
+ "showLine": true,
+ "lineColor": "rgba(0, 0, 0, 0.54)",
+ "showSplitLines": true,
+ "splitLinesColor": "rgba(0, 0, 0, 0.12)"
+ },
+ "noAggregationBarWidthSettings": {
+ "strategy": "group",
+ "groupWidth": {
+ "relative": false,
+ "relativeWidth": 2,
+ "absoluteWidth": 1800000
+ },
+ "barWidth": {
+ "relative": true,
+ "relativeWidth": 2,
+ "absoluteWidth": 1000
+ }
},
"showLegend": true,
+ "legendLabelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "16px"
+ },
+ "legendLabelColor": "rgba(0, 0, 0, 0.76)",
"legendConfig": {
"direction": "column",
"position": "bottom",
+ "sortDataKeys": false,
"showMin": true,
"showMax": true,
"showAvg": false,
- "showTotal": true
- }
+ "showTotal": true,
+ "showLatest": false
+ },
+ "showTooltip": true,
+ "tooltipTrigger": "axis",
+ "tooltipValueFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "500",
+ "lineHeight": "16px"
+ },
+ "tooltipValueColor": "rgba(0, 0, 0, 0.76)",
+ "tooltipShowDate": true,
+ "tooltipDateFormat": {
+ "format": "yyyy-MM-dd HH:mm:ss",
+ "lastUpdateAgo": false,
+ "custom": false
+ },
+ "tooltipDateFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "16px"
+ },
+ "tooltipDateColor": "rgba(0, 0, 0, 0.76)",
+ "tooltipDateInterval": true,
+ "tooltipBackgroundColor": "rgba(255, 255, 255, 0.76)",
+ "tooltipBackgroundBlur": 4,
+ "animation": {
+ "animation": true,
+ "animationThreshold": 2000,
+ "animationDuration": 300,
+ "animationEasing": "cubicOut",
+ "animationDelay": 0,
+ "animationDurationUpdate": 300,
+ "animationEasingUpdate": "cubicOut",
+ "animationDelayUpdate": 0
+ },
+ "background": {
+ "type": "color",
+ "color": "#fff",
+ "overlay": {
+ "enabled": false,
+ "color": "rgba(255,255,255,0.72)",
+ "blur": 3
+ }
+ },
+ "padding": "12px"
},
- "title": "Processing Failures and Timeouts",
+ "title": "{i18n:api-usage.processing-failures-and-timeouts}",
"dropShadow": true,
"enableFullscreen": true,
- "titleStyle": {
- "fontSize": "16px",
- "fontWeight": 400
- },
- "mobileHeight": null,
+ "titleStyle": null,
+ "configMode": "basic",
+ "actions": {},
"showTitleIcon": false,
- "titleIcon": null,
- "iconColor": "rgba(0, 0, 0, 0.87)",
- "iconSize": "24px",
- "titleTooltip": "",
- "widgetStyle": {},
+ "titleIcon": "thermostat",
+ "iconColor": "#1F6BDD",
"useDashboardTimewindow": false,
"displayTimewindow": true,
- "actions": {}
+ "titleFont": {
+ "size": 16,
+ "sizeUnit": "px",
+ "family": "Roboto",
+ "weight": "500",
+ "style": "normal",
+ "lineHeight": "24px"
+ },
+ "titleColor": "rgba(0, 0, 0, 0.87)",
+ "titleTooltip": "",
+ "widgetStyle": {},
+ "widgetCss": "",
+ "pageSize": 1024,
+ "units": "",
+ "decimals": null,
+ "noDataDisplayMessage": "",
+ "timewindowStyle": {
+ "showIcon": false,
+ "iconSize": "24px",
+ "icon": null,
+ "iconPosition": "left",
+ "font": {
+ "size": 12,
+ "sizeUnit": "px",
+ "family": "Roboto",
+ "weight": "400",
+ "style": "normal",
+ "lineHeight": "16px"
+ },
+ "color": "rgba(0, 0, 0, 0.38)",
+ "displayTypePrefix": true
+ },
+ "margin": "0px",
+ "borderRadius": "0px",
+ "iconSize": "0px"
},
- "id": "ad3f1417-87a8-750e-fc67-49a2de1466d4",
- "typeFullFqn": "system.charts.basic_timeseries"
+ "row": 0,
+ "col": 0,
+ "id": "6a74ab56-cb36-e75e-c094-a51a896da94a"
}
},
"states": {
@@ -426,23 +965,21 @@
"layouts": {
"main": {
"widgets": {
- "81987f19-3eac-e4ce-b790-d96e9b54d9a0": {
- "sizeX": 12,
- "sizeY": 7,
- "mobileHeight": null,
- "row": 0,
- "col": 0
- },
"5eb79712-5c24-3060-7e4f-6af36b8f842d": {
"sizeX": 24,
"sizeY": 5,
"row": 7,
"col": 0
},
- "ad3f1417-87a8-750e-fc67-49a2de1466d4": {
+ "42face47-730d-f930-fef5-2a1ef6304b16": {
+ "sizeX": 12,
+ "sizeY": 7,
+ "row": 0,
+ "col": 0
+ },
+ "6a74ab56-cb36-e75e-c094-a51a896da94a": {
"sizeX": 12,
"sizeY": 7,
- "mobileHeight": null,
"row": 0,
"col": 12
}
@@ -511,6 +1048,5 @@
},
"filters": {}
},
- "externalId": null,
"name": "Rule Engine Statistics"
}
\ No newline at end of file
diff --git a/application/src/main/data/json/demo/dashboards/thermostats.json b/application/src/main/data/json/demo/dashboards/thermostats.json
index 967c1cb253..223722fee1 100644
--- a/application/src/main/data/json/demo/dashboards/thermostats.json
+++ b/application/src/main/data/json/demo/dashboards/thermostats.json
@@ -325,240 +325,6 @@
"id": "7943196b-eedb-d422-f9c3-b32d379ad172",
"typeFullFqn": "system.alarm_widgets.alarms_table"
},
- "14a19183-f0b2-d6be-0f62-9863f0a51111": {
- "type": "timeseries",
- "sizeX": 18,
- "sizeY": 6,
- "config": {
- "datasources": [
- {
- "type": "entity",
- "dataKeys": [
- {
- "name": "temperature",
- "type": "timeseries",
- "label": "Temperature",
- "color": "#ef5350",
- "settings": {
- "excludeFromStacking": false,
- "hideDataByDefault": false,
- "disableDataHiding": false,
- "removeFromLegend": false,
- "showLines": true,
- "fillLines": true,
- "showPoints": false,
- "showPointShape": "circle",
- "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
- "showPointsLineWidth": 5,
- "showPointsRadius": 3,
- "showSeparateAxis": false,
- "axisPosition": "left",
- "thresholds": [
- {
- "thresholdValueSource": "predefinedValue"
- }
- ],
- "comparisonSettings": {
- "showValuesForComparison": true
- }
- },
- "_hash": 0.7852346160709658,
- "units": "°C",
- "decimals": 1
- }
- ],
- "entityAliasId": "12ae98c7-1ea2-52cf-64d5-763e9d993547"
- }
- ],
- "timewindow": {
- "realtime": {
- "interval": 30000,
- "timewindowMs": 3600000
- },
- "aggregation": {
- "type": "AVG",
- "limit": 25000
- }
- },
- "showTitle": true,
- "backgroundColor": "#fff",
- "color": "rgba(0, 0, 0, 0.87)",
- "padding": "8px",
- "settings": {
- "shadowSize": 4,
- "fontColor": "#545454",
- "fontSize": 10,
- "xaxis": {
- "showLabels": true,
- "color": "#545454"
- },
- "yaxis": {
- "showLabels": true,
- "color": "#545454"
- },
- "grid": {
- "color": "#545454",
- "tickColor": "#DDDDDD",
- "verticalLines": true,
- "horizontalLines": true,
- "outlineWidth": 1
- },
- "stack": false,
- "tooltipIndividual": false,
- "timeForComparison": "months",
- "xaxisSecond": {
- "axisPosition": "top",
- "showLabels": true
- },
- "smoothLines": true,
- "showLegend": true,
- "legendConfig": {
- "direction": "column",
- "position": "bottom",
- "showMin": true,
- "showMax": true,
- "showAvg": true,
- "showTotal": false
- }
- },
- "title": "Temperature",
- "dropShadow": true,
- "enableFullscreen": true,
- "titleStyle": {
- "fontSize": "16px",
- "fontWeight": 400
- },
- "mobileHeight": null,
- "showTitleIcon": false,
- "titleIcon": null,
- "iconColor": "rgba(0, 0, 0, 0.87)",
- "iconSize": "24px",
- "titleTooltip": "",
- "widgetStyle": {},
- "useDashboardTimewindow": false,
- "displayTimewindow": true,
- "actions": {}
- },
- "id": "14a19183-f0b2-d6be-0f62-9863f0a51111",
- "typeFullFqn": "system.charts.basic_timeseries"
- },
- "07f49fd5-a73b-d74c-c220-362c20af81f4": {
- "type": "timeseries",
- "sizeX": 18,
- "sizeY": 6,
- "config": {
- "datasources": [
- {
- "type": "entity",
- "dataKeys": [
- {
- "name": "humidity",
- "type": "timeseries",
- "label": "Humidity",
- "color": "#2196f3",
- "settings": {
- "excludeFromStacking": false,
- "hideDataByDefault": false,
- "disableDataHiding": false,
- "removeFromLegend": false,
- "showLines": true,
- "fillLines": true,
- "showPoints": false,
- "showPointShape": "circle",
- "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
- "showPointsLineWidth": 5,
- "showPointsRadius": 3,
- "showSeparateAxis": false,
- "axisPosition": "left",
- "thresholds": [
- {
- "thresholdValueSource": "predefinedValue"
- }
- ],
- "comparisonSettings": {
- "showValuesForComparison": true
- }
- },
- "_hash": 0.28640715926957183,
- "units": "%",
- "decimals": 0
- }
- ],
- "entityAliasId": "12ae98c7-1ea2-52cf-64d5-763e9d993547"
- }
- ],
- "timewindow": {
- "realtime": {
- "interval": 30000,
- "timewindowMs": 3600000
- },
- "aggregation": {
- "type": "AVG",
- "limit": 25000
- }
- },
- "showTitle": true,
- "backgroundColor": "#fff",
- "color": "rgba(0, 0, 0, 0.87)",
- "padding": "8px",
- "settings": {
- "shadowSize": 4,
- "fontColor": "#545454",
- "fontSize": 10,
- "xaxis": {
- "showLabels": true,
- "color": "#545454"
- },
- "yaxis": {
- "showLabels": true,
- "color": "#545454"
- },
- "grid": {
- "color": "#545454",
- "tickColor": "#DDDDDD",
- "verticalLines": true,
- "horizontalLines": true,
- "outlineWidth": 1
- },
- "stack": false,
- "tooltipIndividual": false,
- "timeForComparison": "months",
- "xaxisSecond": {
- "axisPosition": "top",
- "showLabels": true
- },
- "smoothLines": true,
- "showLegend": true,
- "legendConfig": {
- "direction": "column",
- "position": "bottom",
- "showMin": true,
- "showMax": true,
- "showAvg": true,
- "showTotal": false
- }
- },
- "title": "Humidity",
- "dropShadow": true,
- "enableFullscreen": true,
- "titleStyle": {
- "fontSize": "16px",
- "fontWeight": 400
- },
- "mobileHeight": null,
- "showTitleIcon": false,
- "titleIcon": null,
- "iconColor": "rgba(0, 0, 0, 0.87)",
- "iconSize": "24px",
- "titleTooltip": "",
- "widgetStyle": {},
- "useDashboardTimewindow": false,
- "displayTimewindow": true,
- "actions": {}
- },
- "id": "07f49fd5-a73b-d74c-c220-362c20af81f4",
- "typeFullFqn": "system.charts.basic_timeseries"
- },
"c4631f94-2db3-523b-4d09-2a1a0a75d93f": {
"type": "latest",
"sizeX": 6,
@@ -668,7 +434,9 @@
"fieldsAlignment": "column",
"fieldsInRow": 2,
"groupTitle": "${entityName}",
- "widgetTitle": "Termostat settings"
+ "widgetTitle": "Termostat settings",
+ "columnGap": 10,
+ "rowGap": 5
},
"title": "New Update Multiple Attributes",
"dropShadow": true,
@@ -787,8 +555,8 @@
"markerImageSize": 48,
"useColorFunction": false,
"markerImages": [
- "data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiNmNDQzMzZ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+",
- "data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiMyNzg2MjJ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+Cg=="
+ "tb-image:dGhlcm1vc3RhdHNfZGFzaGJvYXJkX3dpZGdldF90aGVybW9zdGF0X21hcHNfbWFya2VyX2ltYWdlXzAuc3Zn:IlRoZXJtb3N0YXRzIiBkYXNoYm9hcmQgd2lkZ2V0ICJUaGVybW9zdGF0IG1hcHMiIG1hcmtlciBpbWFnZSAw;data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiNmNDQzMzZ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+",
+ "tb-image:dGhlcm1vc3RhdHNfZGFzaGJvYXJkX3dpZGdldF90aGVybW9zdGF0X21hcHNfbWFya2VyX2ltYWdlXzEuc3Zn:IlRoZXJtb3N0YXRzIiBkYXNoYm9hcmQgd2lkZ2V0ICJUaGVybW9zdGF0IG1hcHMiIG1hcmtlciBpbWFnZSAx;data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiMyNzg2MjJ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+Cg=="
],
"useMarkerImageFunction": true,
"colorFunction": "\n",
@@ -942,8 +710,8 @@
"markerImageSize": 34,
"useColorFunction": false,
"markerImages": [
- "data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiNmNDQzMzZ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+",
- "data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiMyNzg2MjJ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+Cg=="
+ "tb-image:dGhlcm1vc3RhdHNfZGFzaGJvYXJkX3dpZGdldF90aGVybW9zdGF0X21hcHNfbWFya2VyX2ltYWdlXzAuc3Zn:IlRoZXJtb3N0YXRzIiBkYXNoYm9hcmQgd2lkZ2V0ICJUaGVybW9zdGF0IG1hcHMiIG1hcmtlciBpbWFnZSAw;data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiNmNDQzMzZ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+",
+ "tb-image:dGhlcm1vc3RhdHNfZGFzaGJvYXJkX3dpZGdldF90aGVybW9zdGF0X21hcHNfbWFya2VyX2ltYWdlXzEuc3Zn:IlRoZXJtb3N0YXRzIiBkYXNoYm9hcmQgd2lkZ2V0ICJUaGVybW9zdGF0IG1hcHMiIG1hcmtlciBpbWFnZSAx;data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiMyNzg2MjJ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+Cg=="
],
"useMarkerImageFunction": true,
"color": "#fe7569",
@@ -1093,8 +861,8 @@
"markerImageSize": 34,
"useColorFunction": false,
"markerImages": [
- "data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiNmNDQzMzZ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+",
- "data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiMyNzg2MjJ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+Cg=="
+ "tb-image:dGhlcm1vc3RhdHNfZGFzaGJvYXJkX3dpZGdldF90aGVybW9zdGF0X21hcHNfbWFya2VyX2ltYWdlXzAuc3Zn:IlRoZXJtb3N0YXRzIiBkYXNoYm9hcmQgd2lkZ2V0ICJUaGVybW9zdGF0IG1hcHMiIG1hcmtlciBpbWFnZSAw;data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiNmNDQzMzZ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+",
+ "tb-image:dGhlcm1vc3RhdHNfZGFzaGJvYXJkX3dpZGdldF90aGVybW9zdGF0X21hcHNfbWFya2VyX2ltYWdlXzEuc3Zn:IlRoZXJtb3N0YXRzIiBkYXNoYm9hcmQgd2lkZ2V0ICJUaGVybW9zdGF0IG1hcHMiIG1hcmtlciBpbWFnZSAx;data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiMyNzg2MjJ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+Cg=="
],
"useMarkerImageFunction": true,
"color": "#fe7569",
@@ -1151,6 +919,792 @@
},
"id": "0a430429-9078-9ae6-2b67-e4a15a2bf8bf",
"typeFullFqn": "system.input_widgets.markers_placement_openstreetmap"
+ },
+ "eda8a397-0959-690c-405c-11e2c9b2bc7e": {
+ "typeFullFqn": "system.time_series_chart",
+ "type": "timeseries",
+ "sizeX": 8,
+ "sizeY": 5,
+ "config": {
+ "datasources": [
+ {
+ "type": "entity",
+ "name": "",
+ "entityAliasId": "12ae98c7-1ea2-52cf-64d5-763e9d993547",
+ "dataKeys": [
+ {
+ "name": "temperature",
+ "type": "timeseries",
+ "label": "Temperature",
+ "color": "#EF5350",
+ "settings": {
+ "yAxisId": "default",
+ "showInLegend": true,
+ "dataHiddenByDefault": false,
+ "type": "line",
+ "lineSettings": {
+ "showLine": true,
+ "step": false,
+ "stepType": "start",
+ "smooth": true,
+ "lineType": "solid",
+ "lineWidth": 2.5,
+ "showPoints": false,
+ "showPointLabel": false,
+ "pointLabelPosition": "top",
+ "pointLabelFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "pointLabelColor": "rgba(0, 0, 0, 0.76)",
+ "pointShape": "circle",
+ "pointSize": 14,
+ "fillAreaSettings": {
+ "type": "gradient",
+ "opacity": 0.4,
+ "gradient": {
+ "start": 60,
+ "end": 10
+ }
+ }
+ },
+ "barSettings": {
+ "showBorder": false,
+ "borderWidth": 2,
+ "borderRadius": 0,
+ "showLabel": false,
+ "labelPosition": "top",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.76)",
+ "backgroundSettings": {
+ "type": "none",
+ "opacity": 0.4,
+ "gradient": {
+ "start": 100,
+ "end": 0
+ }
+ }
+ }
+ },
+ "_hash": 0.5973804076994531,
+ "units": "°C",
+ "decimals": 1,
+ "aggregationType": null,
+ "funcBody": null,
+ "usePostProcessing": null,
+ "postFuncBody": null
+ }
+ ],
+ "alarmFilterConfig": {
+ "statusList": [
+ "ACTIVE"
+ ]
+ },
+ "latestDataKeys": [
+ {
+ "name": "temperatureAlarmThreshold",
+ "type": "attribute",
+ "label": "temperatureAlarmThreshold",
+ "color": "#4caf50",
+ "settings": {
+ "__thresholdKey": true
+ },
+ "_hash": 0.7120450032526351
+ }
+ ]
+ }
+ ],
+ "timewindow": {
+ "hideInterval": false,
+ "hideLastInterval": false,
+ "hideQuickInterval": false,
+ "hideAggregation": false,
+ "hideAggInterval": false,
+ "hideTimezone": false,
+ "selectedTab": 0,
+ "realtime": {
+ "realtimeType": 0,
+ "timewindowMs": 3600000,
+ "quickInterval": "CURRENT_DAY",
+ "interval": 30000
+ },
+ "aggregation": {
+ "type": "AVG",
+ "limit": 25000
+ },
+ "timezone": null
+ },
+ "showTitle": true,
+ "backgroundColor": "rgba(0, 0, 0, 0)",
+ "color": "rgba(0, 0, 0, 0.87)",
+ "padding": "0px",
+ "settings": {
+ "showLegend": true,
+ "legendConfig": {
+ "direction": "column",
+ "position": "bottom",
+ "sortDataKeys": false,
+ "showMin": true,
+ "showMax": true,
+ "showAvg": true,
+ "showTotal": false,
+ "showLatest": false
+ },
+ "thresholds": [
+ {
+ "type": "latestKey",
+ "yAxisId": "default",
+ "units": "°C",
+ "decimals": 0,
+ "lineColor": "rgb(233, 30, 99)",
+ "lineType": "solid",
+ "lineWidth": 2,
+ "startSymbol": "none",
+ "startSymbolSize": 5,
+ "endSymbol": "arrow",
+ "endSymbolSize": 8,
+ "showLabel": true,
+ "labelPosition": "end",
+ "labelFont": {
+ "size": 14,
+ "family": "Roboto",
+ "weight": "500",
+ "style": "normal"
+ },
+ "labelColor": "rgb(233, 30, 99)",
+ "latestKey": "temperatureAlarmThreshold",
+ "latestKeyType": "attribute"
+ }
+ ],
+ "dataZoom": true,
+ "stack": false,
+ "yAxis": {
+ "show": true,
+ "label": "",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "600",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.54)",
+ "position": "left",
+ "showTickLabels": true,
+ "tickLabelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "tickLabelColor": "rgba(0, 0, 0, 0.54)",
+ "showTicks": true,
+ "ticksColor": "rgba(0, 0, 0, 0.54)",
+ "showLine": true,
+ "lineColor": "rgba(0, 0, 0, 0.54)",
+ "showSplitLines": true,
+ "splitLinesColor": "rgba(0, 0, 0, 0.12)"
+ },
+ "xAxis": {
+ "show": true,
+ "label": "",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "600",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.54)",
+ "position": "bottom",
+ "showTickLabels": true,
+ "tickLabelFont": {
+ "family": "Roboto",
+ "size": 10,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "tickLabelColor": "rgba(0, 0, 0, 0.54)",
+ "showTicks": true,
+ "ticksColor": "rgba(0, 0, 0, 0.54)",
+ "showLine": true,
+ "lineColor": "rgba(0, 0, 0, 0.54)",
+ "showSplitLines": true,
+ "splitLinesColor": "rgba(0, 0, 0, 0.12)",
+ "ticksFormat": {}
+ },
+ "legendLabelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "16px"
+ },
+ "legendLabelColor": "rgba(0, 0, 0, 0.76)",
+ "showTooltip": true,
+ "tooltipTrigger": "axis",
+ "tooltipValueFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "500",
+ "lineHeight": "16px"
+ },
+ "tooltipValueColor": "rgba(0, 0, 0, 0.76)",
+ "tooltipShowDate": true,
+ "tooltipDateFormat": {
+ "format": "MMM dd yyyy HH:mm",
+ "lastUpdateAgo": false,
+ "custom": false,
+ "auto": true,
+ "autoDateFormatSettings": {}
+ },
+ "tooltipDateFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "16px"
+ },
+ "tooltipDateColor": "rgba(0, 0, 0, 0.76)",
+ "tooltipDateInterval": false,
+ "tooltipBackgroundColor": "rgba(255, 255, 255, 0.76)",
+ "tooltipBackgroundBlur": 4,
+ "background": {
+ "type": "color",
+ "color": "#fff",
+ "overlay": {
+ "enabled": false,
+ "color": "rgba(255,255,255,0.72)",
+ "blur": 3
+ }
+ },
+ "yAxes": {
+ "default": {
+ "units": "°C",
+ "decimals": 0,
+ "show": true,
+ "label": "",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "600",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.54)",
+ "position": "left",
+ "showTickLabels": true,
+ "tickLabelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "tickLabelColor": "rgba(0, 0, 0, 0.54)",
+ "ticksFormatter": null,
+ "showTicks": true,
+ "ticksColor": "rgba(0, 0, 0, 0.54)",
+ "showLine": true,
+ "lineColor": "rgba(0, 0, 0, 0.54)",
+ "showSplitLines": true,
+ "splitLinesColor": "rgba(0, 0, 0, 0.12)",
+ "id": "default",
+ "order": 0,
+ "min": 0
+ }
+ },
+ "noAggregationBarWidthSettings": {
+ "strategy": "group",
+ "groupWidth": {
+ "relative": true,
+ "relativeWidth": 2,
+ "absoluteWidth": 1000
+ },
+ "barWidth": {
+ "relative": true,
+ "relativeWidth": 2,
+ "absoluteWidth": 1000
+ }
+ },
+ "animation": {
+ "animation": true,
+ "animationThreshold": 2000,
+ "animationDuration": 500,
+ "animationEasing": "cubicOut",
+ "animationDelay": 0,
+ "animationDurationUpdate": 300,
+ "animationEasingUpdate": "cubicOut",
+ "animationDelayUpdate": 0
+ },
+ "padding": "12px"
+ },
+ "title": "Temperature",
+ "dropShadow": true,
+ "enableFullscreen": true,
+ "titleStyle": null,
+ "configMode": "basic",
+ "actions": {},
+ "showTitleIcon": false,
+ "titleIcon": "thermostat",
+ "iconColor": "#1F6BDD",
+ "useDashboardTimewindow": false,
+ "displayTimewindow": true,
+ "titleFont": {
+ "size": 16,
+ "sizeUnit": "px",
+ "family": "Roboto",
+ "weight": "500",
+ "style": "normal",
+ "lineHeight": "24px"
+ },
+ "titleColor": "rgba(0, 0, 0, 0.87)",
+ "titleTooltip": "",
+ "widgetStyle": {},
+ "widgetCss": "",
+ "pageSize": 1024,
+ "units": "",
+ "decimals": null,
+ "noDataDisplayMessage": "",
+ "timewindowStyle": {
+ "showIcon": false,
+ "iconSize": "24px",
+ "icon": null,
+ "iconPosition": "left",
+ "font": {
+ "size": 12,
+ "sizeUnit": "px",
+ "family": "Roboto",
+ "weight": "400",
+ "style": "normal",
+ "lineHeight": "16px"
+ },
+ "color": "rgba(0, 0, 0, 0.38)",
+ "displayTypePrefix": true
+ },
+ "margin": "0px",
+ "borderRadius": "0px",
+ "iconSize": "0px"
+ },
+ "row": 0,
+ "col": 0,
+ "id": "eda8a397-0959-690c-405c-11e2c9b2bc7e"
+ },
+ "ac90f089-197f-b767-82c3-2668844265a2": {
+ "typeFullFqn": "system.time_series_chart",
+ "type": "timeseries",
+ "sizeX": 8,
+ "sizeY": 5,
+ "config": {
+ "datasources": [
+ {
+ "type": "entity",
+ "name": "",
+ "entityAliasId": "12ae98c7-1ea2-52cf-64d5-763e9d993547",
+ "dataKeys": [
+ {
+ "name": "humidity",
+ "type": "timeseries",
+ "label": "Humidity",
+ "color": "#2196F3",
+ "settings": {
+ "yAxisId": "default",
+ "showInLegend": true,
+ "dataHiddenByDefault": false,
+ "type": "line",
+ "lineSettings": {
+ "showLine": true,
+ "step": false,
+ "stepType": "start",
+ "smooth": true,
+ "lineType": "solid",
+ "lineWidth": 2.5,
+ "showPoints": false,
+ "showPointLabel": false,
+ "pointLabelPosition": "top",
+ "pointLabelFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "pointLabelColor": "rgba(0, 0, 0, 0.76)",
+ "pointShape": "circle",
+ "pointSize": 14,
+ "fillAreaSettings": {
+ "type": "gradient",
+ "opacity": 0.4,
+ "gradient": {
+ "start": 60,
+ "end": 10
+ }
+ }
+ },
+ "barSettings": {
+ "showBorder": false,
+ "borderWidth": 2,
+ "borderRadius": 0,
+ "showLabel": false,
+ "labelPosition": "top",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.76)",
+ "backgroundSettings": {
+ "type": "none",
+ "opacity": 0.4,
+ "gradient": {
+ "start": 100,
+ "end": 0
+ }
+ }
+ }
+ },
+ "_hash": 0.4481337125330429,
+ "units": "%",
+ "decimals": 0,
+ "aggregationType": null,
+ "funcBody": null,
+ "usePostProcessing": null,
+ "postFuncBody": null
+ }
+ ],
+ "alarmFilterConfig": {
+ "statusList": [
+ "ACTIVE"
+ ]
+ },
+ "latestDataKeys": [
+ {
+ "name": "humidityAlarmThreshold",
+ "type": "attribute",
+ "label": "humidityAlarmThreshold",
+ "color": "#4caf50",
+ "settings": {
+ "__thresholdKey": true
+ },
+ "_hash": 0.134733085341747
+ }
+ ]
+ }
+ ],
+ "timewindow": {
+ "hideInterval": false,
+ "hideLastInterval": false,
+ "hideQuickInterval": false,
+ "hideAggregation": false,
+ "hideAggInterval": false,
+ "hideTimezone": false,
+ "selectedTab": 0,
+ "realtime": {
+ "realtimeType": 0,
+ "timewindowMs": 3600000,
+ "quickInterval": "CURRENT_DAY",
+ "interval": 30000
+ },
+ "aggregation": {
+ "type": "AVG",
+ "limit": 25000
+ },
+ "timezone": null
+ },
+ "showTitle": true,
+ "backgroundColor": "rgba(0, 0, 0, 0)",
+ "color": "rgba(0, 0, 0, 0.87)",
+ "padding": "0px",
+ "settings": {
+ "showLegend": true,
+ "legendConfig": {
+ "direction": "column",
+ "position": "bottom",
+ "sortDataKeys": false,
+ "showMin": true,
+ "showMax": true,
+ "showAvg": true,
+ "showTotal": false,
+ "showLatest": false
+ },
+ "thresholds": [
+ {
+ "type": "latestKey",
+ "yAxisId": "default",
+ "units": "%",
+ "decimals": 0,
+ "lineColor": "rgb(4, 138, 211)",
+ "lineType": "solid",
+ "lineWidth": 2,
+ "startSymbol": "none",
+ "startSymbolSize": 5,
+ "endSymbol": "arrow",
+ "endSymbolSize": 8,
+ "showLabel": true,
+ "labelPosition": "end",
+ "labelFont": {
+ "size": 14,
+ "family": "Roboto",
+ "weight": "500",
+ "style": "normal"
+ },
+ "labelColor": "rgb(4, 138, 211)",
+ "latestKey": "humidityAlarmThreshold",
+ "latestKeyType": "attribute"
+ }
+ ],
+ "dataZoom": true,
+ "stack": false,
+ "yAxis": {
+ "show": true,
+ "label": "",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "600",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.54)",
+ "position": "left",
+ "showTickLabels": true,
+ "tickLabelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "tickLabelColor": "rgba(0, 0, 0, 0.54)",
+ "showTicks": true,
+ "ticksColor": "rgba(0, 0, 0, 0.54)",
+ "showLine": true,
+ "lineColor": "rgba(0, 0, 0, 0.54)",
+ "showSplitLines": true,
+ "splitLinesColor": "rgba(0, 0, 0, 0.12)"
+ },
+ "xAxis": {
+ "show": true,
+ "label": "",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "600",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.54)",
+ "position": "bottom",
+ "showTickLabels": true,
+ "tickLabelFont": {
+ "family": "Roboto",
+ "size": 10,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "tickLabelColor": "rgba(0, 0, 0, 0.54)",
+ "showTicks": true,
+ "ticksColor": "rgba(0, 0, 0, 0.54)",
+ "showLine": true,
+ "lineColor": "rgba(0, 0, 0, 0.54)",
+ "showSplitLines": true,
+ "splitLinesColor": "rgba(0, 0, 0, 0.12)",
+ "ticksFormat": {}
+ },
+ "legendLabelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "16px"
+ },
+ "legendLabelColor": "rgba(0, 0, 0, 0.76)",
+ "showTooltip": true,
+ "tooltipTrigger": "axis",
+ "tooltipValueFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "500",
+ "lineHeight": "16px"
+ },
+ "tooltipValueColor": "rgba(0, 0, 0, 0.76)",
+ "tooltipShowDate": true,
+ "tooltipDateFormat": {
+ "format": null,
+ "lastUpdateAgo": false,
+ "custom": false,
+ "auto": true,
+ "autoDateFormatSettings": {}
+ },
+ "tooltipDateFont": {
+ "family": "Roboto",
+ "size": 11,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "16px"
+ },
+ "tooltipDateColor": "rgba(0, 0, 0, 0.76)",
+ "tooltipDateInterval": false,
+ "tooltipBackgroundColor": "rgba(255, 255, 255, 0.76)",
+ "tooltipBackgroundBlur": 4,
+ "background": {
+ "type": "color",
+ "color": "#fff",
+ "overlay": {
+ "enabled": false,
+ "color": "rgba(255,255,255,0.72)",
+ "blur": 3
+ }
+ },
+ "yAxes": {
+ "default": {
+ "units": "°C",
+ "decimals": 0,
+ "show": true,
+ "label": "",
+ "labelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "600",
+ "lineHeight": "1"
+ },
+ "labelColor": "rgba(0, 0, 0, 0.54)",
+ "position": "left",
+ "showTickLabels": true,
+ "tickLabelFont": {
+ "family": "Roboto",
+ "size": 12,
+ "sizeUnit": "px",
+ "style": "normal",
+ "weight": "400",
+ "lineHeight": "1"
+ },
+ "tickLabelColor": "rgba(0, 0, 0, 0.54)",
+ "ticksFormatter": null,
+ "showTicks": true,
+ "ticksColor": "rgba(0, 0, 0, 0.54)",
+ "showLine": true,
+ "lineColor": "rgba(0, 0, 0, 0.54)",
+ "showSplitLines": true,
+ "splitLinesColor": "rgba(0, 0, 0, 0.12)",
+ "id": "default",
+ "order": 0,
+ "min": 0
+ }
+ },
+ "noAggregationBarWidthSettings": {
+ "strategy": "group",
+ "groupWidth": {
+ "relative": true,
+ "relativeWidth": 2,
+ "absoluteWidth": 1000
+ },
+ "barWidth": {
+ "relative": true,
+ "relativeWidth": 2,
+ "absoluteWidth": 1000
+ }
+ },
+ "animation": {
+ "animation": true,
+ "animationThreshold": 2000,
+ "animationDuration": 500,
+ "animationEasing": "cubicOut",
+ "animationDelay": 0,
+ "animationDurationUpdate": 300,
+ "animationEasingUpdate": "cubicOut",
+ "animationDelayUpdate": 0
+ },
+ "padding": "12px"
+ },
+ "title": "Humidity",
+ "dropShadow": true,
+ "enableFullscreen": true,
+ "titleStyle": null,
+ "configMode": "basic",
+ "actions": {},
+ "showTitleIcon": false,
+ "titleIcon": "thermostat",
+ "iconColor": "#1F6BDD",
+ "useDashboardTimewindow": false,
+ "displayTimewindow": true,
+ "titleFont": {
+ "size": 16,
+ "sizeUnit": "px",
+ "family": "Roboto",
+ "weight": "500",
+ "style": "normal",
+ "lineHeight": "24px"
+ },
+ "titleColor": "rgba(0, 0, 0, 0.87)",
+ "titleTooltip": "",
+ "widgetStyle": {},
+ "widgetCss": "",
+ "pageSize": 1024,
+ "units": "",
+ "decimals": null,
+ "noDataDisplayMessage": "",
+ "timewindowStyle": {
+ "showIcon": false,
+ "iconSize": "24px",
+ "icon": null,
+ "iconPosition": "left",
+ "font": {
+ "size": 12,
+ "sizeUnit": "px",
+ "family": "Roboto",
+ "weight": "400",
+ "style": "normal",
+ "lineHeight": "16px"
+ },
+ "color": "rgba(0, 0, 0, 0.38)",
+ "displayTypePrefix": true
+ },
+ "margin": "0px",
+ "borderRadius": "0px",
+ "iconSize": "0px"
+ },
+ "row": 0,
+ "col": 0,
+ "id": "ac90f089-197f-b767-82c3-2668844265a2"
}
},
"states": {
@@ -1164,19 +1718,25 @@
"sizeX": 11,
"sizeY": 11,
"row": 0,
- "col": 0
+ "col": 0,
+ "mobileOrder": 1,
+ "mobileHeight": 5
},
"7943196b-eedb-d422-f9c3-b32d379ad172": {
"sizeX": 13,
"sizeY": 5,
"row": 0,
- "col": 11
+ "col": 11,
+ "mobileOrder": 2,
+ "mobileHeight": 5
},
"3da9a9a1-0b9a-2e1f-0dcb-0ff34a695abb": {
"sizeX": 13,
"sizeY": 6,
"row": 5,
- "col": 11
+ "col": 11,
+ "mobileOrder": 3,
+ "mobileHeight": 5
}
},
"gridSettings": {
@@ -1226,31 +1786,37 @@
"layouts": {
"main": {
"widgets": {
- "14a19183-f0b2-d6be-0f62-9863f0a51111": {
- "sizeX": 18,
+ "c4631f94-2db3-523b-4d09-2a1a0a75d93f": {
+ "sizeX": 6,
"sizeY": 6,
- "mobileHeight": null,
"row": 0,
- "col": 6
+ "col": 0,
+ "mobileOrder": 3,
+ "mobileHeight": 5
},
- "07f49fd5-a73b-d74c-c220-362c20af81f4": {
- "sizeX": 18,
+ "0a430429-9078-9ae6-2b67-e4a15a2bf8bf": {
+ "sizeX": 6,
"sizeY": 6,
- "mobileHeight": null,
"row": 6,
- "col": 6
+ "col": 0,
+ "mobileOrder": 4,
+ "mobileHeight": 6
},
- "c4631f94-2db3-523b-4d09-2a1a0a75d93f": {
- "sizeX": 6,
+ "eda8a397-0959-690c-405c-11e2c9b2bc7e": {
+ "sizeX": 18,
"sizeY": 6,
"row": 0,
- "col": 0
+ "col": 6,
+ "mobileOrder": 1,
+ "mobileHeight": 6
},
- "0a430429-9078-9ae6-2b67-e4a15a2bf8bf": {
- "sizeX": 6,
+ "ac90f089-197f-b767-82c3-2668844265a2": {
+ "sizeX": 18,
"sizeY": 6,
"row": 6,
- "col": 0
+ "col": 6,
+ "mobileOrder": 2,
+ "mobileHeight": 6
}
},
"gridSettings": {
@@ -1327,6 +1893,5 @@
},
"filters": {}
},
- "externalId": null,
"name": "Thermostats"
}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_bundles/charts.json b/application/src/main/data/json/system/widget_bundles/charts.json
index 07929028ff..979b241e67 100644
--- a/application/src/main/data/json/system/widget_bundles/charts.json
+++ b/application/src/main/data/json/system/widget_bundles/charts.json
@@ -2,12 +2,16 @@
"widgetsBundle": {
"alias": "charts",
"title": "Charts",
- "image": "tb-image:Y2hhcnRzX3N5c3RlbV9idW5kbGVfaW1hZ2UucG5n:IkNoYXJ0cyIgc3lzdGVtIGJ1bmRsZSBpbWFnZQ==;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAC91BMVEX////K5vz/wQchlvP0QzZgfYtMr1C20ujl5eUAAADi4uL/ySX9/v7/9+Dg4OA8o/TK2eT+6Ob1Wk7q9f7x8fHw8PHy8/L5+vn09PTT2t/p6ekznvRfs/b+wxHLy8v8/Pz/6KL///3+8/JRsVX6+/vq9uqTw+rn5+diuWVNq/bk5OTY2NjNzc2+vr6lzqfqop3u1Yr/wgzD4/w2oPSs2Pv4+Pnj4+S83/v8xBj/wgr0+v5itfdGqPX/1lv29vZUrvXHx8fH5fx2vvgunPTO5OvQ4+Oryd35xSG23fuRy/qAw/n39/jt7e3U4NK3t7eqqqprufdasfY/pPXL5PHu7u7r6+vf3t3/8srW3sjCwsK6urqxsbGw2vum1fuGxvn//fj/+urtzVf3/P/i8v6g0vvL5vqa0PqMyfns7Ozm5ubl1IL/333p0nLtz1/zyj/7/f/S6v17wfjM5fR4uevS0tJtiJX/3HLq0Wrxy0b1yTj/zDD/xhn9/v/u9/7/+PgpmvT//PPS4dj8w77/663c2qnm03yXzvpwu/dmt/fv7+/m6+2uz+ra4eX93tzV1dX/7LOurq6tra3g15j/4of/2WfvzFH1V0v/0kj0STz3yDH5xyjZ7f2gyerR4t7/9tzb3Nv/9dT61tPY3b/Z3Lrb27KMoavf2J92j5v/5JPrz2P2ZFn/xx++4fvr7/Dg6Ou+ztD8zcquvcT/8MKarbakpKSCmqT5n5iTz5Zmgo/5kIn3cWfpx0z1T0P/zz7U6/3P4+bO3ObO19vF0tq80dm6x82jtLz/7rni1YyJy4zc7/3O6Pz+7uz94d/Y7tm437qx3LPIz7P6sauo1ar/5pv6opuRkZHi1o97xH7aynr4gHdpvGzhymZbtl7zxC36wRC30ui30uTM1Njz69TM6M3F5cbC5MPDz7/p3bt/q52huI64wIf4gXjfzG67umTVvUDk8+Tm5N3a185yss2TwMjCz8T7ta/7s610qaWOr5PSy5H4hn33fnX3eG83NCs7AAAOvklEQVR42tzaSYyLYRzH8Z9SaV6P19a+7+u1VKmUWhJLK7baDpY2StKZCSNmwsFMHJDgYM84WGIZIUgkloMQYt8FsUessUWIiy0ODk4ccDDzvG2fvn3eeVvK+758LxKHJ/30eZ63/+kM/p+ICGVhHA5r9Gj0m7wQv1LlHiRrt8BZSae7kiSS+IWk55WhLXAWRIY4uW/fLaiHTFBsZdO9k5OOgRApJAiCCqm+78LTNZVQwoIQTcgoIlJfL/abPBpEEPYIf6kwiioeEqMpGbToQpLqGknjasWoj6D4BNhYUBVDMpqK+MSw8i9A4kLB1+kvExPE4ZBYOORHEUmiShwMkbmXZ0ZZ51QIUcUg8lPWb4hh2TAYlBDjjoTEREnvOnrs1JlFbre7Izo0b96p95qJQ5ZDlz+sOhCSEAhYwWunGgw0Ckk3YmazZfrzJTsM4hdSYB29pSkYhDVo0q5csCg5CiKLEWTbsN/NYhDW8LvIRjwJB0EiYpDtRobBQ1hTryCbqv5VyKpufKthnCISpIvfYgADCGssu/gpz9+EtHbxtYJhceboeMBtDmF1moBMXo8jIHLWQU5wCAbhGzsruyeqAyDBcj+0lP1uMwhf79lIV1ZjO4RkPwmOHHCbQ/gGZe+8R7Ib4lGgtX6RuxCEb9yY7PsRtBfiVZmjMIRvZbPsTbMVIovcuTKF8I2bz94SGyGZAxE84y4Owjcoc+PDEfsgUhm0TrmLhfD1ngWaX7QNQjKfIDfdxUP4xkKrxmcXJKSkL/r5kiDNh0BLJPZAiJj+94y7NEin5eyk2gFRFdCOuUuA0BY0uSVXO/ONLR1iuCGxRSVA0s0HzZuA1rTInul0+bbN+dr8YUiZBNoJd+mQztASQSt/LiWRtAoighZfVAIkW7Pc0xqsnC7Vo94iSCTENqR0yPDM9yp0Qyqfd7VuR2plNEYWlQJhzdZd900Nd6QcRBBuGM0Cwq/00QAyXhDC+SfrmvvPQOaAts4HliU7Ele5b35KgXSeARqJWg1RY0hHNtw6UBJk5fDBy9lGWw0RQVtVrQ0pJ8zHeFPFMO7qWQkRQOvmWtKNs/CQQgqWlLASwh6+I+n/P9UsR26e+QXIuClMwSJRayFeH2itXFqHD7bmLGaQTmOHzAMtRKBLtBaiRrQr4mIt3do6oFn2F4CMGNxhHpt0FOgSfhsS6G5QIYhA0FiFi8Ysu6lFub7/fFOQUUP0ByqmQleU/C6kXQu+9gUg7K7n12XuXmqJpS16yKgJwwpcCqgxOyBbXQYNWKxZ4m9Onc+FrB04CwD87849MPnZKSXZAVnsMm7otopA+hdX5zXIlGZUEXx37nXLlg9NID6vHZBtrqbbVlGlWdZj2Hx6ueX3dxoUDZ0zgUgpOyAjXaaNPFmFTPKHOz2oogBEqXEgpKEdt1c1Kh6+oIp0d0wgcdWZEJerNQDygikK7UjCaXck3UGgbgXkHrmQJ2Z3ZJ0dkLmFj1YAG3deAB7kQj6YQNZJdkAOFnJ0WYUVh1q0qAP650B6mkASiqUQEbTNhSAVwIWG9S61A3mVdbxCTsFa6ArJlkI8fjS2t4BjLlBHF7wYgJSFPOI/N1gCLIXUKNrA2cXUsSSAdpe0FZ8B79OOHhJy8sjQJVoJYQ/Jy6aQavgvZpY8DtwxeGZBhK0Qf5gbtvg2A2ezS27vDj8dUHrptkD2QJccshLC3rjbZgMKsK8F6yXwufFgPTCZ2oGEZDEkrN32qqYvyeEqdG+fu+hX4BGdfM1OlkCA2OnToX7TR1sD8fkKDSm7ge+6RXduBHnxiPstJA+TUn02JZG0AsIuyWaT0eRxC32HVsAPfSIB+K/GlUqyBfVWQNhLqFpqMprkL3sBeUkq9IUiAOTTHimpbgHxeq8bQbzGbTSAbPe+NYJ4vRIypbzcuMWNJlx10EXKidHDN9a3r6D0jYP4fIYQn3H7jCA+Q4jP50UmIoBW3cVkNNGljSq5qRL0KWVgWXS0EPU3Pcov1kYTvosBsGJh5BUO2gBRVG5LuNGE7xn/9wasoAAbIBBJU7ekGoH0aMK3jzkiyKs2bgOEfQasasWPJs+MDJlRRSss8X88DDsgbEtOmowmfC9B8/iQXyhmE0QJQWsxP5qY9AUAiXqRnyzAJgiiMmhVl/WjySdjARtVEFXAJcjFQnr24HtVCiQoQmv3UpPRhMVGFQIuSUXRkJZ8vUqBoMwHrYrMM/hyAPe50cR0VGEPYxshEGVorR6qfRNfDdz7VMCxvQ58Qgx2QvwiyUgGuBraisaOHzJhXDq7AnypGtgKgVKLrITOvLRA3cWmduPsPRgUEWAzBGoC6SoOL61Gto1n2/PPq5d1VTAqWE5sh6B2HdK1Pgld9x9/O7QzuxU/zh5fAeP85TLsh/xk545xGgaCAIr+Eo1GUzn2apsVkoUlF0Bjl1wASsgZnKOk4AZIKDfIPaDiBtyEDhdZkLPVRPKrd4uv3WKqYaz52/XH6+F4PHzmG+apy0OIWqDMfN9FCNpXlEv2gJMQ6CZKNdbgJ4S4U4rU1uIphGANBWKv+Aoh2abgW1XgLQSmMx9FozR4DKEdO2WxYDX4DIFgUcnJn/QbArXFtHTBgOsQCCKV8o+hs0nBfQjos437RI6GznYDcBEhQNr01k+hZaaP+87sZWAxFfm+OfUm77envmR7lyHb+wyRnuVSeLoy+TXGamC1Wq1WPxoFtAfR4rpyDpE6ugxDHZSIy4EBw1AHfaAYcQDHCCemLMcQEULij3pkUAiNeoR8odq04eERE2ljz2HgkZOBNrHmxkY09wgHBtCmppBZsXMxOzu7mvMBqhuvTc8Y6Q4K9GAEgULNfOI15u8zKU6vISpGtHUdSmhfIQq3G6cxQkGgF1Eaa43S2m3qg6yLNWWsiPGIhLa2ro4OjT1iIh3QzQgDRkEmBDQKm3ta8ztrdnilGDEysjsG2CQT4REdHm1dGsfIbHtNE0Z2RjgwkZ6NW2NyoWY9v0xhmwdUMUijl/Ep4jM7J608YhUnHQd2DwKkB1nh0lhg7BRrhFAJ1dgmHTPgxe8afhlzqHsQIMAaV5Eg3YasDq7RxDhuYD0i3M6fBncPAjhqtmHVaOIci6QKWaO5ZkDSAHkE0N7ZhTQVhnF879NFRcSCPoiOZxREMLKLbdHO2sbcV/uAlXOQm87VdHMwp+kMt5lR4lZCYmBJaFqhIklR0K2UQZDUVRBEEH1c9UVFX1DdtffMebZ5ds5ZlJT0v5j4+Pzf9/zeZ+/zvuzCdZ3f2SY1GuSIBQRZCT2LMVQ1goqAIHmZ7ujig6zx+nTpzkl3HVYQ1KhYW2g8dFKqZLIWGg1V59lnrP8jIA3WkNOoKLMHrrI9D6M23aF8426nU464QJCNkOPELfm9xKsm+n4XyO61Da16pbfuREhNEM62xuILy0iv8+WN1aA5qUeI21inCIhEq2+SQ9ozPZe24FpYK41Om5ynIq1r+UBslU6pRmxcdowQa3ROdaUh2/4FgKCr4hERo1sKuwCjtcrecwQyknX63377HMKF5wZpIKR93CCNGltj3U7rKZQrbhB3YpxZX+M9UVZywiZoBVzvAbSrXz3sOGeZwxnyh5Mf8RA1+z0Vkh0Lb7994vYy3S6ui+cpYs9yLPzKiDP0lQKYvp4NtYv75oYaMW7jMDJ6+RSefb+9YvvzdkLcvuPHu+kMzqfMN0tI0lpQkXqdAek1Po6KXHs9rUpMCFhFJmS2QIIEMuyaC/VWzr1FxV5OY1YDJAw5fAq7QmO3ZkvknkxN0Q8lkeCKFIJ09arRjOtUVV0RkAM92meA1TImHMQ0BC1RczOAJZkJyTUB3HYNGiUSAGLyA8SiCDW25Z02XHvk4N237+MWUD198noNC8iWGx1HMMMj84Al/eOBQJBoCwyZ8D5pSZscdMhKINFutU6OBIC4h4FKMiFukOPVPU3aThnQolT4dfjs5ku5IFuqO64AwIc3ZrqyYQpg0CEEJDgIFtqDgpMUqGImnBVQtEp79UzWneRUbDzKMlYwrIKWUSQIpOPcKsjI8uHdwNgMcj0Ix+k30BHt5eoDdNKlCM7pPLNHKs8WPEUCNHfzg8SAmgc2RWRADbzAx/UyO8rKMRun144cHDAXjGWOA6SCSBiICvdmbdPmahexc94Q/PJGe4Ue/VzT3TOdALCqqVrkFStzVjFCgmpqlAfkMZBuxMgRB3g6hpA+gGhFxyPDuJvGH4UTkFYi5Q4yY01QYBlHSCDIw9OZfxpzngjkGtSVXRc2n8UIuDbNN9I5rTQpM6w5JgNZZIYLZABUE/mRiWEAfwbfPOknAYCaSt7J/bU5acpsrgjA4AwSDJK9eYtteQa9LkQ3gNNNN7WnD6ygM04ULn93MwCZMhUFSapgsjAWfUy3YjdTAmzMK5AqPutY3p0A2SxCpYLsltoLDMrcJpz21Et9LMM6/ABU2MU+0xgJj1m2DW7FMmZTFBi7Z+P4jxYKht2oZJBDZZULDF5CngPS1dvLPiyNkjKxzOSgIMbeWN0JGI4lXcUe0TURswD4Tah0EINTv9AQUNxjQHxSfbFhx1pwVUyFM41awB9kB0HBbp52F3wwgVDpICGNnM0QqjqaBdkpVnIMOzYIQEbMuSF8oMejLI8oOCQMpEJS0T//cVCdWMluMOjqMyDPCS/3sG6M8sTMBFz0gf7nQTb09+8ol2AQfJ8dKXbx1JWtwLpNbOO96r6cBpA9yd5xX0yD5TpL1u8MbccgtfvnP6BrJeqKksulNtzSNO1ClszhV4Fs7rSfAqr7ty4//x5pUDRyGJRir6hLfVLgTI7mOZQIUG60yCAaH6fBS9y36/SCZ8IoqqkUyMbRYoPYeAwBY9XVUmYajeHzbBItOgivwWYtcabRCPkI/YUgvxAyoSUCgv6D/AdZEiB79y4REI9niYAsmYrQWvkPS5SvlSJW/SNZS1F4q/CrZoeApNr15fv5szySDQKmlJSXe0oD8QjKr60VkLR9fW0Nf9bGw+US/qxNnq2SP1KRGgFJF9d5BKTt6z+8jz+rQlJzmCflJ6e3vqMkTdRjAAAAAElFTkSuQmCC",
+ "image": "tb-image:Y2hhcnRzLnN2Zw==:IkNoYXJ0cyIgc3lzdGVtIGJ1bmRsZSBpbWFnZQ==;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_4198_110493)">
<path d="M19.2461 20.9969L4.95448 54.3254L0 63.5V76H96V60.9561V45.3333L88.8987 69.0461L84.9407 54.2153L83.2233 58.5773L75.8824 74.9376C70.9889 57.1433 66.9111 50.5036 61.5851 33.0209L56.0897 59.1309H49.0221L47.657 16.702L44.9076 0L31.825 41.6708L28.7141 40.3627L19.2461 20.9969Z" fill="url(#paint0_linear_4198_110493)"/>
<path d="M0 63.6487L5.00109 53.488L19.4271 20.3988L28.9842 40.6255L32.1244 41.9243L44.8696 1L47.7391 16.1703C48.2772 32.6209 48.4184 42.5494 48.9565 59H56L61.5652 32.1233L75.913 74L85.0185 53.4413L88.9565 68.0176L96 44.7194" stroke="url(#paint1_linear_4198_110493)" stroke-width="0.776582"/>
</g>
<g clip-path="url(#clip1_4198_110493)">
<path d="M0 0L96 1.60872e-05" stroke="black" stroke-opacity="0.12" stroke-width="0.25417"/>
<path d="M0 19L96 19" stroke="black" stroke-opacity="0.12" stroke-width="0.25417"/>
<path d="M0 38L96 38" stroke="black" stroke-opacity="0.12" stroke-width="0.25417"/>
<path d="M0 57L96 57" stroke="black" stroke-opacity="0.12" stroke-width="0.25417"/>
<path d="M0 76L96 76" stroke="black" stroke-opacity="0.12" stroke-width="0.25417"/>
</g>
<rect x="104" width="96" height="76" rx="1.13433" fill="white"/>
<mask id="path-9-outside-1_4198_110493" maskUnits="userSpaceOnUse" x="152.018" y="3.25" width="35" height="51" fill="black">
<rect fill="white" x="152.018" y="3.25" width="35" height="51"/>
<path d="M153.341 7.26249C153.39 5.88606 154.546 4.79955 155.915 4.95061C160.635 5.47143 165.198 6.9984 169.293 9.43958C174.104 12.3073 178.113 16.3438 180.947 21.1744C183.781 26.005 185.349 31.4732 185.505 37.0716C185.638 41.8373 184.745 46.5659 182.897 50.9398C182.361 52.2085 180.848 52.6882 179.623 52.0586C178.398 51.4291 177.927 49.929 178.446 48.6533C179.919 45.0325 180.629 41.1365 180.52 37.2109C180.387 32.4522 179.054 27.8042 176.645 23.6982C174.236 19.5922 170.829 16.1612 166.74 13.7236C163.366 11.7128 159.619 10.4317 155.74 9.95152C154.373 9.78234 153.293 8.63891 153.341 7.26249Z"/>
</mask>
<path d="M153.341 7.26249C153.39 5.88606 154.546 4.79955 155.915 4.95061C160.635 5.47143 165.198 6.9984 169.293 9.43958C174.104 12.3073 178.113 16.3438 180.947 21.1744C183.781 26.005 185.349 31.4732 185.505 37.0716C185.638 41.8373 184.745 46.5659 182.897 50.9398C182.361 52.2085 180.848 52.6882 179.623 52.0586C178.398 51.4291 177.927 49.929 178.446 48.6533C179.919 45.0325 180.629 41.1365 180.52 37.2109C180.387 32.4522 179.054 27.8042 176.645 23.6982C174.236 19.5922 170.829 16.1612 166.74 13.7236C163.366 11.7128 159.619 10.4317 155.74 9.95152C154.373 9.78234 153.293 8.63891 153.341 7.26249Z" fill="#FF4D5A"/>
<path d="M153.341 7.26249C153.39 5.88606 154.546 4.79955 155.915 4.95061C160.635 5.47143 165.198 6.9984 169.293 9.43958C174.104 12.3073 178.113 16.3438 180.947 21.1744C183.781 26.005 185.349 31.4732 185.505 37.0716C185.638 41.8373 184.745 46.5659 182.897 50.9398C182.361 52.2085 180.848 52.6882 179.623 52.0586C178.398 51.4291 177.927 49.929 178.446 48.6533C179.919 45.0325 180.629 41.1365 180.52 37.2109C180.387 32.4522 179.054 27.8042 176.645 23.6982C174.236 19.5922 170.829 16.1612 166.74 13.7236C163.366 11.7128 159.619 10.4317 155.74 9.95152C154.373 9.78234 153.293 8.63891 153.341 7.26249Z" fill="white" fill-opacity="0.1"/>
<path d="M153.341 7.26249C153.39 5.88606 154.546 4.79955 155.915 4.95061C160.635 5.47143 165.198 6.9984 169.293 9.43958C174.104 12.3073 178.113 16.3438 180.947 21.1744C183.781 26.005 185.349 31.4732 185.505 37.0716C185.638 41.8373 184.745 46.5659 182.897 50.9398C182.361 52.2085 180.848 52.6882 179.623 52.0586C178.398 51.4291 177.927 49.929 178.446 48.6533C179.919 45.0325 180.629 41.1365 180.52 37.2109C180.387 32.4522 179.054 27.8042 176.645 23.6982C174.236 19.5922 170.829 16.1612 166.74 13.7236C163.366 11.7128 159.619 10.4317 155.74 9.95152C154.373 9.78234 153.293 8.63891 153.341 7.26249Z" stroke="white" stroke-width="1.93371" mask="url(#path-9-outside-1_4198_110493)"/>
<path d="M151.195 7.26249C151.147 5.88606 149.99 4.79955 148.621 4.95062C143.727 5.49067 139.003 7.11237 134.796 9.71053C129.881 12.7465 125.841 17.0109 123.075 22.0835C120.309 27.1561 118.913 32.8618 119.024 38.6383C119.135 44.4148 120.749 50.0627 123.708 55.0254C126.666 59.9881 130.866 64.0943 135.895 66.9393C140.924 69.7843 146.607 71.27 152.384 71.2498C158.162 71.2296 163.834 69.7044 168.843 66.8243C173.129 64.3596 176.802 60.9754 179.605 56.9273C180.389 55.7949 179.984 54.2607 178.796 53.5637C177.608 52.8668 176.089 53.2724 175.29 54.3943C172.936 57.6999 169.891 60.4681 166.357 62.5007C162.099 64.9487 157.278 66.2452 152.367 66.2623C147.456 66.2795 142.625 65.0167 138.351 62.5984C134.077 60.1802 130.506 56.6899 127.992 52.4716C125.477 48.2533 124.105 43.4526 124.011 38.5426C123.916 33.6325 125.103 28.7827 127.454 24.471C129.805 20.1593 133.239 16.5345 137.417 13.9539C140.886 11.8113 144.769 10.45 148.796 9.95151C150.163 9.78234 151.243 8.63891 151.195 7.26249Z" fill="#4CAF50"/>
<path d="M147.106 29.2344V33.5H146.549V29.2344H147.106ZM148.477 29.2344V29.6973H145.181V29.2344H148.477ZM148.591 31.9502V31.8828C148.591 31.6543 148.625 31.4424 148.691 31.2471C148.757 31.0498 148.853 30.8789 148.978 30.7344C149.103 30.5879 149.254 30.4746 149.432 30.3945C149.61 30.3125 149.809 30.2715 150.03 30.2715C150.252 30.2715 150.453 30.3125 150.63 30.3945C150.81 30.4746 150.962 30.5879 151.087 30.7344C151.214 30.8789 151.311 31.0498 151.377 31.2471C151.444 31.4424 151.477 31.6543 151.477 31.8828V31.9502C151.477 32.1787 151.444 32.3906 151.377 32.5859C151.311 32.7812 151.214 32.9521 151.087 33.0986C150.962 33.2432 150.811 33.3564 150.633 33.4385C150.458 33.5186 150.258 33.5586 150.036 33.5586C149.813 33.5586 149.613 33.5186 149.435 33.4385C149.257 33.3564 149.105 33.2432 148.978 33.0986C148.853 32.9521 148.757 32.7812 148.691 32.5859C148.625 32.3906 148.591 32.1787 148.591 31.9502ZM149.133 31.8828V31.9502C149.133 32.1084 149.152 32.2578 149.189 32.3984C149.226 32.5371 149.282 32.6602 149.356 32.7676C149.432 32.875 149.527 32.96 149.64 33.0225C149.753 33.083 149.885 33.1133 150.036 33.1133C150.184 33.1133 150.314 33.083 150.425 33.0225C150.539 32.96 150.632 32.875 150.707 32.7676C150.781 32.6602 150.836 32.5371 150.874 32.3984C150.913 32.2578 150.932 32.1084 150.932 31.9502V31.8828C150.932 31.7266 150.913 31.5791 150.874 31.4404C150.836 31.2998 150.78 31.1758 150.704 31.0684C150.629 30.959 150.536 30.873 150.422 30.8105C150.311 30.748 150.18 30.7168 150.03 30.7168C149.881 30.7168 149.75 30.748 149.637 30.8105C149.526 30.873 149.432 30.959 149.356 31.0684C149.282 31.1758 149.226 31.2998 149.189 31.4404C149.152 31.5791 149.133 31.7266 149.133 31.8828ZM153.484 30.3301V30.7461H151.77V30.3301H153.484ZM152.35 29.5596H152.892V32.7148C152.892 32.8223 152.909 32.9033 152.942 32.958C152.975 33.0127 153.018 33.0488 153.071 33.0664C153.124 33.084 153.18 33.0928 153.241 33.0928C153.286 33.0928 153.333 33.0889 153.381 33.0811C153.432 33.0713 153.47 33.0635 153.496 33.0576L153.499 33.5C153.456 33.5137 153.399 33.5264 153.329 33.5381C153.26 33.5518 153.177 33.5586 153.08 33.5586C152.947 33.5586 152.825 33.5322 152.713 33.4795C152.602 33.4268 152.513 33.3389 152.447 33.2158C152.382 33.0908 152.35 32.9229 152.35 32.7119V29.5596ZM155.989 32.958V31.3262C155.989 31.2012 155.963 31.0928 155.913 31.001C155.864 30.9072 155.79 30.835 155.69 30.7842C155.59 30.7334 155.467 30.708 155.321 30.708C155.184 30.708 155.064 30.7314 154.96 30.7783C154.859 30.8252 154.779 30.8867 154.72 30.9629C154.664 31.0391 154.635 31.1211 154.635 31.209H154.093C154.093 31.0957 154.123 30.9834 154.181 30.8721C154.24 30.7607 154.324 30.6602 154.433 30.5703C154.544 30.4785 154.677 30.4062 154.832 30.3535C154.988 30.2988 155.162 30.2715 155.353 30.2715C155.583 30.2715 155.787 30.3105 155.962 30.3887C156.14 30.4668 156.279 30.585 156.378 30.7432C156.48 30.8994 156.531 31.0957 156.531 31.332V32.8086C156.531 32.9141 156.54 33.0264 156.557 33.1455C156.577 33.2646 156.605 33.3672 156.642 33.4531V33.5H156.077C156.049 33.4375 156.028 33.3545 156.012 33.251C155.997 33.1455 155.989 33.0479 155.989 32.958ZM156.083 31.5781L156.088 31.959H155.541C155.386 31.959 155.249 31.9717 155.127 31.9971C155.006 32.0205 154.905 32.0566 154.823 32.1055C154.741 32.1543 154.678 32.2158 154.635 32.29C154.592 32.3623 154.571 32.4473 154.571 32.5449C154.571 32.6445 154.593 32.7354 154.638 32.8174C154.683 32.8994 154.75 32.9648 154.84 33.0137C154.932 33.0605 155.044 33.084 155.177 33.084C155.343 33.084 155.49 33.0488 155.617 32.9785C155.744 32.9082 155.844 32.8223 155.918 32.7207C155.995 32.6191 156.036 32.5205 156.042 32.4248L156.273 32.6855C156.259 32.7676 156.222 32.8584 156.162 32.958C156.101 33.0576 156.02 33.1533 155.918 33.2451C155.819 33.335 155.7 33.4102 155.561 33.4707C155.424 33.5293 155.27 33.5586 155.098 33.5586C154.883 33.5586 154.695 33.5166 154.533 33.4326C154.373 33.3486 154.248 33.2363 154.158 33.0957C154.07 32.9531 154.026 32.7939 154.026 32.6182C154.026 32.4482 154.059 32.2988 154.125 32.1699C154.192 32.0391 154.288 31.9307 154.413 31.8447C154.538 31.7568 154.688 31.6904 154.864 31.6455C155.04 31.6006 155.236 31.5781 155.453 31.5781H156.083ZM157.972 29V33.5H157.427V29H157.972Z" fill="black" fill-opacity="0.38"/>
<path d="M145.732 36.9395V45.5H144.32V38.6152L142.228 39.3242V38.1582L145.562 36.9395H145.732ZM154.275 43.1738C154.275 43.7051 154.152 44.1523 153.906 44.5156C153.66 44.8789 153.324 45.1543 152.898 45.3418C152.476 45.5254 152 45.6172 151.468 45.6172C150.937 45.6172 150.458 45.5254 150.033 45.3418C149.607 45.1543 149.271 44.8789 149.025 44.5156C148.779 44.1523 148.656 43.7051 148.656 43.1738C148.656 42.8223 148.724 42.5039 148.861 42.2188C148.998 41.9297 149.191 41.6816 149.441 41.4746C149.695 41.2637 149.992 41.1016 150.332 40.9883C150.675 40.875 151.05 40.8184 151.457 40.8184C151.996 40.8184 152.478 40.918 152.904 41.1172C153.33 41.3164 153.664 41.5918 153.906 41.9434C154.152 42.2949 154.275 42.7051 154.275 43.1738ZM152.857 43.1035C152.857 42.8184 152.798 42.5684 152.681 42.3535C152.564 42.1387 152.4 41.9727 152.189 41.8555C151.978 41.7383 151.734 41.6797 151.457 41.6797C151.175 41.6797 150.931 41.7383 150.724 41.8555C150.517 41.9727 150.355 42.1387 150.238 42.3535C150.125 42.5684 150.068 42.8184 150.068 43.1035C150.068 43.3926 150.125 43.6426 150.238 43.8535C150.351 44.0605 150.513 44.2188 150.724 44.3281C150.935 44.4375 151.183 44.4922 151.468 44.4922C151.753 44.4922 152 44.4375 152.207 44.3281C152.414 44.2188 152.574 44.0605 152.687 43.8535C152.8 43.6426 152.857 43.3926 152.857 43.1035ZM154.082 39.2129C154.082 39.6387 153.968 40.0176 153.742 40.3496C153.519 40.6816 153.21 40.9434 152.816 41.1348C152.421 41.3223 151.972 41.416 151.468 41.416C150.96 41.416 150.507 41.3223 150.109 41.1348C149.714 40.9434 149.404 40.6816 149.177 40.3496C148.955 40.0176 148.843 39.6387 148.843 39.2129C148.843 38.7051 148.955 38.2773 149.177 37.9297C149.404 37.5781 149.714 37.3105 150.109 37.127C150.503 36.9434 150.955 36.8516 151.462 36.8516C151.97 36.8516 152.421 36.9434 152.816 37.127C153.21 37.3105 153.519 37.5781 153.742 37.9297C153.968 38.2773 154.082 38.7051 154.082 39.2129ZM152.669 39.2598C152.669 39.0059 152.619 38.7832 152.517 38.5918C152.419 38.3965 152.281 38.2441 152.101 38.1348C151.921 38.0254 151.708 37.9707 151.462 37.9707C151.216 37.9707 151.003 38.0234 150.824 38.1289C150.644 38.2344 150.505 38.3828 150.408 38.5742C150.31 38.7656 150.261 38.9941 150.261 39.2598C150.261 39.5215 150.31 39.75 150.408 39.9453C150.505 40.1367 150.644 40.2871 150.824 40.3965C151.007 40.5059 151.222 40.5605 151.468 40.5605C151.714 40.5605 151.927 40.5059 152.107 40.3965C152.287 40.2871 152.425 40.1367 152.523 39.9453C152.621 39.75 152.669 39.5215 152.669 39.2598ZM157.175 40.5957H158.019C158.347 40.5957 158.619 40.5391 158.833 40.4258C159.052 40.3125 159.214 40.1562 159.32 39.957C159.425 39.7578 159.478 39.5293 159.478 39.2715C159.478 39.002 159.429 38.7715 159.332 38.5801C159.238 38.3848 159.093 38.2344 158.898 38.1289C158.707 38.0234 158.462 37.9707 158.166 37.9707C157.916 37.9707 157.689 38.0215 157.486 38.123C157.287 38.2207 157.128 38.3613 157.011 38.5449C156.894 38.7246 156.835 38.9395 156.835 39.1895H155.417C155.417 38.7363 155.537 38.334 155.775 37.9824C156.013 37.6309 156.337 37.3555 156.748 37.1562C157.162 36.9531 157.626 36.8516 158.142 36.8516C158.693 36.8516 159.173 36.9434 159.583 37.127C159.998 37.3066 160.32 37.5762 160.55 37.9355C160.781 38.2949 160.896 38.7402 160.896 39.2715C160.896 39.5137 160.839 39.7598 160.726 40.0098C160.613 40.2598 160.445 40.4883 160.222 40.6953C160 40.8984 159.722 41.0645 159.39 41.1934C159.058 41.3184 158.673 41.3809 158.236 41.3809H157.175V40.5957ZM157.175 41.6973V40.9238H158.236C158.736 40.9238 159.162 40.9824 159.513 41.0996C159.869 41.2168 160.158 41.3789 160.38 41.5859C160.603 41.7891 160.765 42.0215 160.867 42.2832C160.972 42.5449 161.025 42.8223 161.025 43.1152C161.025 43.5137 160.953 43.8691 160.808 44.1816C160.667 44.4902 160.466 44.752 160.205 44.9668C159.943 45.1816 159.636 45.3438 159.285 45.4531C158.937 45.5625 158.558 45.6172 158.148 45.6172C157.781 45.6172 157.429 45.5664 157.093 45.4648C156.757 45.3633 156.457 45.2129 156.191 45.0137C155.925 44.8105 155.714 44.5586 155.558 44.2578C155.406 43.9531 155.33 43.6016 155.33 43.2031H156.742C156.742 43.457 156.8 43.6816 156.917 43.877C157.039 44.0684 157.207 44.2188 157.421 44.3281C157.64 44.4375 157.89 44.4922 158.171 44.4922C158.468 44.4922 158.724 44.4395 158.939 44.334C159.154 44.2285 159.318 44.0723 159.431 43.8652C159.548 43.6582 159.607 43.4082 159.607 43.1152C159.607 42.7832 159.542 42.5137 159.414 42.3066C159.285 42.0996 159.101 41.9473 158.863 41.8496C158.625 41.748 158.343 41.6973 158.019 41.6973H157.175Z" fill="black" fill-opacity="0.87"/>
<g clip-path="url(#clip2_4198_110493)">
<path d="M2 88L197 88" stroke="black" stroke-opacity="0.12" stroke-width="0.5"/>
<path d="M2 106L197 106" stroke="black" stroke-opacity="0.12" stroke-width="0.5"/>
<path d="M2 124L197 124" stroke="black" stroke-opacity="0.12" stroke-width="0.5"/>
<path d="M2 142L197 142" stroke="black" stroke-opacity="0.12" stroke-width="0.5"/>
<path d="M2 160L197 160" stroke="black" stroke-opacity="0.12"/>
<path d="M103.695 91C103.695 89.8954 104.59 89 105.695 89H117.695C118.799 89 119.695 89.8954 119.695 91V160H103.695V91Z" fill="#4196F6"/>
<path d="M136 124C136 122.895 136.895 122 138 122H150C151.105 122 152 122.895 152 124V160H136V124Z" fill="#4196F6"/>
<path d="M7.69482 143C7.69482 141.895 8.59025 141 9.69482 141H21.6948C22.7994 141 23.6948 141.895 23.6948 143V160H7.69482V143Z" fill="#4196F6"/>
<path d="M39.6948 107C39.6948 105.895 40.5903 105 41.6948 105H53.6948C54.7994 105 55.6948 105.895 55.6948 107V160H39.6948V107Z" fill="#4196F6"/>
<path d="M72 132C72 130.895 72.8954 130 74 130H86C87.1046 130 88 130.895 88 132V160H72V132Z" fill="#4196F6"/>
<path d="M167.695 150C167.695 148.895 168.59 148 169.695 148H181.695C182.799 148 183.695 148.895 183.695 150V160H167.695V150Z" fill="#4196F6"/>
<path d="M4 109L18.5211 103.031C18.5933 103.001 18.6687 102.98 18.7457 102.968L59.5747 96.5365C59.6615 96.5228 59.7498 96.5207 59.8373 96.5301L99.0933 100.755L139.044 99.7131L181.142 95.8402C181.21 95.8339 181.278 95.8206 181.344 95.8005L197 91" stroke="#FFC107" stroke-width="2" stroke-linecap="round"/>
<circle cx="59" cy="97" r="1.5" fill="white" stroke="#FFC107"/>
<circle cx="18.6948" cy="103.161" r="1.5" fill="white" stroke="#FFC107"/>
<circle cx="3.69482" cy="109.161" r="1.5" fill="white" stroke="#FFC107"/>
<circle cx="100" cy="101" r="1.5" fill="white" stroke="#FFC107"/>
<circle cx="143" cy="99" r="1.5" fill="white" stroke="#FFC107"/>
<circle cx="180.695" cy="96.1611" r="1.5" fill="white" stroke="#FFC107"/>
<circle cx="196" cy="91" r="1.5" fill="white" stroke="#FFC107"/>
<path d="M4 132L18.6393 119.814L60.305 127.6L100.282 116L140.258 116L177.982 122.184L196 127.6" stroke="#4CAF50" stroke-width="2" stroke-linecap="round"/>
<circle cx="59" cy="128" r="1.5" fill="white" stroke="#4CAF50"/>
<circle cx="19" cy="120" r="1.5" fill="white" stroke="#4CAF50"/>
<circle cx="100" cy="116" r="1.5" fill="white" stroke="#4CAF50"/>
<circle cx="178.695" cy="122" r="1.5" fill="white" stroke="#4CAF50"/>
<circle cx="196" cy="128" r="1.5" fill="white" stroke="#4CAF50"/>
<circle cx="3.69482" cy="131.161" r="1.5" fill="white" stroke="#4CAF50"/>
<circle cx="143" cy="116" r="1.5" fill="white" stroke="#4CAF50"/>
</g>
<defs>
<linearGradient id="paint0_linear_4198_110493" x1="45.6986" y1="84.7493" x2="45.6986" y2="-19.9388" gradientUnits="userSpaceOnUse">
<stop offset="0.173389" stop-color="#6DC770"/>
<stop offset="0.262979" stop-color="#6DC770"/>
<stop offset="0.267969" stop-color="#FFC107"/>
<stop offset="0.446178" stop-color="#FFC107"/>
<stop offset="0.448316" stop-color="#FD8F3C"/>
<stop offset="0.624387" stop-color="#FD8F3C"/>
<stop offset="0.630803" stop-color="#F2737C"/>
</linearGradient>
<linearGradient id="paint1_linear_4198_110493" x1="45.2797" y1="74.6635" x2="45.2261" y2="-20.2431" gradientUnits="userSpaceOnUse">
<stop offset="0.182254" stop-color="#3FA71A"/>
<stop offset="0.190118" stop-color="#FFA600"/>
<stop offset="0.382761" stop-color="#FFA600"/>
<stop offset="0.388268" stop-color="#F56E08"/>
<stop offset="0.581695" stop-color="#F56E08"/>
<stop offset="0.587985" stop-color="#FF4D5A"/>
</linearGradient>
<clipPath id="clip0_4198_110493">
<rect width="96" height="76" fill="white"/>
</clipPath>
<clipPath id="clip1_4198_110493">
<rect width="96" height="76" fill="white"/>
</clipPath>
<clipPath id="clip2_4198_110493">
<rect width="200" height="76" fill="white" transform="translate(0 84)"/>
</clipPath>
</defs>
</svg>
",
"description": "Display time series data using customizable line and bar charts. Use various pie charts to display the latest values.",
"order": 1000,
"name": "Charts"
},
"widgetTypeFqns": [
+ "time_series_chart",
+ "line_chart",
+ "bar_chart",
+ "point_chart",
"charts.basic_timeseries",
"charts.state_chart",
"range_chart",
diff --git a/application/src/main/data/json/system/widget_types/bar_chart.json b/application/src/main/data/json/system/widget_types/bar_chart.json
new file mode 100644
index 0000000000..264c314686
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/bar_chart.json
@@ -0,0 +1,32 @@
+{
+ "fqn": "bar_chart",
+ "name": "Bar chart",
+ "deprecated": false,
+ "image": "tb-image:Y2hhcnRfKDIpLnN2Zw==:IkJhciBjaGFydCIgc3lzdGVtIHdpZGdldCBpbWFnZQ==;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_4183_90877)">
<path d="M2.84766 1.28125V7H2.125V2.18359L0.667969 2.71484V2.0625L2.73438 1.28125H2.84766ZM8.67517 3.70312V4.57031C8.67517 5.03646 8.63351 5.42969 8.55017 5.75C8.46684 6.07031 8.34705 6.32812 8.1908 6.52344C8.03455 6.71875 7.84575 6.86068 7.62439 6.94922C7.40564 7.03516 7.15825 7.07812 6.8822 7.07812C6.66345 7.07812 6.46163 7.05078 6.27673 6.99609C6.09184 6.94141 5.92517 6.85417 5.77673 6.73438C5.6309 6.61198 5.5059 6.45312 5.40173 6.25781C5.29757 6.0625 5.21814 5.82552 5.16345 5.54688C5.10877 5.26823 5.08142 4.94271 5.08142 4.57031V3.70312C5.08142 3.23698 5.12309 2.84635 5.20642 2.53125C5.29236 2.21615 5.41345 1.96354 5.5697 1.77344C5.72595 1.58073 5.91345 1.44271 6.1322 1.35938C6.35356 1.27604 6.60095 1.23438 6.87439 1.23438C7.09575 1.23438 7.29887 1.26172 7.48377 1.31641C7.67127 1.36849 7.83793 1.45312 7.98377 1.57031C8.1296 1.6849 8.2533 1.83854 8.35486 2.03125C8.45903 2.22135 8.53845 2.45443 8.59314 2.73047C8.64783 3.00651 8.67517 3.33073 8.67517 3.70312ZM7.94861 4.6875V3.58203C7.94861 3.32682 7.93298 3.10286 7.90173 2.91016C7.87309 2.71484 7.83012 2.54818 7.77283 2.41016C7.71554 2.27214 7.64262 2.16016 7.55408 2.07422C7.46814 1.98828 7.36788 1.92578 7.2533 1.88672C7.14132 1.84505 7.01502 1.82422 6.87439 1.82422C6.70252 1.82422 6.55017 1.85677 6.41736 1.92188C6.28455 1.98438 6.17257 2.08464 6.08142 2.22266C5.99288 2.36068 5.92517 2.54167 5.8783 2.76562C5.83142 2.98958 5.80798 3.26172 5.80798 3.58203V4.6875C5.80798 4.94271 5.82231 5.16797 5.85095 5.36328C5.8822 5.55859 5.92778 5.72786 5.98767 5.87109C6.04757 6.01172 6.12048 6.1276 6.20642 6.21875C6.29236 6.3099 6.39132 6.3776 6.5033 6.42188C6.61788 6.46354 6.74418 6.48438 6.8822 6.48438C7.05929 6.48438 7.21423 6.45052 7.34705 6.38281C7.47986 6.3151 7.59054 6.20964 7.67908 6.06641C7.77022 5.92057 7.83793 5.73438 7.8822 5.50781C7.92647 5.27865 7.94861 5.00521 7.94861 4.6875ZM13.3074 3.70312V4.57031C13.3074 5.03646 13.2657 5.42969 13.1824 5.75C13.099 6.07031 12.9793 6.32812 12.823 6.52344C12.6668 6.71875 12.4779 6.86068 12.2566 6.94922C12.0378 7.03516 11.7904 7.07812 11.5144 7.07812C11.2957 7.07812 11.0938 7.05078 10.9089 6.99609C10.724 6.94141 10.5574 6.85417 10.4089 6.73438C10.2631 6.61198 10.1381 6.45312 10.0339 6.25781C9.92977 6.0625 9.85034 5.82552 9.79566 5.54688C9.74097 5.26823 9.71363 4.94271 9.71363 4.57031V3.70312C9.71363 3.23698 9.75529 2.84635 9.83863 2.53125C9.92456 2.21615 10.0457 1.96354 10.2019 1.77344C10.3582 1.58073 10.5457 1.44271 10.7644 1.35938C10.9858 1.27604 11.2332 1.23438 11.5066 1.23438C11.7279 1.23438 11.9311 1.26172 12.116 1.31641C12.3035 1.36849 12.4701 1.45312 12.616 1.57031C12.7618 1.6849 12.8855 1.83854 12.9871 2.03125C13.0912 2.22135 13.1707 2.45443 13.2253 2.73047C13.28 3.00651 13.3074 3.33073 13.3074 3.70312ZM12.5808 4.6875V3.58203C12.5808 3.32682 12.5652 3.10286 12.5339 2.91016C12.5053 2.71484 12.4623 2.54818 12.405 2.41016C12.3477 2.27214 12.2748 2.16016 12.1863 2.07422C12.1003 1.98828 12.0001 1.92578 11.8855 1.88672C11.7735 1.84505 11.6472 1.82422 11.5066 1.82422C11.3347 1.82422 11.1824 1.85677 11.0496 1.92188C10.9168 1.98438 10.8048 2.08464 10.7136 2.22266C10.6251 2.36068 10.5574 2.54167 10.5105 2.76562C10.4636 2.98958 10.4402 3.26172 10.4402 3.58203V4.6875C10.4402 4.94271 10.4545 5.16797 10.4832 5.36328C10.5144 5.55859 10.56 5.72786 10.6199 5.87109C10.6798 6.01172 10.7527 6.1276 10.8386 6.21875C10.9246 6.3099 11.0235 6.3776 11.1355 6.42188C11.2501 6.46354 11.3764 6.48438 11.5144 6.48438C11.6915 6.48438 11.8464 6.45052 11.9793 6.38281C12.1121 6.3151 12.2227 6.20964 12.3113 6.06641C12.4024 5.92057 12.4701 5.73438 12.5144 5.50781C12.5587 5.27865 12.5808 5.00521 12.5808 4.6875ZM14.3068 2.70703V2.40625C14.3068 2.1901 14.3536 1.99349 14.4474 1.81641C14.5411 1.63932 14.6753 1.4974 14.8497 1.39062C15.0242 1.28385 15.2312 1.23047 15.4708 1.23047C15.7156 1.23047 15.924 1.28385 16.0958 1.39062C16.2703 1.4974 16.4044 1.63932 16.4982 1.81641C16.5919 1.99349 16.6388 2.1901 16.6388 2.40625V2.70703C16.6388 2.91797 16.5919 3.11198 16.4982 3.28906C16.407 3.46615 16.2742 3.60807 16.0997 3.71484C15.9279 3.82161 15.7208 3.875 15.4786 3.875C15.2365 3.875 15.0268 3.82161 14.8497 3.71484C14.6753 3.60807 14.5411 3.46615 14.4474 3.28906C14.3536 3.11198 14.3068 2.91797 14.3068 2.70703ZM14.8497 2.40625V2.70703C14.8497 2.82682 14.8719 2.9401 14.9161 3.04688C14.963 3.15365 15.0333 3.24089 15.1271 3.30859C15.2208 3.3737 15.338 3.40625 15.4786 3.40625C15.6193 3.40625 15.7352 3.3737 15.8263 3.30859C15.9174 3.24089 15.9852 3.15365 16.0294 3.04688C16.0737 2.9401 16.0958 2.82682 16.0958 2.70703V2.40625C16.0958 2.28385 16.0724 2.16927 16.0255 2.0625C15.9812 1.95312 15.9122 1.86589 15.8185 1.80078C15.7273 1.73307 15.6115 1.69922 15.4708 1.69922C15.3328 1.69922 15.2169 1.73307 15.1232 1.80078C15.032 1.86589 14.963 1.95312 14.9161 2.0625C14.8719 2.16927 14.8497 2.28385 14.8497 2.40625ZM17.0763 5.91016V5.60547C17.0763 5.39193 17.1232 5.19661 17.2169 5.01953C17.3107 4.84245 17.4448 4.70052 17.6193 4.59375C17.7937 4.48698 18.0008 4.43359 18.2404 4.43359C18.4852 4.43359 18.6935 4.48698 18.8654 4.59375C19.0398 4.70052 19.174 4.84245 19.2677 5.01953C19.3615 5.19661 19.4083 5.39193 19.4083 5.60547V5.91016C19.4083 6.1237 19.3615 6.31901 19.2677 6.49609C19.1766 6.67318 19.0437 6.8151 18.8693 6.92188C18.6974 7.02865 18.4904 7.08203 18.2482 7.08203C18.006 7.08203 17.7977 7.02865 17.6232 6.92188C17.4487 6.8151 17.3133 6.67318 17.2169 6.49609C17.1232 6.31901 17.0763 6.1237 17.0763 5.91016ZM17.6193 5.60547V5.91016C17.6193 6.02995 17.6414 6.14453 17.6857 6.25391C17.7325 6.36068 17.8029 6.44792 17.8966 6.51562C17.9904 6.58073 18.1075 6.61328 18.2482 6.61328C18.3888 6.61328 18.5047 6.58073 18.5958 6.51562C18.6896 6.44792 18.7586 6.36068 18.8029 6.25391C18.8471 6.14714 18.8693 6.03255 18.8693 5.91016V5.60547C18.8693 5.48307 18.8458 5.36849 18.799 5.26172C18.7547 5.15495 18.6857 5.06901 18.5919 5.00391C18.5008 4.9362 18.3836 4.90234 18.2404 4.90234C18.1023 4.90234 17.9865 4.9362 17.8927 5.00391C17.8016 5.06901 17.7325 5.15495 17.6857 5.26172C17.6414 5.36849 17.6193 5.48307 17.6193 5.60547ZM18.42 2.12109L15.6427 6.56641L15.2365 6.30859L18.0138 1.86328L18.42 2.12109Z" fill="black" fill-opacity="0.54"/>
<path d="M8.05859 33.6677C8.05859 34.0141 7.97786 34.3083 7.81641 34.5505C7.65755 34.7901 7.44141 34.9724 7.16797 35.0974C6.89714 35.2224 6.59115 35.2849 6.25 35.2849C5.90885 35.2849 5.60156 35.2224 5.32812 35.0974C5.05469 34.9724 4.83854 34.7901 4.67969 34.5505C4.52083 34.3083 4.44141 34.0141 4.44141 33.6677C4.44141 33.4412 4.48438 33.2341 4.57031 33.0466C4.65885 32.8565 4.78255 32.6912 4.94141 32.5505C5.10286 32.4099 5.29297 32.3018 5.51172 32.2263C5.73307 32.1482 5.97656 32.1091 6.24219 32.1091C6.59115 32.1091 6.90234 32.1768 7.17578 32.3123C7.44922 32.4451 7.66406 32.6287 7.82031 32.863C7.97917 33.0974 8.05859 33.3656 8.05859 33.6677ZM7.33203 33.6521C7.33203 33.4412 7.28646 33.255 7.19531 33.0935C7.10417 32.9294 6.97656 32.8018 6.8125 32.7107C6.64844 32.6195 6.45833 32.574 6.24219 32.574C6.02083 32.574 5.82943 32.6195 5.66797 32.7107C5.50911 32.8018 5.38542 32.9294 5.29688 33.0935C5.20833 33.255 5.16406 33.4412 5.16406 33.6521C5.16406 33.8708 5.20703 34.0583 5.29297 34.2146C5.38151 34.3682 5.50651 34.4867 5.66797 34.5701C5.83203 34.6508 6.02604 34.6912 6.25 34.6912C6.47396 34.6912 6.66667 34.6508 6.82812 34.5701C6.98958 34.4867 7.11328 34.3682 7.19922 34.2146C7.28776 34.0583 7.33203 33.8708 7.33203 33.6521ZM7.92578 30.9998C7.92578 31.2758 7.85286 31.5245 7.70703 31.7458C7.5612 31.9672 7.36198 32.1417 7.10938 32.2693C6.85677 32.3969 6.57031 32.4607 6.25 32.4607C5.92448 32.4607 5.63411 32.3969 5.37891 32.2693C5.1263 32.1417 4.92839 31.9672 4.78516 31.7458C4.64193 31.5245 4.57031 31.2758 4.57031 30.9998C4.57031 30.669 4.64193 30.3878 4.78516 30.156C4.93099 29.9242 5.13021 29.7472 5.38281 29.6248C5.63542 29.5024 5.92318 29.4412 6.24609 29.4412C6.57161 29.4412 6.86068 29.5024 7.11328 29.6248C7.36589 29.7472 7.5638 29.9242 7.70703 30.156C7.85286 30.3878 7.92578 30.669 7.92578 30.9998ZM7.20312 31.0115C7.20312 30.8214 7.16276 30.6534 7.08203 30.5076C7.0013 30.3617 6.88932 30.2472 6.74609 30.1638C6.60286 30.0779 6.4362 30.0349 6.24609 30.0349C6.05599 30.0349 5.88932 30.0753 5.74609 30.156C5.60547 30.2341 5.49479 30.3461 5.41406 30.4919C5.33594 30.6378 5.29688 30.811 5.29688 31.0115C5.29688 31.2068 5.33594 31.3774 5.41406 31.5232C5.49479 31.669 5.60677 31.7823 5.75 31.863C5.89323 31.9438 6.0599 31.9841 6.25 31.9841C6.4401 31.9841 6.60547 31.9438 6.74609 31.863C6.88932 31.7823 7.0013 31.669 7.08203 31.5232C7.16276 31.3774 7.20312 31.2068 7.20312 31.0115ZM12.6752 31.9099V32.7771C12.6752 33.2432 12.6335 33.6365 12.5502 33.9568C12.4668 34.2771 12.347 34.5349 12.1908 34.7302C12.0345 34.9255 11.8457 35.0675 11.6244 35.156C11.4056 35.2419 11.1582 35.2849 10.8822 35.2849C10.6635 35.2849 10.4616 35.2576 10.2767 35.2029C10.0918 35.1482 9.92517 35.061 9.77673 34.9412C9.6309 34.8188 9.5059 34.6599 9.40173 34.4646C9.29757 34.2693 9.21814 34.0323 9.16345 33.7537C9.10877 33.475 9.08142 33.1495 9.08142 32.7771V31.9099C9.08142 31.4438 9.12309 31.0531 9.20642 30.738C9.29236 30.4229 9.41345 30.1703 9.5697 29.9802C9.72595 29.7875 9.91345 29.6495 10.1322 29.5662C10.3536 29.4828 10.601 29.4412 10.8744 29.4412C11.0957 29.4412 11.2989 29.4685 11.4838 29.5232C11.6713 29.5753 11.8379 29.6599 11.9838 29.7771C12.1296 29.8917 12.2533 30.0453 12.3549 30.238C12.459 30.4281 12.5385 30.6612 12.5931 30.9373C12.6478 31.2133 12.6752 31.5375 12.6752 31.9099ZM11.9486 32.8943V31.7888C11.9486 31.5336 11.933 31.3097 11.9017 31.1169C11.8731 30.9216 11.8301 30.755 11.7728 30.6169C11.7155 30.4789 11.6426 30.3669 11.5541 30.281C11.4681 30.1951 11.3679 30.1326 11.2533 30.0935C11.1413 30.0518 11.015 30.031 10.8744 30.031C10.7025 30.031 10.5502 30.0636 10.4174 30.1287C10.2845 30.1912 10.1726 30.2914 10.0814 30.4294C9.99288 30.5675 9.92517 30.7485 9.8783 30.9724C9.83142 31.1964 9.80798 31.4685 9.80798 31.7888V32.8943C9.80798 33.1495 9.82231 33.3748 9.85095 33.5701C9.8822 33.7654 9.92778 33.9347 9.98767 34.0779C10.0476 34.2185 10.1205 34.3344 10.2064 34.4255C10.2924 34.5167 10.3913 34.5844 10.5033 34.6287C10.6179 34.6703 10.7442 34.6912 10.8822 34.6912C11.0593 34.6912 11.2142 34.6573 11.347 34.5896C11.4799 34.5219 11.5905 34.4164 11.6791 34.2732C11.7702 34.1274 11.8379 33.9412 11.8822 33.7146C11.9265 33.4854 11.9486 33.212 11.9486 32.8943ZM13.6746 30.9138V30.613C13.6746 30.3969 13.7214 30.2003 13.8152 30.0232C13.9089 29.8461 14.0431 29.7042 14.2175 29.5974C14.392 29.4906 14.599 29.4373 14.8386 29.4373C15.0834 29.4373 15.2918 29.4906 15.4636 29.5974C15.6381 29.7042 15.7722 29.8461 15.866 30.0232C15.9597 30.2003 16.0066 30.3969 16.0066 30.613V30.9138C16.0066 31.1248 15.9597 31.3188 15.866 31.4958C15.7748 31.6729 15.642 31.8149 15.4675 31.9216C15.2957 32.0284 15.0886 32.0818 14.8464 32.0818C14.6043 32.0818 14.3946 32.0284 14.2175 31.9216C14.0431 31.8149 13.9089 31.6729 13.8152 31.4958C13.7214 31.3188 13.6746 31.1248 13.6746 30.9138ZM14.2175 30.613V30.9138C14.2175 31.0336 14.2397 31.1469 14.2839 31.2537C14.3308 31.3604 14.4011 31.4477 14.4949 31.5154C14.5886 31.5805 14.7058 31.613 14.8464 31.613C14.9871 31.613 15.1029 31.5805 15.1941 31.5154C15.2852 31.4477 15.3529 31.3604 15.3972 31.2537C15.4415 31.1469 15.4636 31.0336 15.4636 30.9138V30.613C15.4636 30.4906 15.4402 30.3761 15.3933 30.2693C15.349 30.1599 15.28 30.0727 15.1863 30.0076C15.0951 29.9399 14.9793 29.906 14.8386 29.906C14.7006 29.906 14.5847 29.9399 14.491 30.0076C14.3998 30.0727 14.3308 30.1599 14.2839 30.2693C14.2397 30.3761 14.2175 30.4906 14.2175 30.613ZM16.4441 34.1169V33.8123C16.4441 33.5987 16.491 33.4034 16.5847 33.2263C16.6785 33.0492 16.8126 32.9073 16.9871 32.8005C17.1615 32.6938 17.3686 32.6404 17.6082 32.6404C17.8529 32.6404 18.0613 32.6938 18.2332 32.8005C18.4076 32.9073 18.5418 33.0492 18.6355 33.2263C18.7293 33.4034 18.7761 33.5987 18.7761 33.8123V34.1169C18.7761 34.3305 18.7293 34.5258 18.6355 34.7029C18.5444 34.88 18.4115 35.0219 18.2371 35.1287C18.0652 35.2354 17.8582 35.2888 17.616 35.2888C17.3738 35.2888 17.1654 35.2354 16.991 35.1287C16.8165 35.0219 16.6811 34.88 16.5847 34.7029C16.491 34.5258 16.4441 34.3305 16.4441 34.1169ZM16.9871 33.8123V34.1169C16.9871 34.2367 17.0092 34.3513 17.0535 34.4607C17.1003 34.5675 17.1707 34.6547 17.2644 34.7224C17.3582 34.7875 17.4753 34.8201 17.616 34.8201C17.7566 34.8201 17.8725 34.7875 17.9636 34.7224C18.0574 34.6547 18.1264 34.5675 18.1707 34.4607C18.2149 34.3539 18.2371 34.2393 18.2371 34.1169V33.8123C18.2371 33.6899 18.2136 33.5753 18.1668 33.4685C18.1225 33.3617 18.0535 33.2758 17.9597 33.2107C17.8686 33.143 17.7514 33.1091 17.6082 33.1091C17.4701 33.1091 17.3543 33.143 17.2605 33.2107C17.1694 33.2758 17.1003 33.3617 17.0535 33.4685C17.0092 33.5753 16.9871 33.6899 16.9871 33.8123ZM17.7878 30.3279L15.0105 34.7732L14.6043 34.5154L17.3816 30.0701L17.7878 30.3279Z" fill="black" fill-opacity="0.54"/>
<path d="M7.24609 57.7183H7.30859V58.3315H7.24609C6.86328 58.3315 6.54297 58.394 6.28516 58.519C6.02734 58.6414 5.82292 58.8068 5.67188 59.0151C5.52083 59.2209 5.41146 59.4526 5.34375 59.7104C5.27865 59.9683 5.24609 60.23 5.24609 60.4956V61.3315C5.24609 61.5841 5.27604 61.8081 5.33594 62.0034C5.39583 62.1961 5.47786 62.3589 5.58203 62.4917C5.6862 62.6245 5.80339 62.7248 5.93359 62.7925C6.06641 62.8602 6.20443 62.894 6.34766 62.894C6.51432 62.894 6.66276 62.8628 6.79297 62.8003C6.92318 62.7352 7.03255 62.6453 7.12109 62.5308C7.21224 62.4136 7.28125 62.2756 7.32812 62.1167C7.375 61.9578 7.39844 61.7834 7.39844 61.5933C7.39844 61.424 7.3776 61.2612 7.33594 61.105C7.29427 60.9461 7.23047 60.8055 7.14453 60.6831C7.05859 60.5581 6.95052 60.4604 6.82031 60.3901C6.69271 60.3172 6.54036 60.2808 6.36328 60.2808C6.16276 60.2808 5.97526 60.3302 5.80078 60.4292C5.62891 60.5256 5.48698 60.6532 5.375 60.812C5.26562 60.9683 5.20312 61.1388 5.1875 61.3237L4.80469 61.3198C4.84115 61.0282 4.90885 60.7795 5.00781 60.5737C5.10938 60.3654 5.23438 60.1961 5.38281 60.0659C5.53385 59.9331 5.70182 59.8368 5.88672 59.7769C6.07422 59.7144 6.27214 59.6831 6.48047 59.6831C6.76432 59.6831 7.00911 59.7365 7.21484 59.8433C7.42057 59.95 7.58984 60.0933 7.72266 60.2729C7.85547 60.45 7.95312 60.6506 8.01562 60.8745C8.08073 61.0959 8.11328 61.3237 8.11328 61.5581C8.11328 61.8263 8.07552 62.0776 8 62.312C7.92448 62.5464 7.8112 62.7521 7.66016 62.9292C7.51172 63.1063 7.32812 63.2443 7.10938 63.3433C6.89062 63.4422 6.63672 63.4917 6.34766 63.4917C6.04036 63.4917 5.77214 63.4292 5.54297 63.3042C5.3138 63.1766 5.1237 63.0073 4.97266 62.7964C4.82161 62.5854 4.70833 62.3511 4.63281 62.0933C4.55729 61.8354 4.51953 61.5737 4.51953 61.3081V60.9683C4.51953 60.5672 4.5599 60.174 4.64062 59.7886C4.72135 59.4032 4.86068 59.0542 5.05859 58.7417C5.25911 58.4292 5.53646 58.1805 5.89062 57.9956C6.24479 57.8107 6.69661 57.7183 7.24609 57.7183ZM12.6752 60.1167V60.9839C12.6752 61.45 12.6335 61.8433 12.5502 62.1636C12.4668 62.4839 12.347 62.7417 12.1908 62.937C12.0345 63.1323 11.8457 63.2743 11.6244 63.3628C11.4056 63.4487 11.1582 63.4917 10.8822 63.4917C10.6635 63.4917 10.4616 63.4644 10.2767 63.4097C10.0918 63.355 9.92517 63.2677 9.77673 63.1479C9.6309 63.0256 9.5059 62.8667 9.40173 62.6714C9.29757 62.4761 9.21814 62.2391 9.16345 61.9604C9.10877 61.6818 9.08142 61.3563 9.08142 60.9839V60.1167C9.08142 59.6506 9.12309 59.2599 9.20642 58.9448C9.29236 58.6297 9.41345 58.3771 9.5697 58.187C9.72595 57.9943 9.91345 57.8563 10.1322 57.7729C10.3536 57.6896 10.601 57.6479 10.8744 57.6479C11.0957 57.6479 11.2989 57.6753 11.4838 57.73C11.6713 57.7821 11.8379 57.8667 11.9838 57.9839C12.1296 58.0985 12.2533 58.2521 12.3549 58.4448C12.459 58.6349 12.5385 58.868 12.5931 59.144C12.6478 59.4201 12.6752 59.7443 12.6752 60.1167ZM11.9486 61.1011V59.9956C11.9486 59.7404 11.933 59.5164 11.9017 59.3237C11.8731 59.1284 11.8301 58.9618 11.7728 58.8237C11.7155 58.6857 11.6426 58.5737 11.5541 58.4878C11.4681 58.4019 11.3679 58.3394 11.2533 58.3003C11.1413 58.2586 11.015 58.2378 10.8744 58.2378C10.7025 58.2378 10.5502 58.2703 10.4174 58.3354C10.2845 58.3979 10.1726 58.4982 10.0814 58.6362C9.99288 58.7743 9.92517 58.9552 9.8783 59.1792C9.83142 59.4032 9.80798 59.6753 9.80798 59.9956V61.1011C9.80798 61.3563 9.82231 61.5815 9.85095 61.7769C9.8822 61.9722 9.92778 62.1414 9.98767 62.2847C10.0476 62.4253 10.1205 62.5412 10.2064 62.6323C10.2924 62.7235 10.3913 62.7912 10.5033 62.8354C10.6179 62.8771 10.7442 62.8979 10.8822 62.8979C11.0593 62.8979 11.2142 62.8641 11.347 62.7964C11.4799 62.7287 11.5905 62.6232 11.6791 62.48C11.7702 62.3341 11.8379 62.1479 11.8822 61.9214C11.9265 61.6922 11.9486 61.4188 11.9486 61.1011ZM13.6746 59.1206V58.8198C13.6746 58.6037 13.7214 58.4071 13.8152 58.23C13.9089 58.0529 14.0431 57.911 14.2175 57.8042C14.392 57.6974 14.599 57.644 14.8386 57.644C15.0834 57.644 15.2918 57.6974 15.4636 57.8042C15.6381 57.911 15.7722 58.0529 15.866 58.23C15.9597 58.4071 16.0066 58.6037 16.0066 58.8198V59.1206C16.0066 59.3315 15.9597 59.5256 15.866 59.7026C15.7748 59.8797 15.642 60.0216 15.4675 60.1284C15.2957 60.2352 15.0886 60.2886 14.8464 60.2886C14.6043 60.2886 14.3946 60.2352 14.2175 60.1284C14.0431 60.0216 13.9089 59.8797 13.8152 59.7026C13.7214 59.5256 13.6746 59.3315 13.6746 59.1206ZM14.2175 58.8198V59.1206C14.2175 59.2404 14.2397 59.3537 14.2839 59.4604C14.3308 59.5672 14.4011 59.6545 14.4949 59.7222C14.5886 59.7873 14.7058 59.8198 14.8464 59.8198C14.9871 59.8198 15.1029 59.7873 15.1941 59.7222C15.2852 59.6545 15.3529 59.5672 15.3972 59.4604C15.4415 59.3537 15.4636 59.2404 15.4636 59.1206V58.8198C15.4636 58.6974 15.4402 58.5828 15.3933 58.4761C15.349 58.3667 15.28 58.2795 15.1863 58.2144C15.0951 58.1466 14.9793 58.1128 14.8386 58.1128C14.7006 58.1128 14.5847 58.1466 14.491 58.2144C14.3998 58.2795 14.3308 58.3667 14.2839 58.4761C14.2397 58.5828 14.2175 58.6974 14.2175 58.8198ZM16.4441 62.3237V62.019C16.4441 61.8055 16.491 61.6102 16.5847 61.4331C16.6785 61.256 16.8126 61.1141 16.9871 61.0073C17.1615 60.9006 17.3686 60.8472 17.6082 60.8472C17.8529 60.8472 18.0613 60.9006 18.2332 61.0073C18.4076 61.1141 18.5418 61.256 18.6355 61.4331C18.7293 61.6102 18.7761 61.8055 18.7761 62.019V62.3237C18.7761 62.5373 18.7293 62.7326 18.6355 62.9097C18.5444 63.0868 18.4115 63.2287 18.2371 63.3354C18.0652 63.4422 17.8582 63.4956 17.616 63.4956C17.3738 63.4956 17.1654 63.4422 16.991 63.3354C16.8165 63.2287 16.6811 63.0868 16.5847 62.9097C16.491 62.7326 16.4441 62.5373 16.4441 62.3237ZM16.9871 62.019V62.3237C16.9871 62.4435 17.0092 62.5581 17.0535 62.6675C17.1003 62.7743 17.1707 62.8615 17.2644 62.9292C17.3582 62.9943 17.4753 63.0269 17.616 63.0269C17.7566 63.0269 17.8725 62.9943 17.9636 62.9292C18.0574 62.8615 18.1264 62.7743 18.1707 62.6675C18.2149 62.5607 18.2371 62.4461 18.2371 62.3237V62.019C18.2371 61.8966 18.2136 61.7821 18.1668 61.6753C18.1225 61.5685 18.0535 61.4826 17.9597 61.4175C17.8686 61.3498 17.7514 61.3159 17.6082 61.3159C17.4701 61.3159 17.3543 61.3498 17.2605 61.4175C17.1694 61.4826 17.1003 61.5685 17.0535 61.6753C17.0092 61.7821 16.9871 61.8966 16.9871 62.019ZM17.7878 58.5347L15.0105 62.98L14.6043 62.7222L17.3816 58.2769L17.7878 58.5347Z" fill="black" fill-opacity="0.54"/>
<path d="M8.31641 89.7063V90.3H4.20703V89.8743L6.75391 85.9329H7.34375L6.71094 87.0735L5.02734 89.7063H8.31641ZM7.52344 85.9329V91.6204H6.80078V85.9329H7.52344ZM12.6752 88.3235V89.1907C12.6752 89.6568 12.6335 90.05 12.5502 90.3704C12.4668 90.6907 12.347 90.9485 12.1908 91.1438C12.0345 91.3391 11.8457 91.481 11.6244 91.5696C11.4056 91.6555 11.1582 91.6985 10.8822 91.6985C10.6635 91.6985 10.4616 91.6711 10.2767 91.6165C10.0918 91.5618 9.92517 91.4745 9.77673 91.3547C9.6309 91.2323 9.5059 91.0735 9.40173 90.8782C9.29757 90.6829 9.21814 90.4459 9.16345 90.1672C9.10877 89.8886 9.08142 89.5631 9.08142 89.1907V88.3235C9.08142 87.8573 9.12309 87.4667 9.20642 87.1516C9.29236 86.8365 9.41345 86.5839 9.5697 86.3938C9.72595 86.2011 9.91345 86.0631 10.1322 85.9797C10.3536 85.8964 10.601 85.8547 10.8744 85.8547C11.0957 85.8547 11.2989 85.8821 11.4838 85.9368C11.6713 85.9889 11.8379 86.0735 11.9838 86.1907C12.1296 86.3053 12.2533 86.4589 12.3549 86.6516C12.459 86.8417 12.5385 87.0748 12.5931 87.3508C12.6478 87.6269 12.6752 87.9511 12.6752 88.3235ZM11.9486 89.3079V88.2024C11.9486 87.9472 11.933 87.7232 11.9017 87.5305C11.8731 87.3352 11.8301 87.1685 11.7728 87.0305C11.7155 86.8925 11.6426 86.7805 11.5541 86.6946C11.4681 86.6086 11.3679 86.5461 11.2533 86.5071C11.1413 86.4654 11.015 86.4446 10.8744 86.4446C10.7025 86.4446 10.5502 86.4771 10.4174 86.5422C10.2845 86.6047 10.1726 86.705 10.0814 86.843C9.99288 86.981 9.92517 87.162 9.8783 87.386C9.83142 87.6099 9.80798 87.8821 9.80798 88.2024V89.3079C9.80798 89.5631 9.82231 89.7883 9.85095 89.9836C9.8822 90.179 9.92778 90.3482 9.98767 90.4915C10.0476 90.6321 10.1205 90.748 10.2064 90.8391C10.2924 90.9303 10.3913 90.998 10.5033 91.0422C10.6179 91.0839 10.7442 91.1047 10.8822 91.1047C11.0593 91.1047 11.2142 91.0709 11.347 91.0032C11.4799 90.9355 11.5905 90.83 11.6791 90.6868C11.7702 90.5409 11.8379 90.3547 11.8822 90.1282C11.9265 89.899 11.9486 89.6256 11.9486 89.3079ZM13.6746 87.3274V87.0266C13.6746 86.8105 13.7214 86.6139 13.8152 86.4368C13.9089 86.2597 14.0431 86.1178 14.2175 86.011C14.392 85.9042 14.599 85.8508 14.8386 85.8508C15.0834 85.8508 15.2918 85.9042 15.4636 86.011C15.6381 86.1178 15.7722 86.2597 15.866 86.4368C15.9597 86.6139 16.0066 86.8105 16.0066 87.0266V87.3274C16.0066 87.5383 15.9597 87.7323 15.866 87.9094C15.7748 88.0865 15.642 88.2284 15.4675 88.3352C15.2957 88.442 15.0886 88.4954 14.8464 88.4954C14.6043 88.4954 14.3946 88.442 14.2175 88.3352C14.0431 88.2284 13.9089 88.0865 13.8152 87.9094C13.7214 87.7323 13.6746 87.5383 13.6746 87.3274ZM14.2175 87.0266V87.3274C14.2175 87.4472 14.2397 87.5605 14.2839 87.6672C14.3308 87.774 14.4011 87.8612 14.4949 87.929C14.5886 87.9941 14.7058 88.0266 14.8464 88.0266C14.9871 88.0266 15.1029 87.9941 15.1941 87.929C15.2852 87.8612 15.3529 87.774 15.3972 87.6672C15.4415 87.5605 15.4636 87.4472 15.4636 87.3274V87.0266C15.4636 86.9042 15.4402 86.7896 15.3933 86.6829C15.349 86.5735 15.28 86.4862 15.1863 86.4211C15.0951 86.3534 14.9793 86.3196 14.8386 86.3196C14.7006 86.3196 14.5847 86.3534 14.491 86.4211C14.3998 86.4862 14.3308 86.5735 14.2839 86.6829C14.2397 86.7896 14.2175 86.9042 14.2175 87.0266ZM16.4441 90.5305V90.2258C16.4441 90.0123 16.491 89.817 16.5847 89.6399C16.6785 89.4628 16.8126 89.3209 16.9871 89.2141C17.1615 89.1073 17.3686 89.054 17.6082 89.054C17.8529 89.054 18.0613 89.1073 18.2332 89.2141C18.4076 89.3209 18.5418 89.4628 18.6355 89.6399C18.7293 89.817 18.7761 90.0123 18.7761 90.2258V90.5305C18.7761 90.7441 18.7293 90.9394 18.6355 91.1165C18.5444 91.2935 18.4115 91.4355 18.2371 91.5422C18.0652 91.649 17.8582 91.7024 17.616 91.7024C17.3738 91.7024 17.1654 91.649 16.991 91.5422C16.8165 91.4355 16.6811 91.2935 16.5847 91.1165C16.491 90.9394 16.4441 90.7441 16.4441 90.5305ZM16.9871 90.2258V90.5305C16.9871 90.6503 17.0092 90.7649 17.0535 90.8743C17.1003 90.981 17.1707 91.0683 17.2644 91.136C17.3582 91.2011 17.4753 91.2336 17.616 91.2336C17.7566 91.2336 17.8725 91.2011 17.9636 91.136C18.0574 91.0683 18.1264 90.981 18.1707 90.8743C18.2149 90.7675 18.2371 90.6529 18.2371 90.5305V90.2258C18.2371 90.1034 18.2136 89.9889 18.1668 89.8821C18.1225 89.7753 18.0535 89.6894 17.9597 89.6243C17.8686 89.5566 17.7514 89.5227 17.6082 89.5227C17.4701 89.5227 17.3543 89.5566 17.2605 89.6243C17.1694 89.6894 17.1003 89.7753 17.0535 89.8821C17.0092 89.9889 16.9871 90.1034 16.9871 90.2258ZM17.7878 86.7415L15.0105 91.1868L14.6043 90.929L17.3816 86.4836L17.7878 86.7415Z" fill="black" fill-opacity="0.54"/>
<path d="M8.19922 119.233V119.827H4.47656V119.308L6.33984 117.233C6.56901 116.978 6.74609 116.762 6.87109 116.585C6.9987 116.405 7.08724 116.245 7.13672 116.104C7.1888 115.961 7.21484 115.815 7.21484 115.667C7.21484 115.479 7.17578 115.31 7.09766 115.159C7.02214 115.006 6.91016 114.883 6.76172 114.792C6.61328 114.701 6.43359 114.655 6.22266 114.655C5.97005 114.655 5.75911 114.705 5.58984 114.804C5.42318 114.9 5.29818 115.035 5.21484 115.21C5.13151 115.384 5.08984 115.585 5.08984 115.812H4.36719C4.36719 115.491 4.4375 115.198 4.57812 114.933C4.71875 114.667 4.92708 114.456 5.20312 114.3C5.47917 114.141 5.81901 114.062 6.22266 114.062C6.58203 114.062 6.88932 114.125 7.14453 114.253C7.39974 114.378 7.59505 114.555 7.73047 114.784C7.86849 115.011 7.9375 115.276 7.9375 115.581C7.9375 115.748 7.90885 115.917 7.85156 116.089C7.79688 116.258 7.72005 116.427 7.62109 116.597C7.52474 116.766 7.41146 116.933 7.28125 117.097C7.15365 117.261 7.01693 117.422 6.87109 117.581L5.34766 119.233H8.19922ZM12.6752 116.53V117.397C12.6752 117.864 12.6335 118.257 12.5502 118.577C12.4668 118.897 12.347 119.155 12.1908 119.351C12.0345 119.546 11.8457 119.688 11.6244 119.776C11.4056 119.862 11.1582 119.905 10.8822 119.905C10.6635 119.905 10.4616 119.878 10.2767 119.823C10.0918 119.769 9.92517 119.681 9.77673 119.562C9.6309 119.439 9.5059 119.28 9.40173 119.085C9.29757 118.89 9.21814 118.653 9.16345 118.374C9.10877 118.095 9.08142 117.77 9.08142 117.397V116.53C9.08142 116.064 9.12309 115.674 9.20642 115.358C9.29236 115.043 9.41345 114.791 9.5697 114.601C9.72595 114.408 9.91345 114.27 10.1322 114.187C10.3536 114.103 10.601 114.062 10.8744 114.062C11.0957 114.062 11.2989 114.089 11.4838 114.144C11.6713 114.196 11.8379 114.28 11.9838 114.397C12.1296 114.512 12.2533 114.666 12.3549 114.858C12.459 115.049 12.5385 115.282 12.5931 115.558C12.6478 115.834 12.6752 116.158 12.6752 116.53ZM11.9486 117.515V116.409C11.9486 116.154 11.933 115.93 11.9017 115.737C11.8731 115.542 11.8301 115.375 11.7728 115.237C11.7155 115.099 11.6426 114.987 11.5541 114.901C11.4681 114.815 11.3679 114.753 11.2533 114.714C11.1413 114.672 11.015 114.651 10.8744 114.651C10.7025 114.651 10.5502 114.684 10.4174 114.749C10.2845 114.812 10.1726 114.912 10.0814 115.05C9.99288 115.188 9.92517 115.369 9.8783 115.593C9.83142 115.817 9.80798 116.089 9.80798 116.409V117.515C9.80798 117.77 9.82231 117.995 9.85095 118.19C9.8822 118.386 9.92778 118.555 9.98767 118.698C10.0476 118.839 10.1205 118.955 10.2064 119.046C10.2924 119.137 10.3913 119.205 10.5033 119.249C10.6179 119.291 10.7442 119.312 10.8822 119.312C11.0593 119.312 11.2142 119.278 11.347 119.21C11.4799 119.142 11.5905 119.037 11.6791 118.894C11.7702 118.748 11.8379 118.562 11.8822 118.335C11.9265 118.106 11.9486 117.832 11.9486 117.515ZM13.6746 115.534V115.233C13.6746 115.017 13.7214 114.821 13.8152 114.644C13.9089 114.466 14.0431 114.325 14.2175 114.218C14.392 114.111 14.599 114.058 14.8386 114.058C15.0834 114.058 15.2918 114.111 15.4636 114.218C15.6381 114.325 15.7722 114.466 15.866 114.644C15.9597 114.821 16.0066 115.017 16.0066 115.233V115.534C16.0066 115.745 15.9597 115.939 15.866 116.116C15.7748 116.293 15.642 116.435 15.4675 116.542C15.2957 116.649 15.0886 116.702 14.8464 116.702C14.6043 116.702 14.3946 116.649 14.2175 116.542C14.0431 116.435 13.9089 116.293 13.8152 116.116C13.7214 115.939 13.6746 115.745 13.6746 115.534ZM14.2175 115.233V115.534C14.2175 115.654 14.2397 115.767 14.2839 115.874C14.3308 115.981 14.4011 116.068 14.4949 116.136C14.5886 116.201 14.7058 116.233 14.8464 116.233C14.9871 116.233 15.1029 116.201 15.1941 116.136C15.2852 116.068 15.3529 115.981 15.3972 115.874C15.4415 115.767 15.4636 115.654 15.4636 115.534V115.233C15.4636 115.111 15.4402 114.996 15.3933 114.89C15.349 114.78 15.28 114.693 15.1863 114.628C15.0951 114.56 14.9793 114.526 14.8386 114.526C14.7006 114.526 14.5847 114.56 14.491 114.628C14.3998 114.693 14.3308 114.78 14.2839 114.89C14.2397 114.996 14.2175 115.111 14.2175 115.233ZM16.4441 118.737V118.433C16.4441 118.219 16.491 118.024 16.5847 117.847C16.6785 117.67 16.8126 117.528 16.9871 117.421C17.1615 117.314 17.3686 117.261 17.6082 117.261C17.8529 117.261 18.0613 117.314 18.2332 117.421C18.4076 117.528 18.5418 117.67 18.6355 117.847C18.7293 118.024 18.7761 118.219 18.7761 118.433V118.737C18.7761 118.951 18.7293 119.146 18.6355 119.323C18.5444 119.5 18.4115 119.642 18.2371 119.749C18.0652 119.856 17.8582 119.909 17.616 119.909C17.3738 119.909 17.1654 119.856 16.991 119.749C16.8165 119.642 16.6811 119.5 16.5847 119.323C16.491 119.146 16.4441 118.951 16.4441 118.737ZM16.9871 118.433V118.737C16.9871 118.857 17.0092 118.972 17.0535 119.081C17.1003 119.188 17.1707 119.275 17.2644 119.343C17.3582 119.408 17.4753 119.44 17.616 119.44C17.7566 119.44 17.8725 119.408 17.9636 119.343C18.0574 119.275 18.1264 119.188 18.1707 119.081C18.2149 118.974 18.2371 118.86 18.2371 118.737V118.433C18.2371 118.31 18.2136 118.196 18.1668 118.089C18.1225 117.982 18.0535 117.896 17.9597 117.831C17.8686 117.763 17.7514 117.729 17.6082 117.729C17.4701 117.729 17.3543 117.763 17.2605 117.831C17.1694 117.896 17.1003 117.982 17.0535 118.089C17.0092 118.196 16.9871 118.31 16.9871 118.433ZM17.7878 114.948L15.0105 119.394L14.6043 119.136L17.3816 114.69L17.7878 114.948Z" fill="black" fill-opacity="0.54"/>
<path d="M13.043 144.737V145.604C13.043 146.07 13.0013 146.464 12.918 146.784C12.8346 147.104 12.7148 147.362 12.5586 147.557C12.4023 147.753 12.2135 147.895 11.9922 147.983C11.7734 148.069 11.526 148.112 11.25 148.112C11.0312 148.112 10.8294 148.085 10.6445 148.03C10.4596 147.975 10.293 147.888 10.1445 147.768C9.9987 147.646 9.8737 147.487 9.76953 147.292C9.66536 147.096 9.58594 146.859 9.53125 146.581C9.47656 146.302 9.44922 145.977 9.44922 145.604V144.737C9.44922 144.271 9.49089 143.88 9.57422 143.565C9.66016 143.25 9.78125 142.997 9.9375 142.807C10.0938 142.615 10.2812 142.477 10.5 142.393C10.7214 142.31 10.9688 142.268 11.2422 142.268C11.4635 142.268 11.6667 142.296 11.8516 142.35C12.0391 142.402 12.2057 142.487 12.3516 142.604C12.4974 142.719 12.6211 142.872 12.7227 143.065C12.8268 143.255 12.9062 143.488 12.9609 143.764C13.0156 144.04 13.043 144.365 13.043 144.737ZM12.3164 145.721V144.616C12.3164 144.361 12.3008 144.137 12.2695 143.944C12.2409 143.749 12.1979 143.582 12.1406 143.444C12.0833 143.306 12.0104 143.194 11.9219 143.108C11.8359 143.022 11.7357 142.96 11.6211 142.921C11.5091 142.879 11.3828 142.858 11.2422 142.858C11.0703 142.858 10.918 142.891 10.7852 142.956C10.6523 143.018 10.5404 143.119 10.4492 143.257C10.3607 143.395 10.293 143.576 10.2461 143.8C10.1992 144.024 10.1758 144.296 10.1758 144.616V145.721C10.1758 145.977 10.1901 146.202 10.2188 146.397C10.25 146.593 10.2956 146.762 10.3555 146.905C10.4154 147.046 10.4883 147.162 10.5742 147.253C10.6602 147.344 10.7591 147.412 10.8711 147.456C10.9857 147.497 11.112 147.518 11.25 147.518C11.4271 147.518 11.582 147.484 11.7148 147.417C11.8477 147.349 11.9583 147.244 12.0469 147.1C12.138 146.955 12.2057 146.768 12.25 146.542C12.2943 146.313 12.3164 146.039 12.3164 145.721ZM14.0424 143.741V143.44C14.0424 143.224 14.0892 143.027 14.183 142.85C14.2767 142.673 14.4108 142.531 14.5853 142.425C14.7598 142.318 14.9668 142.264 15.2064 142.264C15.4512 142.264 15.6595 142.318 15.8314 142.425C16.0059 142.531 16.14 142.673 16.2338 142.85C16.3275 143.027 16.3744 143.224 16.3744 143.44V143.741C16.3744 143.952 16.3275 144.146 16.2338 144.323C16.1426 144.5 16.0098 144.642 15.8353 144.749C15.6635 144.856 15.4564 144.909 15.2142 144.909C14.972 144.909 14.7624 144.856 14.5853 144.749C14.4108 144.642 14.2767 144.5 14.183 144.323C14.0892 144.146 14.0424 143.952 14.0424 143.741ZM14.5853 143.44V143.741C14.5853 143.861 14.6075 143.974 14.6517 144.081C14.6986 144.188 14.7689 144.275 14.8627 144.343C14.9564 144.408 15.0736 144.44 15.2142 144.44C15.3549 144.44 15.4707 144.408 15.5619 144.343C15.653 144.275 15.7207 144.188 15.765 144.081C15.8093 143.974 15.8314 143.861 15.8314 143.741V143.44C15.8314 143.318 15.808 143.203 15.7611 143.096C15.7168 142.987 15.6478 142.9 15.5541 142.835C15.4629 142.767 15.347 142.733 15.2064 142.733C15.0684 142.733 14.9525 142.767 14.8588 142.835C14.7676 142.9 14.6986 142.987 14.6517 143.096C14.6075 143.203 14.5853 143.318 14.5853 143.44ZM16.8119 146.944V146.639C16.8119 146.426 16.8588 146.231 16.9525 146.053C17.0463 145.876 17.1804 145.734 17.3549 145.628C17.5293 145.521 17.7364 145.468 17.976 145.468C18.2207 145.468 18.4291 145.521 18.601 145.628C18.7754 145.734 18.9095 145.876 19.0033 146.053C19.097 146.231 19.1439 146.426 19.1439 146.639V146.944C19.1439 147.158 19.097 147.353 19.0033 147.53C18.9122 147.707 18.7793 147.849 18.6049 147.956C18.433 148.063 18.226 148.116 17.9838 148.116C17.7416 148.116 17.5332 148.063 17.3588 147.956C17.1843 147.849 17.0489 147.707 16.9525 147.53C16.8588 147.353 16.8119 147.158 16.8119 146.944ZM17.3549 146.639V146.944C17.3549 147.064 17.377 147.178 17.4213 147.288C17.4681 147.395 17.5385 147.482 17.6322 147.55C17.726 147.615 17.8431 147.647 17.9838 147.647C18.1244 147.647 18.2403 147.615 18.3314 147.55C18.4252 147.482 18.4942 147.395 18.5385 147.288C18.5827 147.181 18.6049 147.066 18.6049 146.944V146.639C18.6049 146.517 18.5814 146.402 18.5345 146.296C18.4903 146.189 18.4213 146.103 18.3275 146.038C18.2364 145.97 18.1192 145.936 17.976 145.936C17.8379 145.936 17.722 145.97 17.6283 146.038C17.5372 146.103 17.4681 146.189 17.4213 146.296C17.377 146.402 17.3549 146.517 17.3549 146.639ZM18.1556 143.155L15.3783 147.6L14.972 147.343L17.7494 142.897L18.1556 143.155Z" fill="black" fill-opacity="0.54"/>
<path d="M25 4.16113L200 4.16116" stroke="black" stroke-opacity="0.12"/>
<path d="M25 33.1611L200 33.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 61.1611L200 61.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 89.1611L200 89.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 118.161L200 118.161" stroke="black" stroke-opacity="0.12"/>
<path d="M36 62C36 60.8954 36.8954 60 38 60H52C53.1046 60 54 60.8954 54 62V146H36V62Z" fill="#FFC107"/>
<path d="M58 92C58 90.8954 58.8954 90 60 90H74C75.1046 90 76 90.8954 76 92V146H58V92Z" fill="#4CAF50"/>
<path d="M80 79C80 77.8954 80.8954 77 82 77H96C97.1046 77 98 77.8954 98 79V146H80V79Z" fill="#2196F3"/>
<path d="M125 78C125 76.8954 125.895 76 127 76H141C142.105 76 143 76.8954 143 78V146H125V78Z" fill="#FFC107"/>
<path d="M147 51C147 49.8954 147.895 49 149 49H163C164.105 49 165 49.8954 165 51V146H147V51Z" fill="#4CAF50"/>
<path d="M169 36C169 34.8954 169.895 34 171 34H185C186.105 34 187 34.8954 187 36V146H169V36Z" fill="#2196F3"/>
<line x1="23.2" y1="145.961" x2="202.8" y2="145.961" stroke="black" stroke-opacity="0.7" stroke-width="0.4" stroke-linecap="square"/>
<line x1="67" y1="148.072" x2="67" y2="147.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M59.0591 152.025V152.893C59.0591 153.359 59.0174 153.752 58.9341 154.072C58.8507 154.393 58.7309 154.65 58.5747 154.846C58.4184 155.041 58.2296 155.183 58.0083 155.271C57.7895 155.357 57.5421 155.4 57.2661 155.4C57.0473 155.4 56.8455 155.373 56.6606 155.318C56.4757 155.264 56.3091 155.176 56.1606 155.057C56.0148 154.934 55.8898 154.775 55.7856 154.58C55.6815 154.385 55.602 154.148 55.5473 153.869C55.4927 153.59 55.4653 153.265 55.4653 152.893V152.025C55.4653 151.559 55.507 151.169 55.5903 150.854C55.6762 150.538 55.7973 150.286 55.9536 150.096C56.1098 149.903 56.2973 149.765 56.5161 149.682C56.7374 149.598 56.9848 149.557 57.2583 149.557C57.4796 149.557 57.6828 149.584 57.8677 149.639C58.0552 149.691 58.2218 149.775 58.3677 149.893C58.5135 150.007 58.6372 150.161 58.7387 150.354C58.8429 150.544 58.9223 150.777 58.977 151.053C59.0317 151.329 59.0591 151.653 59.0591 152.025ZM58.3325 153.01V151.904C58.3325 151.649 58.3169 151.425 58.2856 151.232C58.257 151.037 58.214 150.87 58.1567 150.732C58.0994 150.594 58.0265 150.482 57.938 150.396C57.852 150.311 57.7518 150.248 57.6372 150.209C57.5252 150.167 57.3989 150.146 57.2583 150.146C57.0864 150.146 56.9341 150.179 56.8012 150.244C56.6684 150.307 56.5565 150.407 56.4653 150.545C56.3768 150.683 56.3091 150.864 56.2622 151.088C56.2153 151.312 56.1919 151.584 56.1919 151.904V153.01C56.1919 153.265 56.2062 153.49 56.2348 153.686C56.2661 153.881 56.3117 154.05 56.3716 154.193C56.4315 154.334 56.5044 154.45 56.5903 154.541C56.6762 154.632 56.7752 154.7 56.8872 154.744C57.0018 154.786 57.1281 154.807 57.2661 154.807C57.4432 154.807 57.5981 154.773 57.7309 154.705C57.8637 154.637 57.9744 154.532 58.063 154.389C58.1541 154.243 58.2218 154.057 58.2661 153.83C58.3104 153.601 58.3325 153.327 58.3325 153.01ZM62.4464 149.604V155.322H61.7237V150.506L60.2667 151.037V150.385L62.3331 149.604H62.4464ZM67.6624 149.635V155.322H66.9085V149.635H67.6624ZM70.0452 152.193V152.811H67.4983V152.193H70.0452ZM70.4319 149.635V150.252H67.4983V149.635H70.4319ZM72.9716 155.4C72.6773 155.4 72.4104 155.351 72.1708 155.252C71.9338 155.15 71.7294 155.008 71.5575 154.826C71.3883 154.644 71.2581 154.428 71.1669 154.178C71.0758 153.928 71.0302 153.654 71.0302 153.357V153.193C71.0302 152.85 71.081 152.544 71.1825 152.275C71.2841 152.005 71.4221 151.775 71.5966 151.588C71.7711 151.4 71.969 151.258 72.1903 151.162C72.4117 151.066 72.6409 151.018 72.8778 151.018C73.1799 151.018 73.4403 151.07 73.6591 151.174C73.8805 151.278 74.0614 151.424 74.2021 151.611C74.3427 151.796 74.4469 152.015 74.5146 152.268C74.5823 152.518 74.6161 152.791 74.6161 153.088V153.412H71.4599V152.822H73.8935V152.768C73.8831 152.58 73.844 152.398 73.7763 152.221C73.7112 152.044 73.607 151.898 73.4638 151.783C73.3206 151.669 73.1252 151.611 72.8778 151.611C72.7138 151.611 72.5627 151.646 72.4247 151.717C72.2867 151.785 72.1682 151.886 72.0693 152.021C71.9703 152.157 71.8935 152.322 71.8388 152.518C71.7841 152.713 71.7568 152.938 71.7568 153.193V153.357C71.7568 153.558 71.7841 153.747 71.8388 153.924C71.8961 154.098 71.9781 154.252 72.0849 154.385C72.1943 154.518 72.3258 154.622 72.4794 154.697C72.6357 154.773 72.8127 154.811 73.0107 154.811C73.2659 154.811 73.482 154.758 73.6591 154.654C73.8362 154.55 73.9911 154.411 74.1239 154.236L74.5614 154.584C74.4703 154.722 74.3544 154.854 74.2138 154.979C74.0732 155.104 73.9 155.205 73.6943 155.283C73.4911 155.361 73.2502 155.4 72.9716 155.4ZM75.5386 149.322H76.2652V154.502L76.2027 155.322H75.5386V149.322ZM79.1206 153.174V153.256C79.1206 153.563 79.0842 153.848 79.0113 154.111C78.9383 154.372 78.8316 154.598 78.6909 154.791C78.5503 154.984 78.3784 155.133 78.1753 155.24C77.9722 155.347 77.7391 155.4 77.4761 155.4C77.2079 155.4 76.9722 155.355 76.7691 155.264C76.5685 155.17 76.3993 155.036 76.2613 154.861C76.1232 154.687 76.0126 154.476 75.9292 154.229C75.8485 153.981 75.7925 153.702 75.7613 153.393V153.033C75.7925 152.721 75.8485 152.441 75.9292 152.193C76.0126 151.946 76.1232 151.735 76.2613 151.561C76.3993 151.383 76.5685 151.249 76.7691 151.158C76.9696 151.064 77.2027 151.018 77.4683 151.018C77.7339 151.018 77.9696 151.07 78.1753 151.174C78.381 151.275 78.5529 151.421 78.6909 151.611C78.8316 151.801 78.9383 152.029 79.0113 152.295C79.0842 152.558 79.1206 152.851 79.1206 153.174ZM78.3941 153.256V153.174C78.3941 152.963 78.3745 152.765 78.3355 152.58C78.2964 152.393 78.2339 152.229 78.148 152.088C78.062 151.945 77.9488 151.833 77.8081 151.752C77.6675 151.669 77.4943 151.627 77.2886 151.627C77.1063 151.627 76.9475 151.658 76.812 151.721C76.6792 151.783 76.5659 151.868 76.4722 151.975C76.3784 152.079 76.3016 152.199 76.2417 152.334C76.1844 152.467 76.1415 152.605 76.1128 152.748V153.689C76.1545 153.872 76.2222 154.048 76.3159 154.217C76.4123 154.383 76.5399 154.52 76.6988 154.627C76.8602 154.734 77.0594 154.787 77.2964 154.787C77.4917 154.787 77.6584 154.748 77.7964 154.67C77.937 154.589 78.0503 154.479 78.1363 154.338C78.2248 154.197 78.2899 154.035 78.3316 153.85C78.3732 153.665 78.3941 153.467 78.3941 153.256Z" fill="black" fill-opacity="0.54"/>
<g clip-path="url(#clip1_4183_90877)">
<line x1="155.5" y1="147.072" x2="155.5" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M147.559 152.025V152.892C147.559 153.358 147.517 153.752 147.434 154.072C147.351 154.392 147.231 154.65 147.075 154.845C146.918 155.041 146.73 155.183 146.508 155.271C146.29 155.357 146.042 155.4 145.766 155.4C145.547 155.4 145.346 155.373 145.161 155.318C144.976 155.263 144.809 155.176 144.661 155.056C144.515 154.934 144.39 154.775 144.286 154.58C144.181 154.385 144.102 154.148 144.047 153.869C143.993 153.59 143.965 153.265 143.965 152.892V152.025C143.965 151.559 144.007 151.168 144.09 150.853C144.176 150.538 144.297 150.286 144.454 150.095C144.61 149.903 144.797 149.765 145.016 149.681C145.237 149.598 145.485 149.556 145.758 149.556C145.98 149.556 146.183 149.584 146.368 149.638C146.555 149.691 146.722 149.775 146.868 149.892C147.013 150.007 147.137 150.161 147.239 150.353C147.343 150.543 147.422 150.776 147.477 151.052C147.532 151.329 147.559 151.653 147.559 152.025ZM146.832 153.01V151.904C146.832 151.649 146.817 151.425 146.786 151.232C146.757 151.037 146.714 150.87 146.657 150.732C146.599 150.594 146.527 150.482 146.438 150.396C146.352 150.31 146.252 150.248 146.137 150.209C146.025 150.167 145.899 150.146 145.758 150.146C145.586 150.146 145.434 150.179 145.301 150.244C145.168 150.306 145.056 150.407 144.965 150.545C144.877 150.683 144.809 150.864 144.762 151.088C144.715 151.312 144.692 151.584 144.692 151.904V153.01C144.692 153.265 144.706 153.49 144.735 153.685C144.766 153.881 144.812 154.05 144.872 154.193C144.931 154.334 145.004 154.45 145.09 154.541C145.176 154.632 145.275 154.7 145.387 154.744C145.502 154.786 145.628 154.806 145.766 154.806C145.943 154.806 146.098 154.773 146.231 154.705C146.364 154.637 146.474 154.532 146.563 154.388C146.654 154.243 146.722 154.056 146.766 153.83C146.81 153.601 146.832 153.327 146.832 153.01ZM152.298 154.728V155.322H148.575V154.802L150.439 152.728C150.668 152.473 150.845 152.257 150.97 152.08C151.097 151.9 151.186 151.74 151.235 151.599C151.288 151.456 151.314 151.31 151.314 151.162C151.314 150.974 151.274 150.805 151.196 150.654C151.121 150.5 151.009 150.378 150.86 150.287C150.712 150.196 150.532 150.15 150.321 150.15C150.069 150.15 149.858 150.2 149.689 150.299C149.522 150.395 149.397 150.53 149.314 150.705C149.23 150.879 149.189 151.08 149.189 151.306H148.466C148.466 150.986 148.536 150.693 148.677 150.427C148.817 150.162 149.026 149.951 149.302 149.795C149.578 149.636 149.918 149.556 150.321 149.556C150.681 149.556 150.988 149.62 151.243 149.748C151.498 149.873 151.694 150.05 151.829 150.279C151.967 150.506 152.036 150.771 152.036 151.076C152.036 151.243 152.008 151.412 151.95 151.584C151.896 151.753 151.819 151.922 151.72 152.092C151.623 152.261 151.51 152.427 151.38 152.592C151.252 152.756 151.116 152.917 150.97 153.076L149.446 154.728H152.298ZM156.162 149.635V155.322H155.409V149.635H156.162ZM158.545 152.193V152.81H155.998V152.193H158.545ZM158.932 149.635V150.252H155.998V149.635H158.932ZM161.472 155.4C161.177 155.4 160.91 155.351 160.671 155.252C160.434 155.15 160.229 155.008 160.058 154.826C159.888 154.644 159.758 154.427 159.667 154.177C159.576 153.927 159.53 153.654 159.53 153.357V153.193C159.53 152.849 159.581 152.543 159.683 152.275C159.784 152.004 159.922 151.775 160.097 151.588C160.271 151.4 160.469 151.258 160.69 151.162C160.912 151.066 161.141 151.017 161.378 151.017C161.68 151.017 161.94 151.069 162.159 151.174C162.38 151.278 162.561 151.424 162.702 151.611C162.843 151.796 162.947 152.015 163.015 152.267C163.082 152.517 163.116 152.791 163.116 153.088V153.412H159.96V152.822H162.393V152.767C162.383 152.58 162.344 152.398 162.276 152.22C162.211 152.043 162.107 151.898 161.964 151.783C161.821 151.668 161.625 151.611 161.378 151.611C161.214 151.611 161.063 151.646 160.925 151.717C160.787 151.784 160.668 151.886 160.569 152.021C160.47 152.157 160.393 152.322 160.339 152.517C160.284 152.713 160.257 152.938 160.257 153.193V153.357C160.257 153.558 160.284 153.747 160.339 153.924C160.396 154.098 160.478 154.252 160.585 154.385C160.694 154.517 160.826 154.622 160.979 154.697C161.136 154.773 161.313 154.81 161.511 154.81C161.766 154.81 161.982 154.758 162.159 154.654C162.336 154.55 162.491 154.411 162.624 154.236L163.061 154.584C162.97 154.722 162.854 154.853 162.714 154.978C162.573 155.103 162.4 155.205 162.194 155.283C161.991 155.361 161.75 155.4 161.472 155.4ZM164.039 149.322H164.765V154.502L164.703 155.322H164.039V149.322ZM167.621 153.174V153.256C167.621 153.563 167.584 153.848 167.511 154.111C167.438 154.372 167.332 154.598 167.191 154.791C167.05 154.983 166.878 155.133 166.675 155.24C166.472 155.347 166.239 155.4 165.976 155.4C165.708 155.4 165.472 155.355 165.269 155.263C165.069 155.17 164.899 155.036 164.761 154.861C164.623 154.687 164.513 154.476 164.429 154.228C164.348 153.981 164.293 153.702 164.261 153.392V153.033C164.293 152.72 164.348 152.441 164.429 152.193C164.513 151.946 164.623 151.735 164.761 151.56C164.899 151.383 165.069 151.249 165.269 151.158C165.47 151.064 165.703 151.017 165.968 151.017C166.234 151.017 166.47 151.069 166.675 151.174C166.881 151.275 167.053 151.421 167.191 151.611C167.332 151.801 167.438 152.029 167.511 152.295C167.584 152.558 167.621 152.851 167.621 153.174ZM166.894 153.256V153.174C166.894 152.963 166.875 152.765 166.835 152.58C166.796 152.392 166.734 152.228 166.648 152.088C166.562 151.944 166.449 151.832 166.308 151.752C166.168 151.668 165.994 151.627 165.789 151.627C165.606 151.627 165.447 151.658 165.312 151.72C165.179 151.783 165.066 151.868 164.972 151.974C164.878 152.079 164.802 152.198 164.742 152.334C164.684 152.467 164.641 152.605 164.613 152.748V153.689C164.654 153.872 164.722 154.047 164.816 154.217C164.912 154.383 165.04 154.52 165.199 154.627C165.36 154.733 165.559 154.787 165.796 154.787C165.992 154.787 166.158 154.748 166.296 154.67C166.437 154.589 166.55 154.478 166.636 154.338C166.725 154.197 166.79 154.034 166.832 153.849C166.873 153.664 166.894 153.467 166.894 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
</g>
<defs>
<clipPath id="clip0_4183_90877">
<rect width="200" height="160" fill="white"/>
</clipPath>
<clipPath id="clip1_4183_90877">
<rect width="88.5" height="10.322" fill="white" transform="translate(111.5 146)"/>
</clipPath>
</defs>
</svg>
",
+ "description": "Displays changes to time-series data over time—for example, temperature or humidity readings.",
+ "descriptor": {
+ "type": "timeseries",
+ "sizeX": 8,
+ "sizeY": 5,
+ "resources": [],
+ "templateHtml": "\n",
+ "templateCss": "",
+ "controllerScript": "self.onInit = function() {\n self.ctx.$scope.timeSeriesChartWidget.onInit();\n};\n\nself.onDataUpdated = function() {\n self.ctx.$scope.timeSeriesChartWidget.onDataUpdated();\n}\n\nself.onLatestDataUpdated = function() {\n self.ctx.$scope.timeSeriesChartWidget.onLatestDataUpdated();\n}\n\nself.typeParameters = function() {\n return {\n chartType: 'bar',\n previewWidth: '80%',\n embedTitlePanel: true,\n hasAdditionalLatestDataKeys: true,\n dataKeySettingsFunction: TbTimeSeriesChart.dataKeySettings('bar'),\n defaultDataKeysFunction: function() {\n return [{ name: 'temperature', label: 'Temperature', type: 'timeseries', units: '°C', decimals: 0 }];\n }\n };\n}\n",
+ "settingsSchema": "{}",
+ "dataKeySettingsSchema": "{}",
+ "latestDataKeySettingsSchema": "{}",
+ "settingsDirective": "tb-time-series-chart-widget-settings",
+ "dataKeySettingsDirective": "tb-time-series-chart-key-settings",
+ "latestDataKeySettingsDirective": "",
+ "hasBasicMode": true,
+ "basicModeDirective": "tb-time-series-chart-basic-config",
+ "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"type\":\"bar\"},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#FFC107\",\"settings\":{\"type\":\"bar\"},\"_hash\":0.5534217244004682,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]},\"latestDataKeys\":null}],\"timewindow\":{\"hideInterval\":false,\"hideLastInterval\":false,\"hideQuickInterval\":false,\"hideAggregation\":false,\"hideAggInterval\":false,\"hideTimezone\":false,\"selectedTab\":0,\"realtime\":{\"realtimeType\":0,\"timewindowMs\":60000,\"quickInterval\":\"CURRENT_DAY\",\"interval\":1000},\"aggregation\":{\"type\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"showLegend\":true,\"legendConfig\":{\"direction\":\"column\",\"position\":\"top\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":true,\"showTotal\":false,\"showLatest\":false},\"thresholds\":[],\"dataZoom\":true,\"stack\":false,\"yAxis\":{\"show\":true,\"label\":\"\",\"labelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"600\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.54)\",\"position\":\"left\",\"showTickLabels\":true,\"tickLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"tickLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"showTicks\":true,\"ticksColor\":\"rgba(0, 0, 0, 0.54)\",\"showLine\":true,\"lineColor\":\"rgba(0, 0, 0, 0.54)\",\"showSplitLines\":true,\"splitLinesColor\":\"rgba(0, 0, 0, 0.12)\"},\"xAxis\":{\"show\":true,\"label\":\"\",\"labelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"600\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.54)\",\"position\":\"bottom\",\"showTickLabels\":true,\"tickLabelFont\":{\"family\":\"Roboto\",\"size\":10,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"tickLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"ticksFormat\":{},\"showTicks\":true,\"ticksColor\":\"rgba(0, 0, 0, 0.54)\",\"showLine\":true,\"lineColor\":\"rgba(0, 0, 0, 0.54)\",\"showSplitLines\":true,\"splitLinesColor\":\"rgba(0, 0, 0, 0.12)\"},\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipTrigger\":\"axis\",\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":null,\"lastUpdateAgo\":false,\"custom\":false,\"auto\":true,\"autoDateFormatSettings\":{}},\"tooltipDateFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"tooltipDateColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipDateInterval\":true,\"tooltipBackgroundColor\":\"rgba(255, 255, 255, 0.76)\",\"tooltipBackgroundBlur\":4,\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}},\"yAxes\":{\"default\":{\"units\":null,\"decimals\":0,\"show\":true,\"label\":\"\",\"labelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"600\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.54)\",\"position\":\"left\",\"showTickLabels\":true,\"tickLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"tickLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"ticksFormatter\":null,\"showTicks\":true,\"ticksColor\":\"rgba(0, 0, 0, 0.54)\",\"showLine\":true,\"lineColor\":\"rgba(0, 0, 0, 0.54)\",\"showSplitLines\":true,\"splitLinesColor\":\"rgba(0, 0, 0, 0.12)\",\"id\":\"default\",\"order\":0}},\"noAggregationBarWidthSettings\":{\"strategy\":\"group\",\"groupWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000},\"barWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000}},\"animation\":{\"animation\":true,\"animationThreshold\":2000,\"animationDuration\":500,\"animationEasing\":\"cubicOut\",\"animationDelay\":0,\"animationDurationUpdate\":300,\"animationEasingUpdate\":\"cubicOut\",\"animationDelayUpdate\":0},\"padding\":\"12px\"},\"title\":\"Bar chart\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":null,\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"thermostat\",\"iconColor\":\"#1F6BDD\",\"useDashboardTimewindow\":false,\"displayTimewindow\":true,\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleColor\":\"rgba(0, 0, 0, 0.87)\",\"titleTooltip\":\"\",\"widgetStyle\":{},\"widgetCss\":\"\",\"pageSize\":1024,\"units\":\"\",\"decimals\":null,\"noDataDisplayMessage\":\"\",\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":null,\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true},\"margin\":\"0px\",\"borderRadius\":\"0px\",\"iconSize\":\"0px\"}"
+ },
+ "tags": [
+ "chart",
+ "time series",
+ "time-series",
+ "bar",
+ "bar chart"
+ ]
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/bar_chart_with_labels.json b/application/src/main/data/json/system/widget_types/bar_chart_with_labels.json
index 75814a547a..356e91f90e 100644
--- a/application/src/main/data/json/system/widget_types/bar_chart_with_labels.json
+++ b/application/src/main/data/json/system/widget_types/bar_chart_with_labels.json
@@ -20,7 +20,7 @@
"latestDataKeySettingsDirective": "",
"hasBasicMode": true,
"basicModeDirective": "tb-bar-chart-with-labels-basic-config",
- "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Humidity\",\"color\":\"rgb(125, 142, 255)\",\"settings\":{},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 50) {\\n\\tvalue = 50;\\n} else if (value > 80) {\\n\\tvalue = 80;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Soil moisture\",\"color\":\"rgb(249, 111, 255)\",\"settings\":{},\"_hash\":0.9111685461089025,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 30) {\\n\\tvalue = 30;\\n} else if (value > 90) {\\n\\tvalue = 90;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Leaf wetness\",\"color\":\"rgb(255, 163, 137)\",\"settings\":{},\"_hash\":0.8487533373085416,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 40) {\\n\\tvalue = 40;\\n} else if (value > 70) {\\n\\tvalue = 70;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Cloud cover\",\"color\":\"#FFED53\",\"settings\":{},\"_hash\":0.7690144858984289,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 20) {\\n\\tvalue = 20;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]}}],\"timewindow\":{\"hideInterval\":false,\"hideLastInterval\":false,\"hideQuickInterval\":false,\"hideAggregation\":false,\"hideAggInterval\":false,\"hideTimezone\":false,\"selectedTab\":1,\"history\":{\"historyType\":2,\"timewindowMs\":60000,\"interval\":\"MONTH\",\"fixedTimewindow\":{\"startTimeMs\":1704293713163,\"endTimeMs\":1704380113163},\"quickInterval\":\"CURRENT_HALF_YEAR\"},\"aggregation\":{\"type\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"showBarLabel\":true,\"barLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"12px\"},\"barLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"showBarValue\":true,\"barValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"700\",\"lineHeight\":\"12px\"},\"barValueColor\":\"rgba(0, 0, 0, 0.76)\",\"showLegend\":true,\"legendPosition\":\"top\",\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":\"MMMM y\",\"lastUpdateAgo\":false,\"custom\":true},\"tooltipDateFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"tooltipDateColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipBackgroundColor\":\"rgba(255, 255, 255, 0.76)\",\"tooltipBackgroundBlur\":4,\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}}},\"title\":\"Bar chart with labels\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":null,\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"public\",\"iconColor\":\"#1F6BDD\",\"useDashboardTimewindow\":false,\"displayTimewindow\":true,\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleColor\":\"rgba(0, 0, 0, 0.87)\",\"titleTooltip\":\"\",\"widgetStyle\":{},\"widgetCss\":\"\",\"pageSize\":1024,\"units\":\"%\",\"decimals\":0,\"noDataDisplayMessage\":\"\",\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":null,\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true},\"margin\":\"0px\",\"borderRadius\":\"0px\",\"iconSize\":\"24px\"}"
+ "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Humidity\",\"color\":\"rgb(125, 142, 255)\",\"settings\":{},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 50) {\\n\\tvalue = 50;\\n} else if (value > 80) {\\n\\tvalue = 80;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Soil moisture\",\"color\":\"rgb(249, 111, 255)\",\"settings\":{},\"_hash\":0.9111685461089025,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 30) {\\n\\tvalue = 30;\\n} else if (value > 90) {\\n\\tvalue = 90;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Leaf wetness\",\"color\":\"rgb(255, 163, 137)\",\"settings\":{},\"_hash\":0.8487533373085416,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 40) {\\n\\tvalue = 40;\\n} else if (value > 70) {\\n\\tvalue = 70;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Cloud cover\",\"color\":\"#FFED53\",\"settings\":{},\"_hash\":0.7690144858984289,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 20) {\\n\\tvalue = 20;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]}}],\"timewindow\":{\"hideInterval\":false,\"hideLastInterval\":false,\"hideQuickInterval\":false,\"hideAggregation\":false,\"hideAggInterval\":false,\"hideTimezone\":false,\"selectedTab\":1,\"history\":{\"historyType\":2,\"timewindowMs\":60000,\"interval\":\"MONTH\",\"fixedTimewindow\":{\"startTimeMs\":1704293713163,\"endTimeMs\":1704380113163},\"quickInterval\":\"CURRENT_HALF_YEAR\"},\"aggregation\":{\"type\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"showBarLabel\":true,\"barLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"12px\"},\"barLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"showBarValue\":true,\"barValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"700\",\"lineHeight\":\"12px\"},\"barValueColor\":\"rgba(0, 0, 0, 0.76)\",\"showLegend\":true,\"legendPosition\":\"top\",\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":null,\"lastUpdateAgo\":false,\"custom\":false,\"auto\":true,\"autoDateFormatSettings\":{}},\"tooltipDateFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"tooltipDateColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipBackgroundColor\":\"rgba(255, 255, 255, 0.76)\",\"tooltipBackgroundBlur\":4,\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}},\"tooltipDateInterval\":true},\"title\":\"Bar chart with labels\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":null,\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"public\",\"iconColor\":\"#1F6BDD\",\"useDashboardTimewindow\":false,\"displayTimewindow\":true,\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleColor\":\"rgba(0, 0, 0, 0.87)\",\"titleTooltip\":\"\",\"widgetStyle\":{},\"widgetCss\":\"\",\"pageSize\":1024,\"units\":\"%\",\"decimals\":0,\"noDataDisplayMessage\":\"\",\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":null,\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true},\"margin\":\"0px\",\"borderRadius\":\"0px\",\"iconSize\":\"24px\"}"
},
"tags": [
"bar chart",
diff --git a/application/src/main/data/json/system/widget_types/line_chart.json b/application/src/main/data/json/system/widget_types/line_chart.json
new file mode 100644
index 0000000000..f5b123231c
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/line_chart.json
@@ -0,0 +1,32 @@
+{
+ "fqn": "line_chart",
+ "name": "Line chart",
+ "deprecated": false,
+ "image": "tb-image:Y2hhcnRfKDEpLnN2Zw==:IkxpbmUgY2hhcnQiIHN5c3RlbSB3aWRnZXQgaW1hZ2U=;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_4184_94527)">
<path d="M2.84766 1.28125V7H2.125V2.18359L0.667969 2.71484V2.0625L2.73438 1.28125H2.84766ZM8.67517 3.70312V4.57031C8.67517 5.03646 8.63351 5.42969 8.55017 5.75C8.46684 6.07031 8.34705 6.32812 8.1908 6.52344C8.03455 6.71875 7.84575 6.86068 7.62439 6.94922C7.40564 7.03516 7.15825 7.07812 6.8822 7.07812C6.66345 7.07812 6.46163 7.05078 6.27673 6.99609C6.09184 6.94141 5.92517 6.85417 5.77673 6.73438C5.6309 6.61198 5.5059 6.45312 5.40173 6.25781C5.29757 6.0625 5.21814 5.82552 5.16345 5.54688C5.10877 5.26823 5.08142 4.94271 5.08142 4.57031V3.70312C5.08142 3.23698 5.12309 2.84635 5.20642 2.53125C5.29236 2.21615 5.41345 1.96354 5.5697 1.77344C5.72595 1.58073 5.91345 1.44271 6.1322 1.35938C6.35356 1.27604 6.60095 1.23438 6.87439 1.23438C7.09575 1.23438 7.29887 1.26172 7.48377 1.31641C7.67127 1.36849 7.83793 1.45312 7.98377 1.57031C8.1296 1.6849 8.2533 1.83854 8.35486 2.03125C8.45903 2.22135 8.53845 2.45443 8.59314 2.73047C8.64783 3.00651 8.67517 3.33073 8.67517 3.70312ZM7.94861 4.6875V3.58203C7.94861 3.32682 7.93298 3.10286 7.90173 2.91016C7.87309 2.71484 7.83012 2.54818 7.77283 2.41016C7.71554 2.27214 7.64262 2.16016 7.55408 2.07422C7.46814 1.98828 7.36788 1.92578 7.2533 1.88672C7.14132 1.84505 7.01502 1.82422 6.87439 1.82422C6.70252 1.82422 6.55017 1.85677 6.41736 1.92188C6.28455 1.98438 6.17257 2.08464 6.08142 2.22266C5.99288 2.36068 5.92517 2.54167 5.8783 2.76562C5.83142 2.98958 5.80798 3.26172 5.80798 3.58203V4.6875C5.80798 4.94271 5.82231 5.16797 5.85095 5.36328C5.8822 5.55859 5.92778 5.72786 5.98767 5.87109C6.04757 6.01172 6.12048 6.1276 6.20642 6.21875C6.29236 6.3099 6.39132 6.3776 6.5033 6.42188C6.61788 6.46354 6.74418 6.48438 6.8822 6.48438C7.05929 6.48438 7.21423 6.45052 7.34705 6.38281C7.47986 6.3151 7.59054 6.20964 7.67908 6.06641C7.77022 5.92057 7.83793 5.73438 7.8822 5.50781C7.92647 5.27865 7.94861 5.00521 7.94861 4.6875ZM13.3074 3.70312V4.57031C13.3074 5.03646 13.2657 5.42969 13.1824 5.75C13.099 6.07031 12.9793 6.32812 12.823 6.52344C12.6668 6.71875 12.4779 6.86068 12.2566 6.94922C12.0378 7.03516 11.7904 7.07812 11.5144 7.07812C11.2957 7.07812 11.0938 7.05078 10.9089 6.99609C10.724 6.94141 10.5574 6.85417 10.4089 6.73438C10.2631 6.61198 10.1381 6.45312 10.0339 6.25781C9.92977 6.0625 9.85034 5.82552 9.79566 5.54688C9.74097 5.26823 9.71363 4.94271 9.71363 4.57031V3.70312C9.71363 3.23698 9.75529 2.84635 9.83863 2.53125C9.92456 2.21615 10.0457 1.96354 10.2019 1.77344C10.3582 1.58073 10.5457 1.44271 10.7644 1.35938C10.9858 1.27604 11.2332 1.23438 11.5066 1.23438C11.7279 1.23438 11.9311 1.26172 12.116 1.31641C12.3035 1.36849 12.4701 1.45312 12.616 1.57031C12.7618 1.6849 12.8855 1.83854 12.9871 2.03125C13.0912 2.22135 13.1707 2.45443 13.2253 2.73047C13.28 3.00651 13.3074 3.33073 13.3074 3.70312ZM12.5808 4.6875V3.58203C12.5808 3.32682 12.5652 3.10286 12.5339 2.91016C12.5053 2.71484 12.4623 2.54818 12.405 2.41016C12.3477 2.27214 12.2748 2.16016 12.1863 2.07422C12.1003 1.98828 12.0001 1.92578 11.8855 1.88672C11.7735 1.84505 11.6472 1.82422 11.5066 1.82422C11.3347 1.82422 11.1824 1.85677 11.0496 1.92188C10.9168 1.98438 10.8048 2.08464 10.7136 2.22266C10.6251 2.36068 10.5574 2.54167 10.5105 2.76562C10.4636 2.98958 10.4402 3.26172 10.4402 3.58203V4.6875C10.4402 4.94271 10.4545 5.16797 10.4832 5.36328C10.5144 5.55859 10.56 5.72786 10.6199 5.87109C10.6798 6.01172 10.7527 6.1276 10.8386 6.21875C10.9246 6.3099 11.0235 6.3776 11.1355 6.42188C11.2501 6.46354 11.3764 6.48438 11.5144 6.48438C11.6915 6.48438 11.8464 6.45052 11.9793 6.38281C12.1121 6.3151 12.2227 6.20964 12.3113 6.06641C12.4024 5.92057 12.4701 5.73438 12.5144 5.50781C12.5587 5.27865 12.5808 5.00521 12.5808 4.6875ZM14.3068 2.70703V2.40625C14.3068 2.1901 14.3536 1.99349 14.4474 1.81641C14.5411 1.63932 14.6753 1.4974 14.8497 1.39062C15.0242 1.28385 15.2312 1.23047 15.4708 1.23047C15.7156 1.23047 15.924 1.28385 16.0958 1.39062C16.2703 1.4974 16.4044 1.63932 16.4982 1.81641C16.5919 1.99349 16.6388 2.1901 16.6388 2.40625V2.70703C16.6388 2.91797 16.5919 3.11198 16.4982 3.28906C16.407 3.46615 16.2742 3.60807 16.0997 3.71484C15.9279 3.82161 15.7208 3.875 15.4786 3.875C15.2365 3.875 15.0268 3.82161 14.8497 3.71484C14.6753 3.60807 14.5411 3.46615 14.4474 3.28906C14.3536 3.11198 14.3068 2.91797 14.3068 2.70703ZM14.8497 2.40625V2.70703C14.8497 2.82682 14.8719 2.9401 14.9161 3.04688C14.963 3.15365 15.0333 3.24089 15.1271 3.30859C15.2208 3.3737 15.338 3.40625 15.4786 3.40625C15.6193 3.40625 15.7352 3.3737 15.8263 3.30859C15.9174 3.24089 15.9852 3.15365 16.0294 3.04688C16.0737 2.9401 16.0958 2.82682 16.0958 2.70703V2.40625C16.0958 2.28385 16.0724 2.16927 16.0255 2.0625C15.9812 1.95312 15.9122 1.86589 15.8185 1.80078C15.7273 1.73307 15.6115 1.69922 15.4708 1.69922C15.3328 1.69922 15.2169 1.73307 15.1232 1.80078C15.032 1.86589 14.963 1.95312 14.9161 2.0625C14.8719 2.16927 14.8497 2.28385 14.8497 2.40625ZM17.0763 5.91016V5.60547C17.0763 5.39193 17.1232 5.19661 17.2169 5.01953C17.3107 4.84245 17.4448 4.70052 17.6193 4.59375C17.7937 4.48698 18.0008 4.43359 18.2404 4.43359C18.4852 4.43359 18.6935 4.48698 18.8654 4.59375C19.0398 4.70052 19.174 4.84245 19.2677 5.01953C19.3615 5.19661 19.4083 5.39193 19.4083 5.60547V5.91016C19.4083 6.1237 19.3615 6.31901 19.2677 6.49609C19.1766 6.67318 19.0437 6.8151 18.8693 6.92188C18.6974 7.02865 18.4904 7.08203 18.2482 7.08203C18.006 7.08203 17.7977 7.02865 17.6232 6.92188C17.4487 6.8151 17.3133 6.67318 17.2169 6.49609C17.1232 6.31901 17.0763 6.1237 17.0763 5.91016ZM17.6193 5.60547V5.91016C17.6193 6.02995 17.6414 6.14453 17.6857 6.25391C17.7325 6.36068 17.8029 6.44792 17.8966 6.51562C17.9904 6.58073 18.1075 6.61328 18.2482 6.61328C18.3888 6.61328 18.5047 6.58073 18.5958 6.51562C18.6896 6.44792 18.7586 6.36068 18.8029 6.25391C18.8471 6.14714 18.8693 6.03255 18.8693 5.91016V5.60547C18.8693 5.48307 18.8458 5.36849 18.799 5.26172C18.7547 5.15495 18.6857 5.06901 18.5919 5.00391C18.5008 4.9362 18.3836 4.90234 18.2404 4.90234C18.1023 4.90234 17.9865 4.9362 17.8927 5.00391C17.8016 5.06901 17.7325 5.15495 17.6857 5.26172C17.6414 5.36849 17.6193 5.48307 17.6193 5.60547ZM18.42 2.12109L15.6427 6.56641L15.2365 6.30859L18.0138 1.86328L18.42 2.12109Z" fill="black" fill-opacity="0.54"/>
<path d="M8.05859 33.6677C8.05859 34.0141 7.97786 34.3083 7.81641 34.5505C7.65755 34.7901 7.44141 34.9724 7.16797 35.0974C6.89714 35.2224 6.59115 35.2849 6.25 35.2849C5.90885 35.2849 5.60156 35.2224 5.32812 35.0974C5.05469 34.9724 4.83854 34.7901 4.67969 34.5505C4.52083 34.3083 4.44141 34.0141 4.44141 33.6677C4.44141 33.4412 4.48438 33.2341 4.57031 33.0466C4.65885 32.8565 4.78255 32.6912 4.94141 32.5505C5.10286 32.4099 5.29297 32.3018 5.51172 32.2263C5.73307 32.1482 5.97656 32.1091 6.24219 32.1091C6.59115 32.1091 6.90234 32.1768 7.17578 32.3123C7.44922 32.4451 7.66406 32.6287 7.82031 32.863C7.97917 33.0974 8.05859 33.3656 8.05859 33.6677ZM7.33203 33.6521C7.33203 33.4412 7.28646 33.255 7.19531 33.0935C7.10417 32.9294 6.97656 32.8018 6.8125 32.7107C6.64844 32.6195 6.45833 32.574 6.24219 32.574C6.02083 32.574 5.82943 32.6195 5.66797 32.7107C5.50911 32.8018 5.38542 32.9294 5.29688 33.0935C5.20833 33.255 5.16406 33.4412 5.16406 33.6521C5.16406 33.8708 5.20703 34.0583 5.29297 34.2146C5.38151 34.3682 5.50651 34.4867 5.66797 34.5701C5.83203 34.6508 6.02604 34.6912 6.25 34.6912C6.47396 34.6912 6.66667 34.6508 6.82812 34.5701C6.98958 34.4867 7.11328 34.3682 7.19922 34.2146C7.28776 34.0583 7.33203 33.8708 7.33203 33.6521ZM7.92578 30.9998C7.92578 31.2758 7.85286 31.5245 7.70703 31.7458C7.5612 31.9672 7.36198 32.1417 7.10938 32.2693C6.85677 32.3969 6.57031 32.4607 6.25 32.4607C5.92448 32.4607 5.63411 32.3969 5.37891 32.2693C5.1263 32.1417 4.92839 31.9672 4.78516 31.7458C4.64193 31.5245 4.57031 31.2758 4.57031 30.9998C4.57031 30.669 4.64193 30.3878 4.78516 30.156C4.93099 29.9242 5.13021 29.7472 5.38281 29.6248C5.63542 29.5024 5.92318 29.4412 6.24609 29.4412C6.57161 29.4412 6.86068 29.5024 7.11328 29.6248C7.36589 29.7472 7.5638 29.9242 7.70703 30.156C7.85286 30.3878 7.92578 30.669 7.92578 30.9998ZM7.20312 31.0115C7.20312 30.8214 7.16276 30.6534 7.08203 30.5076C7.0013 30.3617 6.88932 30.2472 6.74609 30.1638C6.60286 30.0779 6.4362 30.0349 6.24609 30.0349C6.05599 30.0349 5.88932 30.0753 5.74609 30.156C5.60547 30.2341 5.49479 30.3461 5.41406 30.4919C5.33594 30.6378 5.29688 30.811 5.29688 31.0115C5.29688 31.2068 5.33594 31.3774 5.41406 31.5232C5.49479 31.669 5.60677 31.7823 5.75 31.863C5.89323 31.9438 6.0599 31.9841 6.25 31.9841C6.4401 31.9841 6.60547 31.9438 6.74609 31.863C6.88932 31.7823 7.0013 31.669 7.08203 31.5232C7.16276 31.3774 7.20312 31.2068 7.20312 31.0115ZM12.6752 31.9099V32.7771C12.6752 33.2432 12.6335 33.6365 12.5502 33.9568C12.4668 34.2771 12.347 34.5349 12.1908 34.7302C12.0345 34.9255 11.8457 35.0675 11.6244 35.156C11.4056 35.2419 11.1582 35.2849 10.8822 35.2849C10.6635 35.2849 10.4616 35.2576 10.2767 35.2029C10.0918 35.1482 9.92517 35.061 9.77673 34.9412C9.6309 34.8188 9.5059 34.6599 9.40173 34.4646C9.29757 34.2693 9.21814 34.0323 9.16345 33.7537C9.10877 33.475 9.08142 33.1495 9.08142 32.7771V31.9099C9.08142 31.4438 9.12309 31.0531 9.20642 30.738C9.29236 30.4229 9.41345 30.1703 9.5697 29.9802C9.72595 29.7875 9.91345 29.6495 10.1322 29.5662C10.3536 29.4828 10.601 29.4412 10.8744 29.4412C11.0957 29.4412 11.2989 29.4685 11.4838 29.5232C11.6713 29.5753 11.8379 29.6599 11.9838 29.7771C12.1296 29.8917 12.2533 30.0453 12.3549 30.238C12.459 30.4281 12.5385 30.6612 12.5931 30.9373C12.6478 31.2133 12.6752 31.5375 12.6752 31.9099ZM11.9486 32.8943V31.7888C11.9486 31.5336 11.933 31.3097 11.9017 31.1169C11.8731 30.9216 11.8301 30.755 11.7728 30.6169C11.7155 30.4789 11.6426 30.3669 11.5541 30.281C11.4681 30.1951 11.3679 30.1326 11.2533 30.0935C11.1413 30.0518 11.015 30.031 10.8744 30.031C10.7025 30.031 10.5502 30.0636 10.4174 30.1287C10.2845 30.1912 10.1726 30.2914 10.0814 30.4294C9.99288 30.5675 9.92517 30.7485 9.8783 30.9724C9.83142 31.1964 9.80798 31.4685 9.80798 31.7888V32.8943C9.80798 33.1495 9.82231 33.3748 9.85095 33.5701C9.8822 33.7654 9.92778 33.9347 9.98767 34.0779C10.0476 34.2185 10.1205 34.3344 10.2064 34.4255C10.2924 34.5167 10.3913 34.5844 10.5033 34.6287C10.6179 34.6703 10.7442 34.6912 10.8822 34.6912C11.0593 34.6912 11.2142 34.6573 11.347 34.5896C11.4799 34.5219 11.5905 34.4164 11.6791 34.2732C11.7702 34.1274 11.8379 33.9412 11.8822 33.7146C11.9265 33.4854 11.9486 33.212 11.9486 32.8943ZM13.6746 30.9138V30.613C13.6746 30.3969 13.7214 30.2003 13.8152 30.0232C13.9089 29.8461 14.0431 29.7042 14.2175 29.5974C14.392 29.4906 14.599 29.4373 14.8386 29.4373C15.0834 29.4373 15.2918 29.4906 15.4636 29.5974C15.6381 29.7042 15.7722 29.8461 15.866 30.0232C15.9597 30.2003 16.0066 30.3969 16.0066 30.613V30.9138C16.0066 31.1248 15.9597 31.3188 15.866 31.4958C15.7748 31.6729 15.642 31.8149 15.4675 31.9216C15.2957 32.0284 15.0886 32.0818 14.8464 32.0818C14.6043 32.0818 14.3946 32.0284 14.2175 31.9216C14.0431 31.8149 13.9089 31.6729 13.8152 31.4958C13.7214 31.3188 13.6746 31.1248 13.6746 30.9138ZM14.2175 30.613V30.9138C14.2175 31.0336 14.2397 31.1469 14.2839 31.2537C14.3308 31.3604 14.4011 31.4477 14.4949 31.5154C14.5886 31.5805 14.7058 31.613 14.8464 31.613C14.9871 31.613 15.1029 31.5805 15.1941 31.5154C15.2852 31.4477 15.3529 31.3604 15.3972 31.2537C15.4415 31.1469 15.4636 31.0336 15.4636 30.9138V30.613C15.4636 30.4906 15.4402 30.3761 15.3933 30.2693C15.349 30.1599 15.28 30.0727 15.1863 30.0076C15.0951 29.9399 14.9793 29.906 14.8386 29.906C14.7006 29.906 14.5847 29.9399 14.491 30.0076C14.3998 30.0727 14.3308 30.1599 14.2839 30.2693C14.2397 30.3761 14.2175 30.4906 14.2175 30.613ZM16.4441 34.1169V33.8123C16.4441 33.5987 16.491 33.4034 16.5847 33.2263C16.6785 33.0492 16.8126 32.9073 16.9871 32.8005C17.1615 32.6938 17.3686 32.6404 17.6082 32.6404C17.8529 32.6404 18.0613 32.6938 18.2332 32.8005C18.4076 32.9073 18.5418 33.0492 18.6355 33.2263C18.7293 33.4034 18.7761 33.5987 18.7761 33.8123V34.1169C18.7761 34.3305 18.7293 34.5258 18.6355 34.7029C18.5444 34.88 18.4115 35.0219 18.2371 35.1287C18.0652 35.2354 17.8582 35.2888 17.616 35.2888C17.3738 35.2888 17.1654 35.2354 16.991 35.1287C16.8165 35.0219 16.6811 34.88 16.5847 34.7029C16.491 34.5258 16.4441 34.3305 16.4441 34.1169ZM16.9871 33.8123V34.1169C16.9871 34.2367 17.0092 34.3513 17.0535 34.4607C17.1003 34.5675 17.1707 34.6547 17.2644 34.7224C17.3582 34.7875 17.4753 34.8201 17.616 34.8201C17.7566 34.8201 17.8725 34.7875 17.9636 34.7224C18.0574 34.6547 18.1264 34.5675 18.1707 34.4607C18.2149 34.3539 18.2371 34.2393 18.2371 34.1169V33.8123C18.2371 33.6899 18.2136 33.5753 18.1668 33.4685C18.1225 33.3617 18.0535 33.2758 17.9597 33.2107C17.8686 33.143 17.7514 33.1091 17.6082 33.1091C17.4701 33.1091 17.3543 33.143 17.2605 33.2107C17.1694 33.2758 17.1003 33.3617 17.0535 33.4685C17.0092 33.5753 16.9871 33.6899 16.9871 33.8123ZM17.7878 30.3279L15.0105 34.7732L14.6043 34.5154L17.3816 30.0701L17.7878 30.3279Z" fill="black" fill-opacity="0.54"/>
<path d="M7.24609 57.7183H7.30859V58.3315H7.24609C6.86328 58.3315 6.54297 58.394 6.28516 58.519C6.02734 58.6414 5.82292 58.8068 5.67188 59.0151C5.52083 59.2209 5.41146 59.4526 5.34375 59.7104C5.27865 59.9683 5.24609 60.23 5.24609 60.4956V61.3315C5.24609 61.5841 5.27604 61.8081 5.33594 62.0034C5.39583 62.1961 5.47786 62.3589 5.58203 62.4917C5.6862 62.6245 5.80339 62.7248 5.93359 62.7925C6.06641 62.8602 6.20443 62.894 6.34766 62.894C6.51432 62.894 6.66276 62.8628 6.79297 62.8003C6.92318 62.7352 7.03255 62.6453 7.12109 62.5308C7.21224 62.4136 7.28125 62.2756 7.32812 62.1167C7.375 61.9578 7.39844 61.7834 7.39844 61.5933C7.39844 61.424 7.3776 61.2612 7.33594 61.105C7.29427 60.9461 7.23047 60.8055 7.14453 60.6831C7.05859 60.5581 6.95052 60.4604 6.82031 60.3901C6.69271 60.3172 6.54036 60.2808 6.36328 60.2808C6.16276 60.2808 5.97526 60.3302 5.80078 60.4292C5.62891 60.5256 5.48698 60.6532 5.375 60.812C5.26562 60.9683 5.20312 61.1388 5.1875 61.3237L4.80469 61.3198C4.84115 61.0282 4.90885 60.7795 5.00781 60.5737C5.10938 60.3654 5.23438 60.1961 5.38281 60.0659C5.53385 59.9331 5.70182 59.8368 5.88672 59.7769C6.07422 59.7144 6.27214 59.6831 6.48047 59.6831C6.76432 59.6831 7.00911 59.7365 7.21484 59.8433C7.42057 59.95 7.58984 60.0933 7.72266 60.2729C7.85547 60.45 7.95312 60.6506 8.01562 60.8745C8.08073 61.0959 8.11328 61.3237 8.11328 61.5581C8.11328 61.8263 8.07552 62.0776 8 62.312C7.92448 62.5464 7.8112 62.7521 7.66016 62.9292C7.51172 63.1063 7.32812 63.2443 7.10938 63.3433C6.89062 63.4422 6.63672 63.4917 6.34766 63.4917C6.04036 63.4917 5.77214 63.4292 5.54297 63.3042C5.3138 63.1766 5.1237 63.0073 4.97266 62.7964C4.82161 62.5854 4.70833 62.3511 4.63281 62.0933C4.55729 61.8354 4.51953 61.5737 4.51953 61.3081V60.9683C4.51953 60.5672 4.5599 60.174 4.64062 59.7886C4.72135 59.4032 4.86068 59.0542 5.05859 58.7417C5.25911 58.4292 5.53646 58.1805 5.89062 57.9956C6.24479 57.8107 6.69661 57.7183 7.24609 57.7183ZM12.6752 60.1167V60.9839C12.6752 61.45 12.6335 61.8433 12.5502 62.1636C12.4668 62.4839 12.347 62.7417 12.1908 62.937C12.0345 63.1323 11.8457 63.2743 11.6244 63.3628C11.4056 63.4487 11.1582 63.4917 10.8822 63.4917C10.6635 63.4917 10.4616 63.4644 10.2767 63.4097C10.0918 63.355 9.92517 63.2677 9.77673 63.1479C9.6309 63.0256 9.5059 62.8667 9.40173 62.6714C9.29757 62.4761 9.21814 62.2391 9.16345 61.9604C9.10877 61.6818 9.08142 61.3563 9.08142 60.9839V60.1167C9.08142 59.6506 9.12309 59.2599 9.20642 58.9448C9.29236 58.6297 9.41345 58.3771 9.5697 58.187C9.72595 57.9943 9.91345 57.8563 10.1322 57.7729C10.3536 57.6896 10.601 57.6479 10.8744 57.6479C11.0957 57.6479 11.2989 57.6753 11.4838 57.73C11.6713 57.7821 11.8379 57.8667 11.9838 57.9839C12.1296 58.0985 12.2533 58.2521 12.3549 58.4448C12.459 58.6349 12.5385 58.868 12.5931 59.144C12.6478 59.4201 12.6752 59.7443 12.6752 60.1167ZM11.9486 61.1011V59.9956C11.9486 59.7404 11.933 59.5164 11.9017 59.3237C11.8731 59.1284 11.8301 58.9618 11.7728 58.8237C11.7155 58.6857 11.6426 58.5737 11.5541 58.4878C11.4681 58.4019 11.3679 58.3394 11.2533 58.3003C11.1413 58.2586 11.015 58.2378 10.8744 58.2378C10.7025 58.2378 10.5502 58.2703 10.4174 58.3354C10.2845 58.3979 10.1726 58.4982 10.0814 58.6362C9.99288 58.7743 9.92517 58.9552 9.8783 59.1792C9.83142 59.4032 9.80798 59.6753 9.80798 59.9956V61.1011C9.80798 61.3563 9.82231 61.5815 9.85095 61.7769C9.8822 61.9722 9.92778 62.1414 9.98767 62.2847C10.0476 62.4253 10.1205 62.5412 10.2064 62.6323C10.2924 62.7235 10.3913 62.7912 10.5033 62.8354C10.6179 62.8771 10.7442 62.8979 10.8822 62.8979C11.0593 62.8979 11.2142 62.8641 11.347 62.7964C11.4799 62.7287 11.5905 62.6232 11.6791 62.48C11.7702 62.3341 11.8379 62.1479 11.8822 61.9214C11.9265 61.6922 11.9486 61.4188 11.9486 61.1011ZM13.6746 59.1206V58.8198C13.6746 58.6037 13.7214 58.4071 13.8152 58.23C13.9089 58.0529 14.0431 57.911 14.2175 57.8042C14.392 57.6974 14.599 57.644 14.8386 57.644C15.0834 57.644 15.2918 57.6974 15.4636 57.8042C15.6381 57.911 15.7722 58.0529 15.866 58.23C15.9597 58.4071 16.0066 58.6037 16.0066 58.8198V59.1206C16.0066 59.3315 15.9597 59.5256 15.866 59.7026C15.7748 59.8797 15.642 60.0216 15.4675 60.1284C15.2957 60.2352 15.0886 60.2886 14.8464 60.2886C14.6043 60.2886 14.3946 60.2352 14.2175 60.1284C14.0431 60.0216 13.9089 59.8797 13.8152 59.7026C13.7214 59.5256 13.6746 59.3315 13.6746 59.1206ZM14.2175 58.8198V59.1206C14.2175 59.2404 14.2397 59.3537 14.2839 59.4604C14.3308 59.5672 14.4011 59.6545 14.4949 59.7222C14.5886 59.7873 14.7058 59.8198 14.8464 59.8198C14.9871 59.8198 15.1029 59.7873 15.1941 59.7222C15.2852 59.6545 15.3529 59.5672 15.3972 59.4604C15.4415 59.3537 15.4636 59.2404 15.4636 59.1206V58.8198C15.4636 58.6974 15.4402 58.5828 15.3933 58.4761C15.349 58.3667 15.28 58.2795 15.1863 58.2144C15.0951 58.1466 14.9793 58.1128 14.8386 58.1128C14.7006 58.1128 14.5847 58.1466 14.491 58.2144C14.3998 58.2795 14.3308 58.3667 14.2839 58.4761C14.2397 58.5828 14.2175 58.6974 14.2175 58.8198ZM16.4441 62.3237V62.019C16.4441 61.8055 16.491 61.6102 16.5847 61.4331C16.6785 61.256 16.8126 61.1141 16.9871 61.0073C17.1615 60.9006 17.3686 60.8472 17.6082 60.8472C17.8529 60.8472 18.0613 60.9006 18.2332 61.0073C18.4076 61.1141 18.5418 61.256 18.6355 61.4331C18.7293 61.6102 18.7761 61.8055 18.7761 62.019V62.3237C18.7761 62.5373 18.7293 62.7326 18.6355 62.9097C18.5444 63.0868 18.4115 63.2287 18.2371 63.3354C18.0652 63.4422 17.8582 63.4956 17.616 63.4956C17.3738 63.4956 17.1654 63.4422 16.991 63.3354C16.8165 63.2287 16.6811 63.0868 16.5847 62.9097C16.491 62.7326 16.4441 62.5373 16.4441 62.3237ZM16.9871 62.019V62.3237C16.9871 62.4435 17.0092 62.5581 17.0535 62.6675C17.1003 62.7743 17.1707 62.8615 17.2644 62.9292C17.3582 62.9943 17.4753 63.0269 17.616 63.0269C17.7566 63.0269 17.8725 62.9943 17.9636 62.9292C18.0574 62.8615 18.1264 62.7743 18.1707 62.6675C18.2149 62.5607 18.2371 62.4461 18.2371 62.3237V62.019C18.2371 61.8966 18.2136 61.7821 18.1668 61.6753C18.1225 61.5685 18.0535 61.4826 17.9597 61.4175C17.8686 61.3498 17.7514 61.3159 17.6082 61.3159C17.4701 61.3159 17.3543 61.3498 17.2605 61.4175C17.1694 61.4826 17.1003 61.5685 17.0535 61.6753C17.0092 61.7821 16.9871 61.8966 16.9871 62.019ZM17.7878 58.5347L15.0105 62.98L14.6043 62.7222L17.3816 58.2769L17.7878 58.5347Z" fill="black" fill-opacity="0.54"/>
<path d="M8.31641 89.7063V90.3H4.20703V89.8743L6.75391 85.9329H7.34375L6.71094 87.0735L5.02734 89.7063H8.31641ZM7.52344 85.9329V91.6204H6.80078V85.9329H7.52344ZM12.6752 88.3235V89.1907C12.6752 89.6568 12.6335 90.05 12.5502 90.3704C12.4668 90.6907 12.347 90.9485 12.1908 91.1438C12.0345 91.3391 11.8457 91.481 11.6244 91.5696C11.4056 91.6555 11.1582 91.6985 10.8822 91.6985C10.6635 91.6985 10.4616 91.6711 10.2767 91.6165C10.0918 91.5618 9.92517 91.4745 9.77673 91.3547C9.6309 91.2323 9.5059 91.0735 9.40173 90.8782C9.29757 90.6829 9.21814 90.4459 9.16345 90.1672C9.10877 89.8886 9.08142 89.5631 9.08142 89.1907V88.3235C9.08142 87.8573 9.12309 87.4667 9.20642 87.1516C9.29236 86.8365 9.41345 86.5839 9.5697 86.3938C9.72595 86.2011 9.91345 86.0631 10.1322 85.9797C10.3536 85.8964 10.601 85.8547 10.8744 85.8547C11.0957 85.8547 11.2989 85.8821 11.4838 85.9368C11.6713 85.9889 11.8379 86.0735 11.9838 86.1907C12.1296 86.3053 12.2533 86.4589 12.3549 86.6516C12.459 86.8417 12.5385 87.0748 12.5931 87.3508C12.6478 87.6269 12.6752 87.9511 12.6752 88.3235ZM11.9486 89.3079V88.2024C11.9486 87.9472 11.933 87.7232 11.9017 87.5305C11.8731 87.3352 11.8301 87.1685 11.7728 87.0305C11.7155 86.8925 11.6426 86.7805 11.5541 86.6946C11.4681 86.6086 11.3679 86.5461 11.2533 86.5071C11.1413 86.4654 11.015 86.4446 10.8744 86.4446C10.7025 86.4446 10.5502 86.4771 10.4174 86.5422C10.2845 86.6047 10.1726 86.705 10.0814 86.843C9.99288 86.981 9.92517 87.162 9.8783 87.386C9.83142 87.6099 9.80798 87.8821 9.80798 88.2024V89.3079C9.80798 89.5631 9.82231 89.7883 9.85095 89.9836C9.8822 90.179 9.92778 90.3482 9.98767 90.4915C10.0476 90.6321 10.1205 90.748 10.2064 90.8391C10.2924 90.9303 10.3913 90.998 10.5033 91.0422C10.6179 91.0839 10.7442 91.1047 10.8822 91.1047C11.0593 91.1047 11.2142 91.0709 11.347 91.0032C11.4799 90.9355 11.5905 90.83 11.6791 90.6868C11.7702 90.5409 11.8379 90.3547 11.8822 90.1282C11.9265 89.899 11.9486 89.6256 11.9486 89.3079ZM13.6746 87.3274V87.0266C13.6746 86.8105 13.7214 86.6139 13.8152 86.4368C13.9089 86.2597 14.0431 86.1178 14.2175 86.011C14.392 85.9042 14.599 85.8508 14.8386 85.8508C15.0834 85.8508 15.2918 85.9042 15.4636 86.011C15.6381 86.1178 15.7722 86.2597 15.866 86.4368C15.9597 86.6139 16.0066 86.8105 16.0066 87.0266V87.3274C16.0066 87.5383 15.9597 87.7323 15.866 87.9094C15.7748 88.0865 15.642 88.2284 15.4675 88.3352C15.2957 88.442 15.0886 88.4954 14.8464 88.4954C14.6043 88.4954 14.3946 88.442 14.2175 88.3352C14.0431 88.2284 13.9089 88.0865 13.8152 87.9094C13.7214 87.7323 13.6746 87.5383 13.6746 87.3274ZM14.2175 87.0266V87.3274C14.2175 87.4472 14.2397 87.5605 14.2839 87.6672C14.3308 87.774 14.4011 87.8612 14.4949 87.929C14.5886 87.9941 14.7058 88.0266 14.8464 88.0266C14.9871 88.0266 15.1029 87.9941 15.1941 87.929C15.2852 87.8612 15.3529 87.774 15.3972 87.6672C15.4415 87.5605 15.4636 87.4472 15.4636 87.3274V87.0266C15.4636 86.9042 15.4402 86.7896 15.3933 86.6829C15.349 86.5735 15.28 86.4862 15.1863 86.4211C15.0951 86.3534 14.9793 86.3196 14.8386 86.3196C14.7006 86.3196 14.5847 86.3534 14.491 86.4211C14.3998 86.4862 14.3308 86.5735 14.2839 86.6829C14.2397 86.7896 14.2175 86.9042 14.2175 87.0266ZM16.4441 90.5305V90.2258C16.4441 90.0123 16.491 89.817 16.5847 89.6399C16.6785 89.4628 16.8126 89.3209 16.9871 89.2141C17.1615 89.1073 17.3686 89.054 17.6082 89.054C17.8529 89.054 18.0613 89.1073 18.2332 89.2141C18.4076 89.3209 18.5418 89.4628 18.6355 89.6399C18.7293 89.817 18.7761 90.0123 18.7761 90.2258V90.5305C18.7761 90.7441 18.7293 90.9394 18.6355 91.1165C18.5444 91.2935 18.4115 91.4355 18.2371 91.5422C18.0652 91.649 17.8582 91.7024 17.616 91.7024C17.3738 91.7024 17.1654 91.649 16.991 91.5422C16.8165 91.4355 16.6811 91.2935 16.5847 91.1165C16.491 90.9394 16.4441 90.7441 16.4441 90.5305ZM16.9871 90.2258V90.5305C16.9871 90.6503 17.0092 90.7649 17.0535 90.8743C17.1003 90.981 17.1707 91.0683 17.2644 91.136C17.3582 91.2011 17.4753 91.2336 17.616 91.2336C17.7566 91.2336 17.8725 91.2011 17.9636 91.136C18.0574 91.0683 18.1264 90.981 18.1707 90.8743C18.2149 90.7675 18.2371 90.6529 18.2371 90.5305V90.2258C18.2371 90.1034 18.2136 89.9889 18.1668 89.8821C18.1225 89.7753 18.0535 89.6894 17.9597 89.6243C17.8686 89.5566 17.7514 89.5227 17.6082 89.5227C17.4701 89.5227 17.3543 89.5566 17.2605 89.6243C17.1694 89.6894 17.1003 89.7753 17.0535 89.8821C17.0092 89.9889 16.9871 90.1034 16.9871 90.2258ZM17.7878 86.7415L15.0105 91.1868L14.6043 90.929L17.3816 86.4836L17.7878 86.7415Z" fill="black" fill-opacity="0.54"/>
<path d="M8.19922 119.233V119.827H4.47656V119.308L6.33984 117.233C6.56901 116.978 6.74609 116.762 6.87109 116.585C6.9987 116.405 7.08724 116.245 7.13672 116.104C7.1888 115.961 7.21484 115.815 7.21484 115.667C7.21484 115.479 7.17578 115.31 7.09766 115.159C7.02214 115.006 6.91016 114.883 6.76172 114.792C6.61328 114.701 6.43359 114.655 6.22266 114.655C5.97005 114.655 5.75911 114.705 5.58984 114.804C5.42318 114.9 5.29818 115.035 5.21484 115.21C5.13151 115.384 5.08984 115.585 5.08984 115.812H4.36719C4.36719 115.491 4.4375 115.198 4.57812 114.933C4.71875 114.667 4.92708 114.456 5.20312 114.3C5.47917 114.141 5.81901 114.062 6.22266 114.062C6.58203 114.062 6.88932 114.125 7.14453 114.253C7.39974 114.378 7.59505 114.555 7.73047 114.784C7.86849 115.011 7.9375 115.276 7.9375 115.581C7.9375 115.748 7.90885 115.917 7.85156 116.089C7.79688 116.258 7.72005 116.427 7.62109 116.597C7.52474 116.766 7.41146 116.933 7.28125 117.097C7.15365 117.261 7.01693 117.422 6.87109 117.581L5.34766 119.233H8.19922ZM12.6752 116.53V117.397C12.6752 117.864 12.6335 118.257 12.5502 118.577C12.4668 118.897 12.347 119.155 12.1908 119.351C12.0345 119.546 11.8457 119.688 11.6244 119.776C11.4056 119.862 11.1582 119.905 10.8822 119.905C10.6635 119.905 10.4616 119.878 10.2767 119.823C10.0918 119.769 9.92517 119.681 9.77673 119.562C9.6309 119.439 9.5059 119.28 9.40173 119.085C9.29757 118.89 9.21814 118.653 9.16345 118.374C9.10877 118.095 9.08142 117.77 9.08142 117.397V116.53C9.08142 116.064 9.12309 115.674 9.20642 115.358C9.29236 115.043 9.41345 114.791 9.5697 114.601C9.72595 114.408 9.91345 114.27 10.1322 114.187C10.3536 114.103 10.601 114.062 10.8744 114.062C11.0957 114.062 11.2989 114.089 11.4838 114.144C11.6713 114.196 11.8379 114.28 11.9838 114.397C12.1296 114.512 12.2533 114.666 12.3549 114.858C12.459 115.049 12.5385 115.282 12.5931 115.558C12.6478 115.834 12.6752 116.158 12.6752 116.53ZM11.9486 117.515V116.409C11.9486 116.154 11.933 115.93 11.9017 115.737C11.8731 115.542 11.8301 115.375 11.7728 115.237C11.7155 115.099 11.6426 114.987 11.5541 114.901C11.4681 114.815 11.3679 114.753 11.2533 114.714C11.1413 114.672 11.015 114.651 10.8744 114.651C10.7025 114.651 10.5502 114.684 10.4174 114.749C10.2845 114.812 10.1726 114.912 10.0814 115.05C9.99288 115.188 9.92517 115.369 9.8783 115.593C9.83142 115.817 9.80798 116.089 9.80798 116.409V117.515C9.80798 117.77 9.82231 117.995 9.85095 118.19C9.8822 118.386 9.92778 118.555 9.98767 118.698C10.0476 118.839 10.1205 118.955 10.2064 119.046C10.2924 119.137 10.3913 119.205 10.5033 119.249C10.6179 119.291 10.7442 119.312 10.8822 119.312C11.0593 119.312 11.2142 119.278 11.347 119.21C11.4799 119.142 11.5905 119.037 11.6791 118.894C11.7702 118.748 11.8379 118.562 11.8822 118.335C11.9265 118.106 11.9486 117.832 11.9486 117.515ZM13.6746 115.534V115.233C13.6746 115.017 13.7214 114.821 13.8152 114.644C13.9089 114.466 14.0431 114.325 14.2175 114.218C14.392 114.111 14.599 114.058 14.8386 114.058C15.0834 114.058 15.2918 114.111 15.4636 114.218C15.6381 114.325 15.7722 114.466 15.866 114.644C15.9597 114.821 16.0066 115.017 16.0066 115.233V115.534C16.0066 115.745 15.9597 115.939 15.866 116.116C15.7748 116.293 15.642 116.435 15.4675 116.542C15.2957 116.649 15.0886 116.702 14.8464 116.702C14.6043 116.702 14.3946 116.649 14.2175 116.542C14.0431 116.435 13.9089 116.293 13.8152 116.116C13.7214 115.939 13.6746 115.745 13.6746 115.534ZM14.2175 115.233V115.534C14.2175 115.654 14.2397 115.767 14.2839 115.874C14.3308 115.981 14.4011 116.068 14.4949 116.136C14.5886 116.201 14.7058 116.233 14.8464 116.233C14.9871 116.233 15.1029 116.201 15.1941 116.136C15.2852 116.068 15.3529 115.981 15.3972 115.874C15.4415 115.767 15.4636 115.654 15.4636 115.534V115.233C15.4636 115.111 15.4402 114.996 15.3933 114.89C15.349 114.78 15.28 114.693 15.1863 114.628C15.0951 114.56 14.9793 114.526 14.8386 114.526C14.7006 114.526 14.5847 114.56 14.491 114.628C14.3998 114.693 14.3308 114.78 14.2839 114.89C14.2397 114.996 14.2175 115.111 14.2175 115.233ZM16.4441 118.737V118.433C16.4441 118.219 16.491 118.024 16.5847 117.847C16.6785 117.67 16.8126 117.528 16.9871 117.421C17.1615 117.314 17.3686 117.261 17.6082 117.261C17.8529 117.261 18.0613 117.314 18.2332 117.421C18.4076 117.528 18.5418 117.67 18.6355 117.847C18.7293 118.024 18.7761 118.219 18.7761 118.433V118.737C18.7761 118.951 18.7293 119.146 18.6355 119.323C18.5444 119.5 18.4115 119.642 18.2371 119.749C18.0652 119.856 17.8582 119.909 17.616 119.909C17.3738 119.909 17.1654 119.856 16.991 119.749C16.8165 119.642 16.6811 119.5 16.5847 119.323C16.491 119.146 16.4441 118.951 16.4441 118.737ZM16.9871 118.433V118.737C16.9871 118.857 17.0092 118.972 17.0535 119.081C17.1003 119.188 17.1707 119.275 17.2644 119.343C17.3582 119.408 17.4753 119.44 17.616 119.44C17.7566 119.44 17.8725 119.408 17.9636 119.343C18.0574 119.275 18.1264 119.188 18.1707 119.081C18.2149 118.974 18.2371 118.86 18.2371 118.737V118.433C18.2371 118.31 18.2136 118.196 18.1668 118.089C18.1225 117.982 18.0535 117.896 17.9597 117.831C17.8686 117.763 17.7514 117.729 17.6082 117.729C17.4701 117.729 17.3543 117.763 17.2605 117.831C17.1694 117.896 17.1003 117.982 17.0535 118.089C17.0092 118.196 16.9871 118.31 16.9871 118.433ZM17.7878 114.948L15.0105 119.394L14.6043 119.136L17.3816 114.69L17.7878 114.948Z" fill="black" fill-opacity="0.54"/>
<path d="M13.043 144.737V145.604C13.043 146.07 13.0013 146.464 12.918 146.784C12.8346 147.104 12.7148 147.362 12.5586 147.557C12.4023 147.753 12.2135 147.895 11.9922 147.983C11.7734 148.069 11.526 148.112 11.25 148.112C11.0312 148.112 10.8294 148.085 10.6445 148.03C10.4596 147.975 10.293 147.888 10.1445 147.768C9.9987 147.646 9.8737 147.487 9.76953 147.292C9.66536 147.096 9.58594 146.859 9.53125 146.581C9.47656 146.302 9.44922 145.977 9.44922 145.604V144.737C9.44922 144.271 9.49089 143.88 9.57422 143.565C9.66016 143.25 9.78125 142.997 9.9375 142.807C10.0938 142.615 10.2812 142.477 10.5 142.393C10.7214 142.31 10.9688 142.268 11.2422 142.268C11.4635 142.268 11.6667 142.296 11.8516 142.35C12.0391 142.402 12.2057 142.487 12.3516 142.604C12.4974 142.719 12.6211 142.872 12.7227 143.065C12.8268 143.255 12.9062 143.488 12.9609 143.764C13.0156 144.04 13.043 144.365 13.043 144.737ZM12.3164 145.721V144.616C12.3164 144.361 12.3008 144.137 12.2695 143.944C12.2409 143.749 12.1979 143.582 12.1406 143.444C12.0833 143.306 12.0104 143.194 11.9219 143.108C11.8359 143.022 11.7357 142.96 11.6211 142.921C11.5091 142.879 11.3828 142.858 11.2422 142.858C11.0703 142.858 10.918 142.891 10.7852 142.956C10.6523 143.018 10.5404 143.119 10.4492 143.257C10.3607 143.395 10.293 143.576 10.2461 143.8C10.1992 144.024 10.1758 144.296 10.1758 144.616V145.721C10.1758 145.977 10.1901 146.202 10.2188 146.397C10.25 146.593 10.2956 146.762 10.3555 146.905C10.4154 147.046 10.4883 147.162 10.5742 147.253C10.6602 147.344 10.7591 147.412 10.8711 147.456C10.9857 147.497 11.112 147.518 11.25 147.518C11.4271 147.518 11.582 147.484 11.7148 147.417C11.8477 147.349 11.9583 147.244 12.0469 147.1C12.138 146.955 12.2057 146.768 12.25 146.542C12.2943 146.313 12.3164 146.039 12.3164 145.721ZM14.0424 143.741V143.44C14.0424 143.224 14.0892 143.027 14.183 142.85C14.2767 142.673 14.4108 142.531 14.5853 142.425C14.7598 142.318 14.9668 142.264 15.2064 142.264C15.4512 142.264 15.6595 142.318 15.8314 142.425C16.0059 142.531 16.14 142.673 16.2338 142.85C16.3275 143.027 16.3744 143.224 16.3744 143.44V143.741C16.3744 143.952 16.3275 144.146 16.2338 144.323C16.1426 144.5 16.0098 144.642 15.8353 144.749C15.6635 144.856 15.4564 144.909 15.2142 144.909C14.972 144.909 14.7624 144.856 14.5853 144.749C14.4108 144.642 14.2767 144.5 14.183 144.323C14.0892 144.146 14.0424 143.952 14.0424 143.741ZM14.5853 143.44V143.741C14.5853 143.861 14.6075 143.974 14.6517 144.081C14.6986 144.188 14.7689 144.275 14.8627 144.343C14.9564 144.408 15.0736 144.44 15.2142 144.44C15.3549 144.44 15.4707 144.408 15.5619 144.343C15.653 144.275 15.7207 144.188 15.765 144.081C15.8093 143.974 15.8314 143.861 15.8314 143.741V143.44C15.8314 143.318 15.808 143.203 15.7611 143.096C15.7168 142.987 15.6478 142.9 15.5541 142.835C15.4629 142.767 15.347 142.733 15.2064 142.733C15.0684 142.733 14.9525 142.767 14.8588 142.835C14.7676 142.9 14.6986 142.987 14.6517 143.096C14.6075 143.203 14.5853 143.318 14.5853 143.44ZM16.8119 146.944V146.639C16.8119 146.426 16.8588 146.231 16.9525 146.053C17.0463 145.876 17.1804 145.734 17.3549 145.628C17.5293 145.521 17.7364 145.468 17.976 145.468C18.2207 145.468 18.4291 145.521 18.601 145.628C18.7754 145.734 18.9095 145.876 19.0033 146.053C19.097 146.231 19.1439 146.426 19.1439 146.639V146.944C19.1439 147.158 19.097 147.353 19.0033 147.53C18.9122 147.707 18.7793 147.849 18.6049 147.956C18.433 148.063 18.226 148.116 17.9838 148.116C17.7416 148.116 17.5332 148.063 17.3588 147.956C17.1843 147.849 17.0489 147.707 16.9525 147.53C16.8588 147.353 16.8119 147.158 16.8119 146.944ZM17.3549 146.639V146.944C17.3549 147.064 17.377 147.178 17.4213 147.288C17.4681 147.395 17.5385 147.482 17.6322 147.55C17.726 147.615 17.8431 147.647 17.9838 147.647C18.1244 147.647 18.2403 147.615 18.3314 147.55C18.4252 147.482 18.4942 147.395 18.5385 147.288C18.5827 147.181 18.6049 147.066 18.6049 146.944V146.639C18.6049 146.517 18.5814 146.402 18.5345 146.296C18.4903 146.189 18.4213 146.103 18.3275 146.038C18.2364 145.97 18.1192 145.936 17.976 145.936C17.8379 145.936 17.722 145.97 17.6283 146.038C17.5372 146.103 17.4681 146.189 17.4213 146.296C17.377 146.402 17.3549 146.517 17.3549 146.639ZM18.1556 143.155L15.3783 147.6L14.972 147.343L17.7494 142.897L18.1556 143.155Z" fill="black" fill-opacity="0.54"/>
<path d="M25 4.16113L200 4.16116" stroke="black" stroke-opacity="0.12"/>
<path d="M25 33.1611L200 33.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 61.1611L200 61.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 89.1611L200 89.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 118.161L200 118.161" stroke="black" stroke-opacity="0.12"/>
<line x1="23.2" y1="145.961" x2="202.8" y2="145.961" stroke="black" stroke-opacity="0.7" stroke-width="0.4" stroke-linecap="square"/>
<line x1="40.45" y1="148.072" x2="40.45" y2="147.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M32.5091 152.025V152.893C32.5091 153.359 32.4674 153.752 32.3841 154.072C32.3007 154.393 32.1809 154.65 32.0247 154.846C31.8684 155.041 31.6796 155.183 31.4583 155.271C31.2395 155.357 30.9921 155.4 30.7161 155.4C30.4973 155.4 30.2955 155.373 30.1106 155.318C29.9257 155.264 29.7591 155.176 29.6106 155.057C29.4648 154.934 29.3398 154.775 29.2356 154.58C29.1315 154.385 29.052 154.148 28.9973 153.869C28.9427 153.59 28.9153 153.265 28.9153 152.893V152.025C28.9153 151.559 28.957 151.169 29.0403 150.854C29.1262 150.538 29.2473 150.286 29.4036 150.096C29.5598 149.903 29.7473 149.765 29.9661 149.682C30.1874 149.598 30.4348 149.557 30.7083 149.557C30.9296 149.557 31.1328 149.584 31.3177 149.639C31.5052 149.691 31.6718 149.775 31.8177 149.893C31.9635 150.007 32.0872 150.161 32.1887 150.354C32.2929 150.544 32.3723 150.777 32.427 151.053C32.4817 151.329 32.5091 151.653 32.5091 152.025ZM31.7825 153.01V151.904C31.7825 151.649 31.7669 151.425 31.7356 151.232C31.707 151.037 31.664 150.87 31.6067 150.732C31.5494 150.594 31.4765 150.482 31.388 150.396C31.302 150.311 31.2018 150.248 31.0872 150.209C30.9752 150.167 30.8489 150.146 30.7083 150.146C30.5364 150.146 30.3841 150.179 30.2512 150.244C30.1184 150.307 30.0065 150.407 29.9153 150.545C29.8268 150.683 29.7591 150.864 29.7122 151.088C29.6653 151.312 29.6419 151.584 29.6419 151.904V153.01C29.6419 153.265 29.6562 153.49 29.6848 153.686C29.7161 153.881 29.7617 154.05 29.8216 154.193C29.8815 154.334 29.9544 154.45 30.0403 154.541C30.1262 154.632 30.2252 154.7 30.3372 154.744C30.4518 154.786 30.5781 154.807 30.7161 154.807C30.8932 154.807 31.0481 154.773 31.1809 154.705C31.3137 154.637 31.4244 154.532 31.513 154.389C31.6041 154.243 31.6718 154.057 31.7161 153.83C31.7604 153.601 31.7825 153.327 31.7825 153.01ZM35.8964 149.604V155.322H35.1737V150.506L33.7167 151.037V150.385L35.7831 149.604H35.8964ZM41.1124 149.635V155.322H40.3585V149.635H41.1124ZM43.4952 152.193V152.811H40.9483V152.193H43.4952ZM43.8819 149.635V150.252H40.9483V149.635H43.8819ZM46.4216 155.4C46.1273 155.4 45.8604 155.351 45.6208 155.252C45.3838 155.15 45.1794 155.008 45.0075 154.826C44.8383 154.644 44.7081 154.428 44.6169 154.178C44.5258 153.928 44.4802 153.654 44.4802 153.357V153.193C44.4802 152.85 44.531 152.544 44.6325 152.275C44.7341 152.005 44.8721 151.775 45.0466 151.588C45.2211 151.4 45.419 151.258 45.6403 151.162C45.8617 151.066 46.0909 151.018 46.3278 151.018C46.6299 151.018 46.8903 151.07 47.1091 151.174C47.3305 151.278 47.5114 151.424 47.6521 151.611C47.7927 151.796 47.8969 152.015 47.9646 152.268C48.0323 152.518 48.0661 152.791 48.0661 153.088V153.412H44.9099V152.822H47.3435V152.768C47.3331 152.58 47.294 152.398 47.2263 152.221C47.1612 152.044 47.057 151.898 46.9138 151.783C46.7706 151.669 46.5752 151.611 46.3278 151.611C46.1638 151.611 46.0127 151.646 45.8747 151.717C45.7367 151.785 45.6182 151.886 45.5193 152.021C45.4203 152.157 45.3435 152.322 45.2888 152.518C45.2341 152.713 45.2068 152.938 45.2068 153.193V153.357C45.2068 153.558 45.2341 153.747 45.2888 153.924C45.3461 154.098 45.4281 154.252 45.5349 154.385C45.6443 154.518 45.7758 154.622 45.9294 154.697C46.0857 154.773 46.2627 154.811 46.4607 154.811C46.7159 154.811 46.932 154.758 47.1091 154.654C47.2862 154.55 47.4411 154.411 47.5739 154.236L48.0114 154.584C47.9203 154.722 47.8044 154.854 47.6638 154.979C47.5232 155.104 47.35 155.205 47.1443 155.283C46.9411 155.361 46.7002 155.4 46.4216 155.4ZM48.9886 149.322H49.7152V154.502L49.6527 155.322H48.9886V149.322ZM52.5706 153.174V153.256C52.5706 153.563 52.5342 153.848 52.4613 154.111C52.3883 154.372 52.2816 154.598 52.1409 154.791C52.0003 154.984 51.8284 155.133 51.6253 155.24C51.4222 155.347 51.1891 155.4 50.9261 155.4C50.6579 155.4 50.4222 155.355 50.2191 155.264C50.0185 155.17 49.8493 155.036 49.7113 154.861C49.5732 154.687 49.4626 154.476 49.3792 154.229C49.2985 153.981 49.2425 153.702 49.2113 153.393V153.033C49.2425 152.721 49.2985 152.441 49.3792 152.193C49.4626 151.946 49.5732 151.735 49.7113 151.561C49.8493 151.383 50.0185 151.249 50.2191 151.158C50.4196 151.064 50.6527 151.018 50.9183 151.018C51.1839 151.018 51.4196 151.07 51.6253 151.174C51.831 151.275 52.0029 151.421 52.1409 151.611C52.2816 151.801 52.3883 152.029 52.4613 152.295C52.5342 152.558 52.5706 152.851 52.5706 153.174ZM51.8441 153.256V153.174C51.8441 152.963 51.8245 152.765 51.7855 152.58C51.7464 152.393 51.6839 152.229 51.598 152.088C51.512 151.945 51.3988 151.833 51.2581 151.752C51.1175 151.669 50.9443 151.627 50.7386 151.627C50.5563 151.627 50.3975 151.658 50.262 151.721C50.1292 151.783 50.0159 151.868 49.9222 151.975C49.8284 152.079 49.7516 152.199 49.6917 152.334C49.6344 152.467 49.5915 152.605 49.5628 152.748V153.689C49.6045 153.872 49.6722 154.048 49.7659 154.217C49.8623 154.383 49.9899 154.52 50.1488 154.627C50.3102 154.734 50.5094 154.787 50.7464 154.787C50.9417 154.787 51.1084 154.748 51.2464 154.67C51.387 154.589 51.5003 154.479 51.5863 154.338C51.6748 154.197 51.7399 154.035 51.7816 153.85C51.8232 153.665 51.8441 153.467 51.8441 153.256Z" fill="black" fill-opacity="0.54"/>
<g clip-path="url(#clip1_4184_94527)">
<line x1="75.8499" y1="147.072" x2="75.8499" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M67.909 152.025V152.892C67.909 153.358 67.8673 153.752 67.784 154.072C67.7006 154.392 67.5808 154.65 67.4246 154.845C67.2683 155.041 67.0795 155.183 66.8582 155.271C66.6394 155.357 66.392 155.4 66.116 155.4C65.8972 155.4 65.6954 155.373 65.5105 155.318C65.3256 155.263 65.159 155.176 65.0105 155.056C64.8647 154.934 64.7397 154.775 64.6355 154.58C64.5314 154.385 64.4519 154.148 64.3972 153.869C64.3426 153.59 64.3152 153.265 64.3152 152.892V152.025C64.3152 151.559 64.3569 151.168 64.4402 150.853C64.5261 150.538 64.6472 150.286 64.8035 150.095C64.9597 149.903 65.1472 149.765 65.366 149.681C65.5873 149.598 65.8347 149.556 66.1082 149.556C66.3295 149.556 66.5327 149.584 66.7176 149.638C66.9051 149.691 67.0717 149.775 67.2176 149.892C67.3634 150.007 67.4871 150.161 67.5886 150.353C67.6928 150.543 67.7722 150.776 67.8269 151.052C67.8816 151.329 67.909 151.653 67.909 152.025ZM67.1824 153.01V151.904C67.1824 151.649 67.1668 151.425 67.1355 151.232C67.1069 151.037 67.0639 150.87 67.0066 150.732C66.9493 150.594 66.8764 150.482 66.7879 150.396C66.7019 150.31 66.6017 150.248 66.4871 150.209C66.3751 150.167 66.2488 150.146 66.1082 150.146C65.9363 150.146 65.784 150.179 65.6511 150.244C65.5183 150.306 65.4064 150.407 65.3152 150.545C65.2267 150.683 65.159 150.864 65.1121 151.088C65.0652 151.312 65.0418 151.584 65.0418 151.904V153.01C65.0418 153.265 65.0561 153.49 65.0847 153.685C65.116 153.881 65.1616 154.05 65.2215 154.193C65.2814 154.334 65.3543 154.45 65.4402 154.541C65.5261 154.632 65.6251 154.7 65.7371 154.744C65.8517 154.786 65.978 154.806 66.116 154.806C66.2931 154.806 66.448 154.773 66.5808 154.705C66.7136 154.637 66.8243 154.532 66.9129 154.388C67.004 154.243 67.0717 154.056 67.116 153.83C67.1603 153.601 67.1824 153.327 67.1824 153.01ZM72.6478 154.728V155.322H68.9252V154.802L70.7885 152.728C71.0176 152.473 71.1947 152.257 71.3197 152.08C71.4473 151.9 71.5359 151.74 71.5853 151.599C71.6374 151.456 71.6635 151.31 71.6635 151.162C71.6635 150.974 71.6244 150.805 71.5463 150.654C71.4708 150.5 71.3588 150.378 71.2103 150.287C71.0619 150.196 70.8822 150.15 70.6713 150.15C70.4187 150.15 70.2077 150.2 70.0385 150.299C69.8718 150.395 69.7468 150.53 69.6635 150.705C69.5801 150.879 69.5385 151.08 69.5385 151.306H68.8158C68.8158 150.986 68.8861 150.693 69.0267 150.427C69.1674 150.162 69.3757 149.951 69.6517 149.795C69.9278 149.636 70.2676 149.556 70.6713 149.556C71.0307 149.556 71.3379 149.62 71.5932 149.748C71.8484 149.873 72.0437 150.05 72.1791 150.279C72.3171 150.506 72.3861 150.771 72.3861 151.076C72.3861 151.243 72.3575 151.412 72.3002 151.584C72.2455 151.753 72.1687 151.922 72.0697 152.092C71.9734 152.261 71.8601 152.427 71.7299 152.592C71.6023 152.756 71.4655 152.917 71.3197 153.076L69.7963 154.728H72.6478ZM76.5123 149.635V155.322H75.7584V149.635H76.5123ZM78.8951 152.193V152.81H76.3482V152.193H78.8951ZM79.2818 149.635V150.252H76.3482V149.635H79.2818ZM81.8215 155.4C81.5272 155.4 81.2603 155.351 81.0207 155.252C80.7837 155.15 80.5793 155.008 80.4074 154.826C80.2382 154.644 80.108 154.427 80.0168 154.177C79.9257 153.927 79.8801 153.654 79.8801 153.357V153.193C79.8801 152.849 79.9309 152.543 80.0324 152.275C80.134 152.004 80.272 151.775 80.4465 151.588C80.621 151.4 80.8189 151.258 81.0402 151.162C81.2616 151.066 81.4908 151.017 81.7277 151.017C82.0298 151.017 82.2902 151.069 82.509 151.174C82.7304 151.278 82.9113 151.424 83.052 151.611C83.1926 151.796 83.2968 152.015 83.3645 152.267C83.4322 152.517 83.466 152.791 83.466 153.088V153.412H80.3098V152.822H82.7434V152.767C82.733 152.58 82.6939 152.398 82.6262 152.22C82.5611 152.043 82.4569 151.898 82.3137 151.783C82.1705 151.668 81.9751 151.611 81.7277 151.611C81.5637 151.611 81.4126 151.646 81.2746 151.717C81.1366 151.784 81.0181 151.886 80.9192 152.021C80.8202 152.157 80.7434 152.322 80.6887 152.517C80.634 152.713 80.6067 152.938 80.6067 153.193V153.357C80.6067 153.558 80.634 153.747 80.6887 153.924C80.746 154.098 80.828 154.252 80.9348 154.385C81.0442 154.517 81.1757 154.622 81.3293 154.697C81.4856 154.773 81.6626 154.81 81.8606 154.81C82.1158 154.81 82.3319 154.758 82.509 154.654C82.6861 154.55 82.841 154.411 82.9738 154.236L83.4113 154.584C83.3202 154.722 83.2043 154.853 83.0637 154.978C82.9231 155.103 82.7499 155.205 82.5442 155.283C82.341 155.361 82.1001 155.4 81.8215 155.4ZM84.3885 149.322H85.1151V154.502L85.0526 155.322H84.3885V149.322ZM87.9705 153.174V153.256C87.9705 153.563 87.9341 153.848 87.8612 154.111C87.7882 154.372 87.6815 154.598 87.5408 154.791C87.4002 154.983 87.2283 155.133 87.0252 155.24C86.8221 155.347 86.589 155.4 86.326 155.4C86.0578 155.4 85.8221 155.355 85.619 155.263C85.4185 155.17 85.2492 155.036 85.1112 154.861C84.9731 154.687 84.8625 154.476 84.7791 154.228C84.6984 153.981 84.6424 153.702 84.6112 153.392V153.033C84.6424 152.72 84.6984 152.441 84.7791 152.193C84.8625 151.946 84.9731 151.735 85.1112 151.56C85.2492 151.383 85.4185 151.249 85.619 151.158C85.8195 151.064 86.0526 151.017 86.3182 151.017C86.5838 151.017 86.8195 151.069 87.0252 151.174C87.231 151.275 87.4028 151.421 87.5408 151.611C87.6815 151.801 87.7882 152.029 87.8612 152.295C87.9341 152.558 87.9705 152.851 87.9705 153.174ZM87.244 153.256V153.174C87.244 152.963 87.2244 152.765 87.1854 152.58C87.1463 152.392 87.0838 152.228 86.9979 152.088C86.9119 151.944 86.7987 151.832 86.658 151.752C86.5174 151.668 86.3442 151.627 86.1385 151.627C85.9562 151.627 85.7974 151.658 85.6619 151.72C85.5291 151.783 85.4158 151.868 85.3221 151.974C85.2283 152.079 85.1515 152.198 85.0916 152.334C85.0343 152.467 84.9914 152.605 84.9627 152.748V153.689C85.0044 153.872 85.0721 154.047 85.1658 154.217C85.2622 154.383 85.3898 154.52 85.5487 154.627C85.7101 154.733 85.9093 154.787 86.1463 154.787C86.3416 154.787 86.5083 154.748 86.6463 154.67C86.7869 154.589 86.9002 154.478 86.9862 154.338C87.0747 154.197 87.1398 154.034 87.1815 153.849C87.2231 153.664 87.244 153.467 87.244 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip2_4184_94527)">
<line x1="111.25" y1="147.072" x2="111.25" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M103.309 152.025V152.892C103.309 153.358 103.267 153.752 103.184 154.072C103.101 154.392 102.981 154.65 102.825 154.845C102.668 155.041 102.48 155.183 102.258 155.271C102.04 155.357 101.792 155.4 101.516 155.4C101.297 155.4 101.096 155.373 100.911 155.318C100.726 155.263 100.559 155.176 100.411 155.056C100.265 154.934 100.14 154.775 100.036 154.58C99.9315 154.385 99.8521 154.148 99.7974 153.869C99.7427 153.59 99.7154 153.265 99.7154 152.892V152.025C99.7154 151.559 99.757 151.168 99.8404 150.853C99.9263 150.538 100.047 150.286 100.204 150.095C100.36 149.903 100.547 149.765 100.766 149.681C100.987 149.598 101.235 149.556 101.508 149.556C101.73 149.556 101.933 149.584 102.118 149.638C102.305 149.691 102.472 149.775 102.618 149.892C102.764 150.007 102.887 150.161 102.989 150.353C103.093 150.543 103.172 150.776 103.227 151.052C103.282 151.329 103.309 151.653 103.309 152.025ZM102.583 153.01V151.904C102.583 151.649 102.567 151.425 102.536 151.232C102.507 151.037 102.464 150.87 102.407 150.732C102.349 150.594 102.277 150.482 102.188 150.396C102.102 150.31 102.002 150.248 101.887 150.209C101.775 150.167 101.649 150.146 101.508 150.146C101.336 150.146 101.184 150.179 101.051 150.244C100.918 150.306 100.807 150.407 100.715 150.545C100.627 150.683 100.559 150.864 100.512 151.088C100.465 151.312 100.442 151.584 100.442 151.904V153.01C100.442 153.265 100.456 153.49 100.485 153.685C100.516 153.881 100.562 154.05 100.622 154.193C100.682 154.334 100.754 154.45 100.84 154.541C100.926 154.632 101.025 154.7 101.137 154.744C101.252 154.786 101.378 154.806 101.516 154.806C101.693 154.806 101.848 154.773 101.981 154.705C102.114 154.637 102.224 154.532 102.313 154.388C102.404 154.243 102.472 154.056 102.516 153.83C102.56 153.601 102.583 153.327 102.583 153.01ZM105.376 152.123H105.892C106.144 152.123 106.353 152.081 106.517 151.998C106.683 151.912 106.807 151.796 106.888 151.65C106.971 151.502 107.013 151.335 107.013 151.15C107.013 150.931 106.976 150.748 106.903 150.599C106.831 150.451 106.721 150.339 106.575 150.263C106.429 150.188 106.245 150.15 106.021 150.15C105.818 150.15 105.638 150.191 105.482 150.271C105.328 150.349 105.207 150.461 105.118 150.607C105.032 150.753 104.989 150.925 104.989 151.123H104.267C104.267 150.834 104.34 150.571 104.485 150.334C104.631 150.097 104.836 149.908 105.099 149.767C105.364 149.627 105.672 149.556 106.021 149.556C106.364 149.556 106.665 149.618 106.923 149.74C107.181 149.86 107.381 150.039 107.525 150.279C107.668 150.516 107.739 150.812 107.739 151.166C107.739 151.309 107.706 151.463 107.638 151.627C107.573 151.788 107.47 151.939 107.329 152.08C107.191 152.22 107.012 152.336 106.79 152.427C106.569 152.516 106.303 152.56 105.993 152.56H105.376V152.123ZM105.376 152.717V152.283H105.993C106.355 152.283 106.655 152.326 106.892 152.412C107.129 152.498 107.315 152.612 107.45 152.756C107.588 152.899 107.685 153.056 107.739 153.228C107.797 153.398 107.825 153.567 107.825 153.736C107.825 154.002 107.78 154.237 107.689 154.443C107.6 154.649 107.474 154.823 107.31 154.967C107.148 155.11 106.958 155.218 106.739 155.291C106.521 155.364 106.282 155.4 106.025 155.4C105.777 155.4 105.544 155.365 105.325 155.295C105.109 155.224 104.918 155.123 104.751 154.99C104.584 154.855 104.454 154.689 104.36 154.494C104.267 154.296 104.22 154.071 104.22 153.818H104.943C104.943 154.016 104.985 154.189 105.071 154.338C105.16 154.486 105.285 154.602 105.446 154.685C105.61 154.766 105.803 154.806 106.025 154.806C106.246 154.806 106.436 154.769 106.595 154.693C106.756 154.615 106.88 154.498 106.966 154.342C107.054 154.185 107.099 153.989 107.099 153.752C107.099 153.515 107.049 153.321 106.95 153.17C106.851 153.016 106.711 152.903 106.528 152.83C106.349 152.754 106.137 152.717 105.892 152.717H105.376ZM111.912 149.635V155.322H111.159V149.635H111.912ZM114.295 152.193V152.81H111.748V152.193H114.295ZM114.682 149.635V150.252H111.748V149.635H114.682ZM117.222 155.4C116.927 155.4 116.66 155.351 116.421 155.252C116.184 155.15 115.979 155.008 115.808 154.826C115.638 154.644 115.508 154.427 115.417 154.177C115.326 153.927 115.28 153.654 115.28 153.357V153.193C115.28 152.849 115.331 152.543 115.433 152.275C115.534 152.004 115.672 151.775 115.847 151.588C116.021 151.4 116.219 151.258 116.44 151.162C116.662 151.066 116.891 151.017 117.128 151.017C117.43 151.017 117.69 151.069 117.909 151.174C118.13 151.278 118.311 151.424 118.452 151.611C118.593 151.796 118.697 152.015 118.765 152.267C118.832 152.517 118.866 152.791 118.866 153.088V153.412H115.71V152.822H118.144V152.767C118.133 152.58 118.094 152.398 118.026 152.22C117.961 152.043 117.857 151.898 117.714 151.783C117.571 151.668 117.375 151.611 117.128 151.611C116.964 151.611 116.813 151.646 116.675 151.717C116.537 151.784 116.418 151.886 116.319 152.021C116.22 152.157 116.144 152.322 116.089 152.517C116.034 152.713 116.007 152.938 116.007 153.193V153.357C116.007 153.558 116.034 153.747 116.089 153.924C116.146 154.098 116.228 154.252 116.335 154.385C116.444 154.517 116.576 154.622 116.729 154.697C116.886 154.773 117.063 154.81 117.261 154.81C117.516 154.81 117.732 154.758 117.909 154.654C118.086 154.55 118.241 154.411 118.374 154.236L118.811 154.584C118.72 154.722 118.604 154.853 118.464 154.978C118.323 155.103 118.15 155.205 117.944 155.283C117.741 155.361 117.5 155.4 117.222 155.4ZM119.789 149.322H120.515V154.502L120.453 155.322H119.789V149.322ZM123.371 153.174V153.256C123.371 153.563 123.334 153.848 123.261 154.111C123.188 154.372 123.082 154.598 122.941 154.791C122.8 154.983 122.628 155.133 122.425 155.24C122.222 155.347 121.989 155.4 121.726 155.4C121.458 155.4 121.222 155.355 121.019 155.263C120.819 155.17 120.649 155.036 120.511 154.861C120.373 154.687 120.263 154.476 120.179 154.228C120.099 153.981 120.043 153.702 120.011 153.392V153.033C120.043 152.72 120.099 152.441 120.179 152.193C120.263 151.946 120.373 151.735 120.511 151.56C120.649 151.383 120.819 151.249 121.019 151.158C121.22 151.064 121.453 151.017 121.718 151.017C121.984 151.017 122.22 151.069 122.425 151.174C122.631 151.275 122.803 151.421 122.941 151.611C123.082 151.801 123.188 152.029 123.261 152.295C123.334 152.558 123.371 152.851 123.371 153.174ZM122.644 153.256V153.174C122.644 152.963 122.625 152.765 122.586 152.58C122.546 152.392 122.484 152.228 122.398 152.088C122.312 151.944 122.199 151.832 122.058 151.752C121.918 151.668 121.744 151.627 121.539 151.627C121.356 151.627 121.198 151.658 121.062 151.72C120.929 151.783 120.816 151.868 120.722 151.974C120.628 152.079 120.552 152.198 120.492 152.334C120.434 152.467 120.392 152.605 120.363 152.748V153.689C120.405 153.872 120.472 154.047 120.566 154.217C120.662 154.383 120.79 154.52 120.949 154.627C121.11 154.733 121.309 154.787 121.546 154.787C121.742 154.787 121.908 154.748 122.046 154.67C122.187 154.589 122.3 154.478 122.386 154.338C122.475 154.197 122.54 154.034 122.582 153.849C122.623 153.664 122.644 153.467 122.644 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip3_4184_94527)">
<line x1="146.65" y1="147.072" x2="146.65" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M138.709 152.025V152.892C138.709 153.358 138.667 153.752 138.584 154.072C138.501 154.392 138.381 154.65 138.225 154.845C138.068 155.041 137.88 155.183 137.658 155.271C137.439 155.357 137.192 155.4 136.916 155.4C136.697 155.4 136.495 155.373 136.311 155.318C136.126 155.263 135.959 155.176 135.811 155.056C135.665 154.934 135.54 154.775 135.436 154.58C135.331 154.385 135.252 154.148 135.197 153.869C135.143 153.59 135.115 153.265 135.115 152.892V152.025C135.115 151.559 135.157 151.168 135.24 150.853C135.326 150.538 135.447 150.286 135.604 150.095C135.76 149.903 135.947 149.765 136.166 149.681C136.387 149.598 136.635 149.556 136.908 149.556C137.13 149.556 137.333 149.584 137.518 149.638C137.705 149.691 137.872 149.775 138.018 149.892C138.163 150.007 138.287 150.161 138.389 150.353C138.493 150.543 138.572 150.776 138.627 151.052C138.682 151.329 138.709 151.653 138.709 152.025ZM137.982 153.01V151.904C137.982 151.649 137.967 151.425 137.936 151.232C137.907 151.037 137.864 150.87 137.807 150.732C137.749 150.594 137.676 150.482 137.588 150.396C137.502 150.31 137.402 150.248 137.287 150.209C137.175 150.167 137.049 150.146 136.908 150.146C136.736 150.146 136.584 150.179 136.451 150.244C136.318 150.306 136.206 150.407 136.115 150.545C136.027 150.683 135.959 150.864 135.912 151.088C135.865 151.312 135.842 151.584 135.842 151.904V153.01C135.842 153.265 135.856 153.49 135.885 153.685C135.916 153.881 135.962 154.05 136.022 154.193C136.081 154.334 136.154 154.45 136.24 154.541C136.326 154.632 136.425 154.7 136.537 154.744C136.652 154.786 136.778 154.806 136.916 154.806C137.093 154.806 137.248 154.773 137.381 154.705C137.514 154.637 137.624 154.532 137.713 154.388C137.804 154.243 137.872 154.056 137.916 153.83C137.96 153.601 137.982 153.327 137.982 153.01ZM143.565 153.408V154.002H139.456V153.576L142.003 149.635H142.592L141.96 150.775L140.276 153.408H143.565ZM142.772 149.635V155.322H142.049V149.635H142.772ZM147.312 149.635V155.322H146.558V149.635H147.312ZM149.695 152.193V152.81H147.148V152.193H149.695ZM150.082 149.635V150.252H147.148V149.635H150.082ZM152.622 155.4C152.327 155.4 152.06 155.351 151.821 155.252C151.584 155.15 151.379 155.008 151.207 154.826C151.038 154.644 150.908 154.427 150.817 154.177C150.726 153.927 150.68 153.654 150.68 153.357V153.193C150.68 152.849 150.731 152.543 150.832 152.275C150.934 152.004 151.072 151.775 151.247 151.588C151.421 151.4 151.619 151.258 151.84 151.162C152.062 151.066 152.291 151.017 152.528 151.017C152.83 151.017 153.09 151.069 153.309 151.174C153.53 151.278 153.711 151.424 153.852 151.611C153.993 151.796 154.097 152.015 154.165 152.267C154.232 152.517 154.266 152.791 154.266 153.088V153.412H151.11V152.822H153.543V152.767C153.533 152.58 153.494 152.398 153.426 152.22C153.361 152.043 153.257 151.898 153.114 151.783C152.971 151.668 152.775 151.611 152.528 151.611C152.364 151.611 152.213 151.646 152.075 151.717C151.937 151.784 151.818 151.886 151.719 152.021C151.62 152.157 151.543 152.322 151.489 152.517C151.434 152.713 151.407 152.938 151.407 153.193V153.357C151.407 153.558 151.434 153.747 151.489 153.924C151.546 154.098 151.628 154.252 151.735 154.385C151.844 154.517 151.976 154.622 152.129 154.697C152.286 154.773 152.463 154.81 152.661 154.81C152.916 154.81 153.132 154.758 153.309 154.654C153.486 154.55 153.641 154.411 153.774 154.236L154.211 154.584C154.12 154.722 154.004 154.853 153.864 154.978C153.723 155.103 153.55 155.205 153.344 155.283C153.141 155.361 152.9 155.4 152.622 155.4ZM155.189 149.322H155.915V154.502L155.853 155.322H155.189V149.322ZM158.771 153.174V153.256C158.771 153.563 158.734 153.848 158.661 154.111C158.588 154.372 158.482 154.598 158.341 154.791C158.2 154.983 158.028 155.133 157.825 155.24C157.622 155.347 157.389 155.4 157.126 155.4C156.858 155.4 156.622 155.355 156.419 155.263C156.218 155.17 156.049 155.036 155.911 154.861C155.773 154.687 155.663 154.476 155.579 154.228C155.498 153.981 155.442 153.702 155.411 153.392V153.033C155.442 152.72 155.498 152.441 155.579 152.193C155.663 151.946 155.773 151.735 155.911 151.56C156.049 151.383 156.218 151.249 156.419 151.158C156.62 151.064 156.853 151.017 157.118 151.017C157.384 151.017 157.62 151.069 157.825 151.174C158.031 151.275 158.203 151.421 158.341 151.611C158.482 151.801 158.588 152.029 158.661 152.295C158.734 152.558 158.771 152.851 158.771 153.174ZM158.044 153.256V153.174C158.044 152.963 158.024 152.765 157.985 152.58C157.946 152.392 157.884 152.228 157.798 152.088C157.712 151.944 157.599 151.832 157.458 151.752C157.317 151.668 157.144 151.627 156.939 151.627C156.756 151.627 156.597 151.658 156.462 151.72C156.329 151.783 156.216 151.868 156.122 151.974C156.028 152.079 155.952 152.198 155.892 152.334C155.834 152.467 155.791 152.605 155.763 152.748V153.689C155.804 153.872 155.872 154.047 155.966 154.217C156.062 154.383 156.19 154.52 156.349 154.627C156.51 154.733 156.709 154.787 156.946 154.787C157.142 154.787 157.308 154.748 157.446 154.67C157.587 154.589 157.7 154.478 157.786 154.338C157.875 154.197 157.94 154.034 157.982 153.849C158.023 153.664 158.044 153.467 158.044 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip4_4184_94527)">
<line x1="182.05" y1="147.072" x2="182.05" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M174.109 152.025V152.892C174.109 153.358 174.067 153.752 173.984 154.072C173.901 154.392 173.781 154.65 173.625 154.845C173.469 155.041 173.28 155.183 173.058 155.271C172.84 155.357 172.592 155.4 172.316 155.4C172.097 155.4 171.896 155.373 171.711 155.318C171.526 155.263 171.359 155.176 171.211 155.056C171.065 154.934 170.94 154.775 170.836 154.58C170.732 154.385 170.652 154.148 170.597 153.869C170.543 153.59 170.515 153.265 170.515 152.892V152.025C170.515 151.559 170.557 151.168 170.64 150.853C170.726 150.538 170.847 150.286 171.004 150.095C171.16 149.903 171.347 149.765 171.566 149.681C171.788 149.598 172.035 149.556 172.308 149.556C172.53 149.556 172.733 149.584 172.918 149.638C173.105 149.691 173.272 149.775 173.418 149.892C173.564 150.007 173.687 150.161 173.789 150.353C173.893 150.543 173.972 150.776 174.027 151.052C174.082 151.329 174.109 151.653 174.109 152.025ZM173.383 153.01V151.904C173.383 151.649 173.367 151.425 173.336 151.232C173.307 151.037 173.264 150.87 173.207 150.732C173.15 150.594 173.077 150.482 172.988 150.396C172.902 150.31 172.802 150.248 172.687 150.209C172.575 150.167 172.449 150.146 172.308 150.146C172.136 150.146 171.984 150.179 171.851 150.244C171.719 150.306 171.607 150.407 171.515 150.545C171.427 150.683 171.359 150.864 171.312 151.088C171.265 151.312 171.242 151.584 171.242 151.904V153.01C171.242 153.265 171.256 153.49 171.285 153.685C171.316 153.881 171.362 154.05 171.422 154.193C171.482 154.334 171.554 154.45 171.64 154.541C171.726 154.632 171.825 154.7 171.937 154.744C172.052 154.786 172.178 154.806 172.316 154.806C172.493 154.806 172.648 154.773 172.781 154.705C172.914 154.637 173.025 154.532 173.113 154.388C173.204 154.243 173.272 154.056 173.316 153.83C173.36 153.601 173.383 153.327 173.383 153.01ZM176.036 152.615L175.457 152.467L175.743 149.635H178.661V150.302H176.356L176.184 151.849C176.288 151.789 176.42 151.733 176.579 151.681C176.74 151.629 176.925 151.603 177.133 151.603C177.396 151.603 177.632 151.649 177.84 151.74C178.049 151.829 178.226 151.956 178.371 152.123C178.52 152.289 178.633 152.49 178.711 152.724C178.789 152.959 178.829 153.22 178.829 153.51C178.829 153.783 178.791 154.034 178.715 154.263C178.642 154.493 178.532 154.693 178.383 154.865C178.235 155.034 178.047 155.166 177.821 155.26C177.597 155.353 177.332 155.4 177.028 155.4C176.799 155.4 176.581 155.369 176.375 155.306C176.172 155.241 175.99 155.144 175.829 155.013C175.67 154.881 175.539 154.717 175.438 154.521C175.339 154.323 175.276 154.092 175.25 153.826H175.938C175.969 154.039 176.032 154.219 176.125 154.365C176.219 154.511 176.342 154.622 176.493 154.697C176.646 154.77 176.825 154.806 177.028 154.806C177.2 154.806 177.352 154.776 177.485 154.717C177.618 154.657 177.73 154.571 177.821 154.459C177.912 154.347 177.981 154.211 178.028 154.052C178.077 153.894 178.102 153.715 178.102 153.517C178.102 153.338 178.077 153.171 178.028 153.017C177.978 152.864 177.904 152.73 177.805 152.615C177.709 152.5 177.59 152.412 177.45 152.349C177.309 152.284 177.148 152.252 176.965 152.252C176.723 152.252 176.539 152.284 176.414 152.349C176.292 152.414 176.166 152.503 176.036 152.615ZM182.713 149.635V155.322H181.959V149.635H182.713ZM185.095 152.193V152.81H182.548V152.193H185.095ZM185.482 149.635V150.252H182.548V149.635H185.482ZM188.022 155.4C187.727 155.4 187.46 155.351 187.221 155.252C186.984 155.15 186.78 155.008 186.608 154.826C186.438 154.644 186.308 154.427 186.217 154.177C186.126 153.927 186.08 153.654 186.08 153.357V153.193C186.08 152.849 186.131 152.543 186.233 152.275C186.334 152.004 186.472 151.775 186.647 151.588C186.821 151.4 187.019 151.258 187.24 151.162C187.462 151.066 187.691 151.017 187.928 151.017C188.23 151.017 188.49 151.069 188.709 151.174C188.931 151.278 189.112 151.424 189.252 151.611C189.393 151.796 189.497 152.015 189.565 152.267C189.632 152.517 189.666 152.791 189.666 153.088V153.412H186.51V152.822H188.944V152.767C188.933 152.58 188.894 152.398 188.826 152.22C188.761 152.043 188.657 151.898 188.514 151.783C188.371 151.668 188.175 151.611 187.928 151.611C187.764 151.611 187.613 151.646 187.475 151.717C187.337 151.784 187.218 151.886 187.119 152.021C187.02 152.157 186.944 152.322 186.889 152.517C186.834 152.713 186.807 152.938 186.807 153.193V153.357C186.807 153.558 186.834 153.747 186.889 153.924C186.946 154.098 187.028 154.252 187.135 154.385C187.244 154.517 187.376 154.622 187.53 154.697C187.686 154.773 187.863 154.81 188.061 154.81C188.316 154.81 188.532 154.758 188.709 154.654C188.886 154.55 189.041 154.411 189.174 154.236L189.612 154.584C189.52 154.722 189.405 154.853 189.264 154.978C189.123 155.103 188.95 155.205 188.744 155.283C188.541 155.361 188.3 155.4 188.022 155.4ZM190.589 149.322H191.315V154.502L191.253 155.322H190.589V149.322ZM194.171 153.174V153.256C194.171 153.563 194.134 153.848 194.061 154.111C193.988 154.372 193.882 154.598 193.741 154.791C193.6 154.983 193.429 155.133 193.225 155.24C193.022 155.347 192.789 155.4 192.526 155.4C192.258 155.4 192.022 155.355 191.819 155.263C191.619 155.17 191.449 155.036 191.311 154.861C191.173 154.687 191.063 154.476 190.979 154.228C190.899 153.981 190.843 153.702 190.811 153.392V153.033C190.843 152.72 190.899 152.441 190.979 152.193C191.063 151.946 191.173 151.735 191.311 151.56C191.449 151.383 191.619 151.249 191.819 151.158C192.02 151.064 192.253 151.017 192.518 151.017C192.784 151.017 193.02 151.069 193.225 151.174C193.431 151.275 193.603 151.421 193.741 151.611C193.882 151.801 193.988 152.029 194.061 152.295C194.134 152.558 194.171 152.851 194.171 153.174ZM193.444 153.256V153.174C193.444 152.963 193.425 152.765 193.386 152.58C193.347 152.392 193.284 152.228 193.198 152.088C193.112 151.944 192.999 151.832 192.858 151.752C192.718 151.668 192.544 151.627 192.339 151.627C192.156 151.627 191.998 151.658 191.862 151.72C191.729 151.783 191.616 151.868 191.522 151.974C191.429 152.079 191.352 152.198 191.292 152.334C191.235 152.467 191.192 152.605 191.163 152.748V153.689C191.205 153.872 191.272 154.047 191.366 154.217C191.462 154.383 191.59 154.52 191.749 154.627C191.91 154.733 192.11 154.787 192.347 154.787C192.542 154.787 192.708 154.748 192.847 154.67C192.987 154.589 193.1 154.478 193.186 154.338C193.275 154.197 193.34 154.034 193.382 153.849C193.423 153.664 193.444 153.467 193.444 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<path d="M27 107.445L40 88.0962L75.9407 44.9895C76.2611 44.6052 76.8161 44.5168 77.24 44.7826L110.556 65.6716C110.834 65.846 111.18 65.8728 111.482 65.7433L147 50.499L184.032 39.8183C184.327 39.7331 184.567 39.5168 184.682 39.2318L198.5 5" stroke="#FFC107" stroke-width="2" stroke-linecap="round"/>
<path d="M28 129.161L40 112.14L76 79.1614L111 89.2678L147 79.1614L178 120.651L199 89.2678" stroke="#4CAF50" stroke-width="2" stroke-linecap="round"/>
<path d="M27 118L40 71.7792L76 64.5635L110.5 17.6611L146.5 42.9162L182 71.7792L198.5 108" stroke="#2196F3" stroke-width="2" stroke-linecap="round"/>
</g>
<defs>
<clipPath id="clip0_4184_94527">
<rect width="200" height="160" fill="white"/>
</clipPath>
<clipPath id="clip1_4184_94527">
<rect width="35.4" height="10.322" fill="white" transform="translate(58.3999 146)"/>
</clipPath>
<clipPath id="clip2_4184_94527">
<rect width="35.4" height="10.322" fill="white" transform="translate(93.8 146)"/>
</clipPath>
<clipPath id="clip3_4184_94527">
<rect width="35.4" height="10.322" fill="white" transform="translate(129.2 146)"/>
</clipPath>
<clipPath id="clip4_4184_94527">
<rect width="35.4" height="10.322" fill="white" transform="translate(164.6 146)"/>
</clipPath>
</defs>
</svg>
",
+ "description": "Displays changes to time-series data over time—for example, temperature or humidity readings.",
+ "descriptor": {
+ "type": "timeseries",
+ "sizeX": 8,
+ "sizeY": 5,
+ "resources": [],
+ "templateHtml": "\n",
+ "templateCss": "",
+ "controllerScript": "self.onInit = function() {\n self.ctx.$scope.timeSeriesChartWidget.onInit();\n};\n\nself.onDataUpdated = function() {\n self.ctx.$scope.timeSeriesChartWidget.onDataUpdated();\n}\n\nself.onLatestDataUpdated = function() {\n self.ctx.$scope.timeSeriesChartWidget.onLatestDataUpdated();\n}\n\nself.typeParameters = function() {\n return {\n chartType: 'line',\n previewWidth: '80%',\n embedTitlePanel: true,\n hasAdditionalLatestDataKeys: true,\n dataKeySettingsFunction: TbTimeSeriesChart.dataKeySettings('line'),\n defaultDataKeysFunction: function() {\n return [{ name: 'temperature', label: 'Temperature', type: 'timeseries', units: '°C', decimals: 0 }];\n }\n };\n}\n",
+ "settingsSchema": "{}",
+ "dataKeySettingsSchema": "{}",
+ "latestDataKeySettingsSchema": "{}",
+ "settingsDirective": "tb-time-series-chart-widget-settings",
+ "dataKeySettingsDirective": "tb-time-series-chart-key-settings",
+ "latestDataKeySettingsDirective": "",
+ "hasBasicMode": true,
+ "basicModeDirective": "tb-time-series-chart-basic-config",
+ "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"showInLegend\":true,\"dataHiddenByDefault\":false,\"type\":\"line\",\"lineSettings\":{\"showLine\":true,\"step\":false,\"stepType\":\"start\",\"smooth\":false,\"lineType\":\"solid\",\"lineWidth\":2,\"showPoints\":false,\"showPointLabel\":false,\"pointLabelPosition\":\"top\",\"pointLabelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"pointLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"pointShape\":\"emptyCircle\",\"pointSize\":4,\"fillAreaSettings\":{\"type\":\"opacity\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}},\"barSettings\":{\"showBorder\":false,\"borderWidth\":2,\"borderRadius\":0,\"showLabel\":false,\"labelPosition\":\"top\",\"labelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.76)\",\"backgroundSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}}},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#FFC107\",\"settings\":{\"showInLegend\":true,\"dataHiddenByDefault\":false,\"type\":\"line\",\"lineSettings\":{\"showLine\":true,\"step\":false,\"stepType\":\"start\",\"smooth\":false,\"lineType\":\"solid\",\"lineWidth\":2,\"showPoints\":false,\"showPointLabel\":false,\"pointLabelPosition\":\"top\",\"pointLabelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"pointLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"pointShape\":\"emptyCircle\",\"pointSize\":4,\"fillAreaSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}},\"barSettings\":{\"showBorder\":false,\"borderWidth\":2,\"borderRadius\":0,\"showLabel\":false,\"labelPosition\":\"top\",\"labelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.76)\",\"backgroundSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}}},\"_hash\":0.3409583261715494,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\",\"decimals\":null,\"aggregationType\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]},\"latestDataKeys\":null}],\"timewindow\":{\"hideInterval\":false,\"hideLastInterval\":false,\"hideQuickInterval\":false,\"hideAggregation\":false,\"hideAggInterval\":false,\"hideTimezone\":false,\"selectedTab\":0,\"realtime\":{\"realtimeType\":0,\"timewindowMs\":60000,\"quickInterval\":\"CURRENT_DAY\",\"interval\":1000},\"aggregation\":{\"type\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"showLegend\":true,\"legendConfig\":{\"direction\":\"column\",\"position\":\"top\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":true,\"showTotal\":false,\"showLatest\":false},\"thresholds\":[],\"dataZoom\":true,\"stack\":false,\"yAxis\":{\"show\":true,\"label\":\"\",\"labelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"600\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.54)\",\"position\":\"left\",\"showTickLabels\":true,\"tickLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"tickLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"showTicks\":true,\"ticksColor\":\"rgba(0, 0, 0, 0.54)\",\"showLine\":true,\"lineColor\":\"rgba(0, 0, 0, 0.54)\",\"showSplitLines\":true,\"splitLinesColor\":\"rgba(0, 0, 0, 0.12)\"},\"xAxis\":{\"show\":true,\"label\":\"\",\"labelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"600\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.54)\",\"position\":\"bottom\",\"showTickLabels\":true,\"tickLabelFont\":{\"family\":\"Roboto\",\"size\":10,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"tickLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"ticksFormat\":{},\"showTicks\":true,\"ticksColor\":\"rgba(0, 0, 0, 0.54)\",\"showLine\":true,\"lineColor\":\"rgba(0, 0, 0, 0.54)\",\"showSplitLines\":true,\"splitLinesColor\":\"rgba(0, 0, 0, 0.12)\"},\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipTrigger\":\"axis\",\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":null,\"lastUpdateAgo\":false,\"custom\":false,\"auto\":true,\"autoDateFormatSettings\":{}},\"tooltipDateFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"tooltipDateColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipDateInterval\":true,\"tooltipBackgroundColor\":\"rgba(255, 255, 255, 0.76)\",\"tooltipBackgroundBlur\":4,\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}},\"yAxes\":{\"default\":{\"units\":null,\"decimals\":0,\"show\":true,\"label\":\"\",\"labelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"600\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.54)\",\"position\":\"left\",\"showTickLabels\":true,\"tickLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"tickLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"ticksFormatter\":null,\"showTicks\":true,\"ticksColor\":\"rgba(0, 0, 0, 0.54)\",\"showLine\":true,\"lineColor\":\"rgba(0, 0, 0, 0.54)\",\"showSplitLines\":true,\"splitLinesColor\":\"rgba(0, 0, 0, 0.12)\",\"id\":\"default\",\"order\":0}},\"noAggregationBarWidthSettings\":{\"strategy\":\"group\",\"groupWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000},\"barWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000}},\"animation\":{\"animation\":true,\"animationThreshold\":2000,\"animationDuration\":500,\"animationEasing\":\"cubicOut\",\"animationDelay\":0,\"animationDurationUpdate\":300,\"animationEasingUpdate\":\"cubicOut\",\"animationDelayUpdate\":0},\"padding\":\"12px\"},\"title\":\"Line chart\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":null,\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"thermostat\",\"iconColor\":\"#1F6BDD\",\"useDashboardTimewindow\":false,\"displayTimewindow\":true,\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleColor\":\"rgba(0, 0, 0, 0.87)\",\"titleTooltip\":\"\",\"widgetStyle\":{},\"widgetCss\":\"\",\"pageSize\":1024,\"units\":\"\",\"decimals\":null,\"noDataDisplayMessage\":\"\",\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":null,\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true},\"margin\":\"0px\",\"borderRadius\":\"0px\",\"iconSize\":\"0px\"}"
+ },
+ "tags": [
+ "chart",
+ "time series",
+ "time-series",
+ "line",
+ "line chart"
+ ]
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/point_chart.json b/application/src/main/data/json/system/widget_types/point_chart.json
new file mode 100644
index 0000000000..beb99116c9
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/point_chart.json
@@ -0,0 +1,32 @@
+{
+ "fqn": "point_chart",
+ "name": "Point chart",
+ "deprecated": false,
+ "image": "tb-image:Y2hhcnRfKDMpLnN2Zw==:IlBvaW50IGNoYXJ0IiBzeXN0ZW0gd2lkZ2V0IGltYWdl;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_4182_11193)">
<path d="M2.84766 1.28125V7H2.125V2.18359L0.667969 2.71484V2.0625L2.73438 1.28125H2.84766ZM8.67517 3.70312V4.57031C8.67517 5.03646 8.63351 5.42969 8.55017 5.75C8.46684 6.07031 8.34705 6.32812 8.1908 6.52344C8.03455 6.71875 7.84575 6.86068 7.62439 6.94922C7.40564 7.03516 7.15825 7.07812 6.8822 7.07812C6.66345 7.07812 6.46163 7.05078 6.27673 6.99609C6.09184 6.94141 5.92517 6.85417 5.77673 6.73438C5.6309 6.61198 5.5059 6.45312 5.40173 6.25781C5.29757 6.0625 5.21814 5.82552 5.16345 5.54688C5.10877 5.26823 5.08142 4.94271 5.08142 4.57031V3.70312C5.08142 3.23698 5.12309 2.84635 5.20642 2.53125C5.29236 2.21615 5.41345 1.96354 5.5697 1.77344C5.72595 1.58073 5.91345 1.44271 6.1322 1.35938C6.35356 1.27604 6.60095 1.23438 6.87439 1.23438C7.09575 1.23438 7.29887 1.26172 7.48377 1.31641C7.67127 1.36849 7.83793 1.45312 7.98377 1.57031C8.1296 1.6849 8.2533 1.83854 8.35486 2.03125C8.45903 2.22135 8.53845 2.45443 8.59314 2.73047C8.64783 3.00651 8.67517 3.33073 8.67517 3.70312ZM7.94861 4.6875V3.58203C7.94861 3.32682 7.93298 3.10286 7.90173 2.91016C7.87309 2.71484 7.83012 2.54818 7.77283 2.41016C7.71554 2.27214 7.64262 2.16016 7.55408 2.07422C7.46814 1.98828 7.36788 1.92578 7.2533 1.88672C7.14132 1.84505 7.01502 1.82422 6.87439 1.82422C6.70252 1.82422 6.55017 1.85677 6.41736 1.92188C6.28455 1.98438 6.17257 2.08464 6.08142 2.22266C5.99288 2.36068 5.92517 2.54167 5.8783 2.76562C5.83142 2.98958 5.80798 3.26172 5.80798 3.58203V4.6875C5.80798 4.94271 5.82231 5.16797 5.85095 5.36328C5.8822 5.55859 5.92778 5.72786 5.98767 5.87109C6.04757 6.01172 6.12048 6.1276 6.20642 6.21875C6.29236 6.3099 6.39132 6.3776 6.5033 6.42188C6.61788 6.46354 6.74418 6.48438 6.8822 6.48438C7.05929 6.48438 7.21423 6.45052 7.34705 6.38281C7.47986 6.3151 7.59054 6.20964 7.67908 6.06641C7.77022 5.92057 7.83793 5.73438 7.8822 5.50781C7.92647 5.27865 7.94861 5.00521 7.94861 4.6875ZM13.3074 3.70312V4.57031C13.3074 5.03646 13.2657 5.42969 13.1824 5.75C13.099 6.07031 12.9793 6.32812 12.823 6.52344C12.6668 6.71875 12.4779 6.86068 12.2566 6.94922C12.0378 7.03516 11.7904 7.07812 11.5144 7.07812C11.2957 7.07812 11.0938 7.05078 10.9089 6.99609C10.724 6.94141 10.5574 6.85417 10.4089 6.73438C10.2631 6.61198 10.1381 6.45312 10.0339 6.25781C9.92977 6.0625 9.85034 5.82552 9.79566 5.54688C9.74097 5.26823 9.71363 4.94271 9.71363 4.57031V3.70312C9.71363 3.23698 9.75529 2.84635 9.83863 2.53125C9.92456 2.21615 10.0457 1.96354 10.2019 1.77344C10.3582 1.58073 10.5457 1.44271 10.7644 1.35938C10.9858 1.27604 11.2332 1.23438 11.5066 1.23438C11.7279 1.23438 11.9311 1.26172 12.116 1.31641C12.3035 1.36849 12.4701 1.45312 12.616 1.57031C12.7618 1.6849 12.8855 1.83854 12.9871 2.03125C13.0912 2.22135 13.1707 2.45443 13.2253 2.73047C13.28 3.00651 13.3074 3.33073 13.3074 3.70312ZM12.5808 4.6875V3.58203C12.5808 3.32682 12.5652 3.10286 12.5339 2.91016C12.5053 2.71484 12.4623 2.54818 12.405 2.41016C12.3477 2.27214 12.2748 2.16016 12.1863 2.07422C12.1003 1.98828 12.0001 1.92578 11.8855 1.88672C11.7735 1.84505 11.6472 1.82422 11.5066 1.82422C11.3347 1.82422 11.1824 1.85677 11.0496 1.92188C10.9168 1.98438 10.8048 2.08464 10.7136 2.22266C10.6251 2.36068 10.5574 2.54167 10.5105 2.76562C10.4636 2.98958 10.4402 3.26172 10.4402 3.58203V4.6875C10.4402 4.94271 10.4545 5.16797 10.4832 5.36328C10.5144 5.55859 10.56 5.72786 10.6199 5.87109C10.6798 6.01172 10.7527 6.1276 10.8386 6.21875C10.9246 6.3099 11.0235 6.3776 11.1355 6.42188C11.2501 6.46354 11.3764 6.48438 11.5144 6.48438C11.6915 6.48438 11.8464 6.45052 11.9793 6.38281C12.1121 6.3151 12.2227 6.20964 12.3113 6.06641C12.4024 5.92057 12.4701 5.73438 12.5144 5.50781C12.5587 5.27865 12.5808 5.00521 12.5808 4.6875ZM14.3068 2.70703V2.40625C14.3068 2.1901 14.3536 1.99349 14.4474 1.81641C14.5411 1.63932 14.6753 1.4974 14.8497 1.39062C15.0242 1.28385 15.2312 1.23047 15.4708 1.23047C15.7156 1.23047 15.924 1.28385 16.0958 1.39062C16.2703 1.4974 16.4044 1.63932 16.4982 1.81641C16.5919 1.99349 16.6388 2.1901 16.6388 2.40625V2.70703C16.6388 2.91797 16.5919 3.11198 16.4982 3.28906C16.407 3.46615 16.2742 3.60807 16.0997 3.71484C15.9279 3.82161 15.7208 3.875 15.4786 3.875C15.2365 3.875 15.0268 3.82161 14.8497 3.71484C14.6753 3.60807 14.5411 3.46615 14.4474 3.28906C14.3536 3.11198 14.3068 2.91797 14.3068 2.70703ZM14.8497 2.40625V2.70703C14.8497 2.82682 14.8719 2.9401 14.9161 3.04688C14.963 3.15365 15.0333 3.24089 15.1271 3.30859C15.2208 3.3737 15.338 3.40625 15.4786 3.40625C15.6193 3.40625 15.7352 3.3737 15.8263 3.30859C15.9174 3.24089 15.9852 3.15365 16.0294 3.04688C16.0737 2.9401 16.0958 2.82682 16.0958 2.70703V2.40625C16.0958 2.28385 16.0724 2.16927 16.0255 2.0625C15.9812 1.95312 15.9122 1.86589 15.8185 1.80078C15.7273 1.73307 15.6115 1.69922 15.4708 1.69922C15.3328 1.69922 15.2169 1.73307 15.1232 1.80078C15.032 1.86589 14.963 1.95312 14.9161 2.0625C14.8719 2.16927 14.8497 2.28385 14.8497 2.40625ZM17.0763 5.91016V5.60547C17.0763 5.39193 17.1232 5.19661 17.2169 5.01953C17.3107 4.84245 17.4448 4.70052 17.6193 4.59375C17.7937 4.48698 18.0008 4.43359 18.2404 4.43359C18.4852 4.43359 18.6935 4.48698 18.8654 4.59375C19.0398 4.70052 19.174 4.84245 19.2677 5.01953C19.3615 5.19661 19.4083 5.39193 19.4083 5.60547V5.91016C19.4083 6.1237 19.3615 6.31901 19.2677 6.49609C19.1766 6.67318 19.0437 6.8151 18.8693 6.92188C18.6974 7.02865 18.4904 7.08203 18.2482 7.08203C18.006 7.08203 17.7977 7.02865 17.6232 6.92188C17.4487 6.8151 17.3133 6.67318 17.2169 6.49609C17.1232 6.31901 17.0763 6.1237 17.0763 5.91016ZM17.6193 5.60547V5.91016C17.6193 6.02995 17.6414 6.14453 17.6857 6.25391C17.7325 6.36068 17.8029 6.44792 17.8966 6.51562C17.9904 6.58073 18.1075 6.61328 18.2482 6.61328C18.3888 6.61328 18.5047 6.58073 18.5958 6.51562C18.6896 6.44792 18.7586 6.36068 18.8029 6.25391C18.8471 6.14714 18.8693 6.03255 18.8693 5.91016V5.60547C18.8693 5.48307 18.8458 5.36849 18.799 5.26172C18.7547 5.15495 18.6857 5.06901 18.5919 5.00391C18.5008 4.9362 18.3836 4.90234 18.2404 4.90234C18.1023 4.90234 17.9865 4.9362 17.8927 5.00391C17.8016 5.06901 17.7325 5.15495 17.6857 5.26172C17.6414 5.36849 17.6193 5.48307 17.6193 5.60547ZM18.42 2.12109L15.6427 6.56641L15.2365 6.30859L18.0138 1.86328L18.42 2.12109Z" fill="black" fill-opacity="0.54"/>
<path d="M8.05859 33.6677C8.05859 34.0141 7.97786 34.3083 7.81641 34.5505C7.65755 34.7901 7.44141 34.9724 7.16797 35.0974C6.89714 35.2224 6.59115 35.2849 6.25 35.2849C5.90885 35.2849 5.60156 35.2224 5.32812 35.0974C5.05469 34.9724 4.83854 34.7901 4.67969 34.5505C4.52083 34.3083 4.44141 34.0141 4.44141 33.6677C4.44141 33.4412 4.48438 33.2341 4.57031 33.0466C4.65885 32.8565 4.78255 32.6912 4.94141 32.5505C5.10286 32.4099 5.29297 32.3018 5.51172 32.2263C5.73307 32.1482 5.97656 32.1091 6.24219 32.1091C6.59115 32.1091 6.90234 32.1768 7.17578 32.3123C7.44922 32.4451 7.66406 32.6287 7.82031 32.863C7.97917 33.0974 8.05859 33.3656 8.05859 33.6677ZM7.33203 33.6521C7.33203 33.4412 7.28646 33.255 7.19531 33.0935C7.10417 32.9294 6.97656 32.8018 6.8125 32.7107C6.64844 32.6195 6.45833 32.574 6.24219 32.574C6.02083 32.574 5.82943 32.6195 5.66797 32.7107C5.50911 32.8018 5.38542 32.9294 5.29688 33.0935C5.20833 33.255 5.16406 33.4412 5.16406 33.6521C5.16406 33.8708 5.20703 34.0583 5.29297 34.2146C5.38151 34.3682 5.50651 34.4867 5.66797 34.5701C5.83203 34.6508 6.02604 34.6912 6.25 34.6912C6.47396 34.6912 6.66667 34.6508 6.82812 34.5701C6.98958 34.4867 7.11328 34.3682 7.19922 34.2146C7.28776 34.0583 7.33203 33.8708 7.33203 33.6521ZM7.92578 30.9998C7.92578 31.2758 7.85286 31.5245 7.70703 31.7458C7.5612 31.9672 7.36198 32.1417 7.10938 32.2693C6.85677 32.3969 6.57031 32.4607 6.25 32.4607C5.92448 32.4607 5.63411 32.3969 5.37891 32.2693C5.1263 32.1417 4.92839 31.9672 4.78516 31.7458C4.64193 31.5245 4.57031 31.2758 4.57031 30.9998C4.57031 30.669 4.64193 30.3878 4.78516 30.156C4.93099 29.9242 5.13021 29.7472 5.38281 29.6248C5.63542 29.5024 5.92318 29.4412 6.24609 29.4412C6.57161 29.4412 6.86068 29.5024 7.11328 29.6248C7.36589 29.7472 7.5638 29.9242 7.70703 30.156C7.85286 30.3878 7.92578 30.669 7.92578 30.9998ZM7.20312 31.0115C7.20312 30.8214 7.16276 30.6534 7.08203 30.5076C7.0013 30.3617 6.88932 30.2472 6.74609 30.1638C6.60286 30.0779 6.4362 30.0349 6.24609 30.0349C6.05599 30.0349 5.88932 30.0753 5.74609 30.156C5.60547 30.2341 5.49479 30.3461 5.41406 30.4919C5.33594 30.6378 5.29688 30.811 5.29688 31.0115C5.29688 31.2068 5.33594 31.3774 5.41406 31.5232C5.49479 31.669 5.60677 31.7823 5.75 31.863C5.89323 31.9438 6.0599 31.9841 6.25 31.9841C6.4401 31.9841 6.60547 31.9438 6.74609 31.863C6.88932 31.7823 7.0013 31.669 7.08203 31.5232C7.16276 31.3774 7.20312 31.2068 7.20312 31.0115ZM12.6752 31.9099V32.7771C12.6752 33.2432 12.6335 33.6365 12.5502 33.9568C12.4668 34.2771 12.347 34.5349 12.1908 34.7302C12.0345 34.9255 11.8457 35.0675 11.6244 35.156C11.4056 35.2419 11.1582 35.2849 10.8822 35.2849C10.6635 35.2849 10.4616 35.2576 10.2767 35.2029C10.0918 35.1482 9.92517 35.061 9.77673 34.9412C9.6309 34.8188 9.5059 34.6599 9.40173 34.4646C9.29757 34.2693 9.21814 34.0323 9.16345 33.7537C9.10877 33.475 9.08142 33.1495 9.08142 32.7771V31.9099C9.08142 31.4438 9.12309 31.0531 9.20642 30.738C9.29236 30.4229 9.41345 30.1703 9.5697 29.9802C9.72595 29.7875 9.91345 29.6495 10.1322 29.5662C10.3536 29.4828 10.601 29.4412 10.8744 29.4412C11.0957 29.4412 11.2989 29.4685 11.4838 29.5232C11.6713 29.5753 11.8379 29.6599 11.9838 29.7771C12.1296 29.8917 12.2533 30.0453 12.3549 30.238C12.459 30.4281 12.5385 30.6612 12.5931 30.9373C12.6478 31.2133 12.6752 31.5375 12.6752 31.9099ZM11.9486 32.8943V31.7888C11.9486 31.5336 11.933 31.3097 11.9017 31.1169C11.8731 30.9216 11.8301 30.755 11.7728 30.6169C11.7155 30.4789 11.6426 30.3669 11.5541 30.281C11.4681 30.1951 11.3679 30.1326 11.2533 30.0935C11.1413 30.0518 11.015 30.031 10.8744 30.031C10.7025 30.031 10.5502 30.0636 10.4174 30.1287C10.2845 30.1912 10.1726 30.2914 10.0814 30.4294C9.99288 30.5675 9.92517 30.7485 9.8783 30.9724C9.83142 31.1964 9.80798 31.4685 9.80798 31.7888V32.8943C9.80798 33.1495 9.82231 33.3748 9.85095 33.5701C9.8822 33.7654 9.92778 33.9347 9.98767 34.0779C10.0476 34.2185 10.1205 34.3344 10.2064 34.4255C10.2924 34.5167 10.3913 34.5844 10.5033 34.6287C10.6179 34.6703 10.7442 34.6912 10.8822 34.6912C11.0593 34.6912 11.2142 34.6573 11.347 34.5896C11.4799 34.5219 11.5905 34.4164 11.6791 34.2732C11.7702 34.1274 11.8379 33.9412 11.8822 33.7146C11.9265 33.4854 11.9486 33.212 11.9486 32.8943ZM13.6746 30.9138V30.613C13.6746 30.3969 13.7214 30.2003 13.8152 30.0232C13.9089 29.8461 14.0431 29.7042 14.2175 29.5974C14.392 29.4906 14.599 29.4373 14.8386 29.4373C15.0834 29.4373 15.2918 29.4906 15.4636 29.5974C15.6381 29.7042 15.7722 29.8461 15.866 30.0232C15.9597 30.2003 16.0066 30.3969 16.0066 30.613V30.9138C16.0066 31.1248 15.9597 31.3188 15.866 31.4958C15.7748 31.6729 15.642 31.8149 15.4675 31.9216C15.2957 32.0284 15.0886 32.0818 14.8464 32.0818C14.6043 32.0818 14.3946 32.0284 14.2175 31.9216C14.0431 31.8149 13.9089 31.6729 13.8152 31.4958C13.7214 31.3188 13.6746 31.1248 13.6746 30.9138ZM14.2175 30.613V30.9138C14.2175 31.0336 14.2397 31.1469 14.2839 31.2537C14.3308 31.3604 14.4011 31.4477 14.4949 31.5154C14.5886 31.5805 14.7058 31.613 14.8464 31.613C14.9871 31.613 15.1029 31.5805 15.1941 31.5154C15.2852 31.4477 15.3529 31.3604 15.3972 31.2537C15.4415 31.1469 15.4636 31.0336 15.4636 30.9138V30.613C15.4636 30.4906 15.4402 30.3761 15.3933 30.2693C15.349 30.1599 15.28 30.0727 15.1863 30.0076C15.0951 29.9399 14.9793 29.906 14.8386 29.906C14.7006 29.906 14.5847 29.9399 14.491 30.0076C14.3998 30.0727 14.3308 30.1599 14.2839 30.2693C14.2397 30.3761 14.2175 30.4906 14.2175 30.613ZM16.4441 34.1169V33.8123C16.4441 33.5987 16.491 33.4034 16.5847 33.2263C16.6785 33.0492 16.8126 32.9073 16.9871 32.8005C17.1615 32.6938 17.3686 32.6404 17.6082 32.6404C17.8529 32.6404 18.0613 32.6938 18.2332 32.8005C18.4076 32.9073 18.5418 33.0492 18.6355 33.2263C18.7293 33.4034 18.7761 33.5987 18.7761 33.8123V34.1169C18.7761 34.3305 18.7293 34.5258 18.6355 34.7029C18.5444 34.88 18.4115 35.0219 18.2371 35.1287C18.0652 35.2354 17.8582 35.2888 17.616 35.2888C17.3738 35.2888 17.1654 35.2354 16.991 35.1287C16.8165 35.0219 16.6811 34.88 16.5847 34.7029C16.491 34.5258 16.4441 34.3305 16.4441 34.1169ZM16.9871 33.8123V34.1169C16.9871 34.2367 17.0092 34.3513 17.0535 34.4607C17.1003 34.5675 17.1707 34.6547 17.2644 34.7224C17.3582 34.7875 17.4753 34.8201 17.616 34.8201C17.7566 34.8201 17.8725 34.7875 17.9636 34.7224C18.0574 34.6547 18.1264 34.5675 18.1707 34.4607C18.2149 34.3539 18.2371 34.2393 18.2371 34.1169V33.8123C18.2371 33.6899 18.2136 33.5753 18.1668 33.4685C18.1225 33.3617 18.0535 33.2758 17.9597 33.2107C17.8686 33.143 17.7514 33.1091 17.6082 33.1091C17.4701 33.1091 17.3543 33.143 17.2605 33.2107C17.1694 33.2758 17.1003 33.3617 17.0535 33.4685C17.0092 33.5753 16.9871 33.6899 16.9871 33.8123ZM17.7878 30.3279L15.0105 34.7732L14.6043 34.5154L17.3816 30.0701L17.7878 30.3279Z" fill="black" fill-opacity="0.54"/>
<path d="M7.24609 57.7183H7.30859V58.3315H7.24609C6.86328 58.3315 6.54297 58.394 6.28516 58.519C6.02734 58.6414 5.82292 58.8068 5.67188 59.0151C5.52083 59.2209 5.41146 59.4526 5.34375 59.7104C5.27865 59.9683 5.24609 60.23 5.24609 60.4956V61.3315C5.24609 61.5841 5.27604 61.8081 5.33594 62.0034C5.39583 62.1961 5.47786 62.3589 5.58203 62.4917C5.6862 62.6245 5.80339 62.7248 5.93359 62.7925C6.06641 62.8602 6.20443 62.894 6.34766 62.894C6.51432 62.894 6.66276 62.8628 6.79297 62.8003C6.92318 62.7352 7.03255 62.6453 7.12109 62.5308C7.21224 62.4136 7.28125 62.2756 7.32812 62.1167C7.375 61.9578 7.39844 61.7834 7.39844 61.5933C7.39844 61.424 7.3776 61.2612 7.33594 61.105C7.29427 60.9461 7.23047 60.8055 7.14453 60.6831C7.05859 60.5581 6.95052 60.4604 6.82031 60.3901C6.69271 60.3172 6.54036 60.2808 6.36328 60.2808C6.16276 60.2808 5.97526 60.3302 5.80078 60.4292C5.62891 60.5256 5.48698 60.6532 5.375 60.812C5.26562 60.9683 5.20312 61.1388 5.1875 61.3237L4.80469 61.3198C4.84115 61.0282 4.90885 60.7795 5.00781 60.5737C5.10938 60.3654 5.23438 60.1961 5.38281 60.0659C5.53385 59.9331 5.70182 59.8368 5.88672 59.7769C6.07422 59.7144 6.27214 59.6831 6.48047 59.6831C6.76432 59.6831 7.00911 59.7365 7.21484 59.8433C7.42057 59.95 7.58984 60.0933 7.72266 60.2729C7.85547 60.45 7.95312 60.6506 8.01562 60.8745C8.08073 61.0959 8.11328 61.3237 8.11328 61.5581C8.11328 61.8263 8.07552 62.0776 8 62.312C7.92448 62.5464 7.8112 62.7521 7.66016 62.9292C7.51172 63.1063 7.32812 63.2443 7.10938 63.3433C6.89062 63.4422 6.63672 63.4917 6.34766 63.4917C6.04036 63.4917 5.77214 63.4292 5.54297 63.3042C5.3138 63.1766 5.1237 63.0073 4.97266 62.7964C4.82161 62.5854 4.70833 62.3511 4.63281 62.0933C4.55729 61.8354 4.51953 61.5737 4.51953 61.3081V60.9683C4.51953 60.5672 4.5599 60.174 4.64062 59.7886C4.72135 59.4032 4.86068 59.0542 5.05859 58.7417C5.25911 58.4292 5.53646 58.1805 5.89062 57.9956C6.24479 57.8107 6.69661 57.7183 7.24609 57.7183ZM12.6752 60.1167V60.9839C12.6752 61.45 12.6335 61.8433 12.5502 62.1636C12.4668 62.4839 12.347 62.7417 12.1908 62.937C12.0345 63.1323 11.8457 63.2743 11.6244 63.3628C11.4056 63.4487 11.1582 63.4917 10.8822 63.4917C10.6635 63.4917 10.4616 63.4644 10.2767 63.4097C10.0918 63.355 9.92517 63.2677 9.77673 63.1479C9.6309 63.0256 9.5059 62.8667 9.40173 62.6714C9.29757 62.4761 9.21814 62.2391 9.16345 61.9604C9.10877 61.6818 9.08142 61.3563 9.08142 60.9839V60.1167C9.08142 59.6506 9.12309 59.2599 9.20642 58.9448C9.29236 58.6297 9.41345 58.3771 9.5697 58.187C9.72595 57.9943 9.91345 57.8563 10.1322 57.7729C10.3536 57.6896 10.601 57.6479 10.8744 57.6479C11.0957 57.6479 11.2989 57.6753 11.4838 57.73C11.6713 57.7821 11.8379 57.8667 11.9838 57.9839C12.1296 58.0985 12.2533 58.2521 12.3549 58.4448C12.459 58.6349 12.5385 58.868 12.5931 59.144C12.6478 59.4201 12.6752 59.7443 12.6752 60.1167ZM11.9486 61.1011V59.9956C11.9486 59.7404 11.933 59.5164 11.9017 59.3237C11.8731 59.1284 11.8301 58.9618 11.7728 58.8237C11.7155 58.6857 11.6426 58.5737 11.5541 58.4878C11.4681 58.4019 11.3679 58.3394 11.2533 58.3003C11.1413 58.2586 11.015 58.2378 10.8744 58.2378C10.7025 58.2378 10.5502 58.2703 10.4174 58.3354C10.2845 58.3979 10.1726 58.4982 10.0814 58.6362C9.99288 58.7743 9.92517 58.9552 9.8783 59.1792C9.83142 59.4032 9.80798 59.6753 9.80798 59.9956V61.1011C9.80798 61.3563 9.82231 61.5815 9.85095 61.7769C9.8822 61.9722 9.92778 62.1414 9.98767 62.2847C10.0476 62.4253 10.1205 62.5412 10.2064 62.6323C10.2924 62.7235 10.3913 62.7912 10.5033 62.8354C10.6179 62.8771 10.7442 62.8979 10.8822 62.8979C11.0593 62.8979 11.2142 62.8641 11.347 62.7964C11.4799 62.7287 11.5905 62.6232 11.6791 62.48C11.7702 62.3341 11.8379 62.1479 11.8822 61.9214C11.9265 61.6922 11.9486 61.4188 11.9486 61.1011ZM13.6746 59.1206V58.8198C13.6746 58.6037 13.7214 58.4071 13.8152 58.23C13.9089 58.0529 14.0431 57.911 14.2175 57.8042C14.392 57.6974 14.599 57.644 14.8386 57.644C15.0834 57.644 15.2918 57.6974 15.4636 57.8042C15.6381 57.911 15.7722 58.0529 15.866 58.23C15.9597 58.4071 16.0066 58.6037 16.0066 58.8198V59.1206C16.0066 59.3315 15.9597 59.5256 15.866 59.7026C15.7748 59.8797 15.642 60.0216 15.4675 60.1284C15.2957 60.2352 15.0886 60.2886 14.8464 60.2886C14.6043 60.2886 14.3946 60.2352 14.2175 60.1284C14.0431 60.0216 13.9089 59.8797 13.8152 59.7026C13.7214 59.5256 13.6746 59.3315 13.6746 59.1206ZM14.2175 58.8198V59.1206C14.2175 59.2404 14.2397 59.3537 14.2839 59.4604C14.3308 59.5672 14.4011 59.6545 14.4949 59.7222C14.5886 59.7873 14.7058 59.8198 14.8464 59.8198C14.9871 59.8198 15.1029 59.7873 15.1941 59.7222C15.2852 59.6545 15.3529 59.5672 15.3972 59.4604C15.4415 59.3537 15.4636 59.2404 15.4636 59.1206V58.8198C15.4636 58.6974 15.4402 58.5828 15.3933 58.4761C15.349 58.3667 15.28 58.2795 15.1863 58.2144C15.0951 58.1466 14.9793 58.1128 14.8386 58.1128C14.7006 58.1128 14.5847 58.1466 14.491 58.2144C14.3998 58.2795 14.3308 58.3667 14.2839 58.4761C14.2397 58.5828 14.2175 58.6974 14.2175 58.8198ZM16.4441 62.3237V62.019C16.4441 61.8055 16.491 61.6102 16.5847 61.4331C16.6785 61.256 16.8126 61.1141 16.9871 61.0073C17.1615 60.9006 17.3686 60.8472 17.6082 60.8472C17.8529 60.8472 18.0613 60.9006 18.2332 61.0073C18.4076 61.1141 18.5418 61.256 18.6355 61.4331C18.7293 61.6102 18.7761 61.8055 18.7761 62.019V62.3237C18.7761 62.5373 18.7293 62.7326 18.6355 62.9097C18.5444 63.0868 18.4115 63.2287 18.2371 63.3354C18.0652 63.4422 17.8582 63.4956 17.616 63.4956C17.3738 63.4956 17.1654 63.4422 16.991 63.3354C16.8165 63.2287 16.6811 63.0868 16.5847 62.9097C16.491 62.7326 16.4441 62.5373 16.4441 62.3237ZM16.9871 62.019V62.3237C16.9871 62.4435 17.0092 62.5581 17.0535 62.6675C17.1003 62.7743 17.1707 62.8615 17.2644 62.9292C17.3582 62.9943 17.4753 63.0269 17.616 63.0269C17.7566 63.0269 17.8725 62.9943 17.9636 62.9292C18.0574 62.8615 18.1264 62.7743 18.1707 62.6675C18.2149 62.5607 18.2371 62.4461 18.2371 62.3237V62.019C18.2371 61.8966 18.2136 61.7821 18.1668 61.6753C18.1225 61.5685 18.0535 61.4826 17.9597 61.4175C17.8686 61.3498 17.7514 61.3159 17.6082 61.3159C17.4701 61.3159 17.3543 61.3498 17.2605 61.4175C17.1694 61.4826 17.1003 61.5685 17.0535 61.6753C17.0092 61.7821 16.9871 61.8966 16.9871 62.019ZM17.7878 58.5347L15.0105 62.98L14.6043 62.7222L17.3816 58.2769L17.7878 58.5347Z" fill="black" fill-opacity="0.54"/>
<path d="M8.31641 89.7063V90.3H4.20703V89.8743L6.75391 85.9329H7.34375L6.71094 87.0735L5.02734 89.7063H8.31641ZM7.52344 85.9329V91.6204H6.80078V85.9329H7.52344ZM12.6752 88.3235V89.1907C12.6752 89.6568 12.6335 90.05 12.5502 90.3704C12.4668 90.6907 12.347 90.9485 12.1908 91.1438C12.0345 91.3391 11.8457 91.481 11.6244 91.5696C11.4056 91.6555 11.1582 91.6985 10.8822 91.6985C10.6635 91.6985 10.4616 91.6711 10.2767 91.6165C10.0918 91.5618 9.92517 91.4745 9.77673 91.3547C9.6309 91.2323 9.5059 91.0735 9.40173 90.8782C9.29757 90.6829 9.21814 90.4459 9.16345 90.1672C9.10877 89.8886 9.08142 89.5631 9.08142 89.1907V88.3235C9.08142 87.8573 9.12309 87.4667 9.20642 87.1516C9.29236 86.8365 9.41345 86.5839 9.5697 86.3938C9.72595 86.2011 9.91345 86.0631 10.1322 85.9797C10.3536 85.8964 10.601 85.8547 10.8744 85.8547C11.0957 85.8547 11.2989 85.8821 11.4838 85.9368C11.6713 85.9889 11.8379 86.0735 11.9838 86.1907C12.1296 86.3053 12.2533 86.4589 12.3549 86.6516C12.459 86.8417 12.5385 87.0748 12.5931 87.3508C12.6478 87.6269 12.6752 87.9511 12.6752 88.3235ZM11.9486 89.3079V88.2024C11.9486 87.9472 11.933 87.7232 11.9017 87.5305C11.8731 87.3352 11.8301 87.1685 11.7728 87.0305C11.7155 86.8925 11.6426 86.7805 11.5541 86.6946C11.4681 86.6086 11.3679 86.5461 11.2533 86.5071C11.1413 86.4654 11.015 86.4446 10.8744 86.4446C10.7025 86.4446 10.5502 86.4771 10.4174 86.5422C10.2845 86.6047 10.1726 86.705 10.0814 86.843C9.99288 86.981 9.92517 87.162 9.8783 87.386C9.83142 87.6099 9.80798 87.8821 9.80798 88.2024V89.3079C9.80798 89.5631 9.82231 89.7883 9.85095 89.9836C9.8822 90.179 9.92778 90.3482 9.98767 90.4915C10.0476 90.6321 10.1205 90.748 10.2064 90.8391C10.2924 90.9303 10.3913 90.998 10.5033 91.0422C10.6179 91.0839 10.7442 91.1047 10.8822 91.1047C11.0593 91.1047 11.2142 91.0709 11.347 91.0032C11.4799 90.9355 11.5905 90.83 11.6791 90.6868C11.7702 90.5409 11.8379 90.3547 11.8822 90.1282C11.9265 89.899 11.9486 89.6256 11.9486 89.3079ZM13.6746 87.3274V87.0266C13.6746 86.8105 13.7214 86.6139 13.8152 86.4368C13.9089 86.2597 14.0431 86.1178 14.2175 86.011C14.392 85.9042 14.599 85.8508 14.8386 85.8508C15.0834 85.8508 15.2918 85.9042 15.4636 86.011C15.6381 86.1178 15.7722 86.2597 15.866 86.4368C15.9597 86.6139 16.0066 86.8105 16.0066 87.0266V87.3274C16.0066 87.5383 15.9597 87.7323 15.866 87.9094C15.7748 88.0865 15.642 88.2284 15.4675 88.3352C15.2957 88.442 15.0886 88.4954 14.8464 88.4954C14.6043 88.4954 14.3946 88.442 14.2175 88.3352C14.0431 88.2284 13.9089 88.0865 13.8152 87.9094C13.7214 87.7323 13.6746 87.5383 13.6746 87.3274ZM14.2175 87.0266V87.3274C14.2175 87.4472 14.2397 87.5605 14.2839 87.6672C14.3308 87.774 14.4011 87.8612 14.4949 87.929C14.5886 87.9941 14.7058 88.0266 14.8464 88.0266C14.9871 88.0266 15.1029 87.9941 15.1941 87.929C15.2852 87.8612 15.3529 87.774 15.3972 87.6672C15.4415 87.5605 15.4636 87.4472 15.4636 87.3274V87.0266C15.4636 86.9042 15.4402 86.7896 15.3933 86.6829C15.349 86.5735 15.28 86.4862 15.1863 86.4211C15.0951 86.3534 14.9793 86.3196 14.8386 86.3196C14.7006 86.3196 14.5847 86.3534 14.491 86.4211C14.3998 86.4862 14.3308 86.5735 14.2839 86.6829C14.2397 86.7896 14.2175 86.9042 14.2175 87.0266ZM16.4441 90.5305V90.2258C16.4441 90.0123 16.491 89.817 16.5847 89.6399C16.6785 89.4628 16.8126 89.3209 16.9871 89.2141C17.1615 89.1073 17.3686 89.054 17.6082 89.054C17.8529 89.054 18.0613 89.1073 18.2332 89.2141C18.4076 89.3209 18.5418 89.4628 18.6355 89.6399C18.7293 89.817 18.7761 90.0123 18.7761 90.2258V90.5305C18.7761 90.7441 18.7293 90.9394 18.6355 91.1165C18.5444 91.2935 18.4115 91.4355 18.2371 91.5422C18.0652 91.649 17.8582 91.7024 17.616 91.7024C17.3738 91.7024 17.1654 91.649 16.991 91.5422C16.8165 91.4355 16.6811 91.2935 16.5847 91.1165C16.491 90.9394 16.4441 90.7441 16.4441 90.5305ZM16.9871 90.2258V90.5305C16.9871 90.6503 17.0092 90.7649 17.0535 90.8743C17.1003 90.981 17.1707 91.0683 17.2644 91.136C17.3582 91.2011 17.4753 91.2336 17.616 91.2336C17.7566 91.2336 17.8725 91.2011 17.9636 91.136C18.0574 91.0683 18.1264 90.981 18.1707 90.8743C18.2149 90.7675 18.2371 90.6529 18.2371 90.5305V90.2258C18.2371 90.1034 18.2136 89.9889 18.1668 89.8821C18.1225 89.7753 18.0535 89.6894 17.9597 89.6243C17.8686 89.5566 17.7514 89.5227 17.6082 89.5227C17.4701 89.5227 17.3543 89.5566 17.2605 89.6243C17.1694 89.6894 17.1003 89.7753 17.0535 89.8821C17.0092 89.9889 16.9871 90.1034 16.9871 90.2258ZM17.7878 86.7415L15.0105 91.1868L14.6043 90.929L17.3816 86.4836L17.7878 86.7415Z" fill="black" fill-opacity="0.54"/>
<path d="M8.19922 119.233V119.827H4.47656V119.308L6.33984 117.233C6.56901 116.978 6.74609 116.762 6.87109 116.585C6.9987 116.405 7.08724 116.245 7.13672 116.104C7.1888 115.961 7.21484 115.815 7.21484 115.667C7.21484 115.479 7.17578 115.31 7.09766 115.159C7.02214 115.006 6.91016 114.883 6.76172 114.792C6.61328 114.701 6.43359 114.655 6.22266 114.655C5.97005 114.655 5.75911 114.705 5.58984 114.804C5.42318 114.9 5.29818 115.035 5.21484 115.21C5.13151 115.384 5.08984 115.585 5.08984 115.812H4.36719C4.36719 115.491 4.4375 115.198 4.57812 114.933C4.71875 114.667 4.92708 114.456 5.20312 114.3C5.47917 114.141 5.81901 114.062 6.22266 114.062C6.58203 114.062 6.88932 114.125 7.14453 114.253C7.39974 114.378 7.59505 114.555 7.73047 114.784C7.86849 115.011 7.9375 115.276 7.9375 115.581C7.9375 115.748 7.90885 115.917 7.85156 116.089C7.79688 116.258 7.72005 116.427 7.62109 116.597C7.52474 116.766 7.41146 116.933 7.28125 117.097C7.15365 117.261 7.01693 117.422 6.87109 117.581L5.34766 119.233H8.19922ZM12.6752 116.53V117.397C12.6752 117.864 12.6335 118.257 12.5502 118.577C12.4668 118.897 12.347 119.155 12.1908 119.351C12.0345 119.546 11.8457 119.688 11.6244 119.776C11.4056 119.862 11.1582 119.905 10.8822 119.905C10.6635 119.905 10.4616 119.878 10.2767 119.823C10.0918 119.769 9.92517 119.681 9.77673 119.562C9.6309 119.439 9.5059 119.28 9.40173 119.085C9.29757 118.89 9.21814 118.653 9.16345 118.374C9.10877 118.095 9.08142 117.77 9.08142 117.397V116.53C9.08142 116.064 9.12309 115.674 9.20642 115.358C9.29236 115.043 9.41345 114.791 9.5697 114.601C9.72595 114.408 9.91345 114.27 10.1322 114.187C10.3536 114.103 10.601 114.062 10.8744 114.062C11.0957 114.062 11.2989 114.089 11.4838 114.144C11.6713 114.196 11.8379 114.28 11.9838 114.397C12.1296 114.512 12.2533 114.666 12.3549 114.858C12.459 115.049 12.5385 115.282 12.5931 115.558C12.6478 115.834 12.6752 116.158 12.6752 116.53ZM11.9486 117.515V116.409C11.9486 116.154 11.933 115.93 11.9017 115.737C11.8731 115.542 11.8301 115.375 11.7728 115.237C11.7155 115.099 11.6426 114.987 11.5541 114.901C11.4681 114.815 11.3679 114.753 11.2533 114.714C11.1413 114.672 11.015 114.651 10.8744 114.651C10.7025 114.651 10.5502 114.684 10.4174 114.749C10.2845 114.812 10.1726 114.912 10.0814 115.05C9.99288 115.188 9.92517 115.369 9.8783 115.593C9.83142 115.817 9.80798 116.089 9.80798 116.409V117.515C9.80798 117.77 9.82231 117.995 9.85095 118.19C9.8822 118.386 9.92778 118.555 9.98767 118.698C10.0476 118.839 10.1205 118.955 10.2064 119.046C10.2924 119.137 10.3913 119.205 10.5033 119.249C10.6179 119.291 10.7442 119.312 10.8822 119.312C11.0593 119.312 11.2142 119.278 11.347 119.21C11.4799 119.142 11.5905 119.037 11.6791 118.894C11.7702 118.748 11.8379 118.562 11.8822 118.335C11.9265 118.106 11.9486 117.832 11.9486 117.515ZM13.6746 115.534V115.233C13.6746 115.017 13.7214 114.821 13.8152 114.644C13.9089 114.466 14.0431 114.325 14.2175 114.218C14.392 114.111 14.599 114.058 14.8386 114.058C15.0834 114.058 15.2918 114.111 15.4636 114.218C15.6381 114.325 15.7722 114.466 15.866 114.644C15.9597 114.821 16.0066 115.017 16.0066 115.233V115.534C16.0066 115.745 15.9597 115.939 15.866 116.116C15.7748 116.293 15.642 116.435 15.4675 116.542C15.2957 116.649 15.0886 116.702 14.8464 116.702C14.6043 116.702 14.3946 116.649 14.2175 116.542C14.0431 116.435 13.9089 116.293 13.8152 116.116C13.7214 115.939 13.6746 115.745 13.6746 115.534ZM14.2175 115.233V115.534C14.2175 115.654 14.2397 115.767 14.2839 115.874C14.3308 115.981 14.4011 116.068 14.4949 116.136C14.5886 116.201 14.7058 116.233 14.8464 116.233C14.9871 116.233 15.1029 116.201 15.1941 116.136C15.2852 116.068 15.3529 115.981 15.3972 115.874C15.4415 115.767 15.4636 115.654 15.4636 115.534V115.233C15.4636 115.111 15.4402 114.996 15.3933 114.89C15.349 114.78 15.28 114.693 15.1863 114.628C15.0951 114.56 14.9793 114.526 14.8386 114.526C14.7006 114.526 14.5847 114.56 14.491 114.628C14.3998 114.693 14.3308 114.78 14.2839 114.89C14.2397 114.996 14.2175 115.111 14.2175 115.233ZM16.4441 118.737V118.433C16.4441 118.219 16.491 118.024 16.5847 117.847C16.6785 117.67 16.8126 117.528 16.9871 117.421C17.1615 117.314 17.3686 117.261 17.6082 117.261C17.8529 117.261 18.0613 117.314 18.2332 117.421C18.4076 117.528 18.5418 117.67 18.6355 117.847C18.7293 118.024 18.7761 118.219 18.7761 118.433V118.737C18.7761 118.951 18.7293 119.146 18.6355 119.323C18.5444 119.5 18.4115 119.642 18.2371 119.749C18.0652 119.856 17.8582 119.909 17.616 119.909C17.3738 119.909 17.1654 119.856 16.991 119.749C16.8165 119.642 16.6811 119.5 16.5847 119.323C16.491 119.146 16.4441 118.951 16.4441 118.737ZM16.9871 118.433V118.737C16.9871 118.857 17.0092 118.972 17.0535 119.081C17.1003 119.188 17.1707 119.275 17.2644 119.343C17.3582 119.408 17.4753 119.44 17.616 119.44C17.7566 119.44 17.8725 119.408 17.9636 119.343C18.0574 119.275 18.1264 119.188 18.1707 119.081C18.2149 118.974 18.2371 118.86 18.2371 118.737V118.433C18.2371 118.31 18.2136 118.196 18.1668 118.089C18.1225 117.982 18.0535 117.896 17.9597 117.831C17.8686 117.763 17.7514 117.729 17.6082 117.729C17.4701 117.729 17.3543 117.763 17.2605 117.831C17.1694 117.896 17.1003 117.982 17.0535 118.089C17.0092 118.196 16.9871 118.31 16.9871 118.433ZM17.7878 114.948L15.0105 119.394L14.6043 119.136L17.3816 114.69L17.7878 114.948Z" fill="black" fill-opacity="0.54"/>
<path d="M13.043 144.737V145.604C13.043 146.07 13.0013 146.464 12.918 146.784C12.8346 147.104 12.7148 147.362 12.5586 147.557C12.4023 147.753 12.2135 147.895 11.9922 147.983C11.7734 148.069 11.526 148.112 11.25 148.112C11.0312 148.112 10.8294 148.085 10.6445 148.03C10.4596 147.975 10.293 147.888 10.1445 147.768C9.9987 147.646 9.8737 147.487 9.76953 147.292C9.66536 147.096 9.58594 146.859 9.53125 146.581C9.47656 146.302 9.44922 145.977 9.44922 145.604V144.737C9.44922 144.271 9.49089 143.88 9.57422 143.565C9.66016 143.25 9.78125 142.997 9.9375 142.807C10.0938 142.615 10.2812 142.477 10.5 142.393C10.7214 142.31 10.9688 142.268 11.2422 142.268C11.4635 142.268 11.6667 142.296 11.8516 142.35C12.0391 142.402 12.2057 142.487 12.3516 142.604C12.4974 142.719 12.6211 142.872 12.7227 143.065C12.8268 143.255 12.9062 143.488 12.9609 143.764C13.0156 144.04 13.043 144.365 13.043 144.737ZM12.3164 145.721V144.616C12.3164 144.361 12.3008 144.137 12.2695 143.944C12.2409 143.749 12.1979 143.582 12.1406 143.444C12.0833 143.306 12.0104 143.194 11.9219 143.108C11.8359 143.022 11.7357 142.96 11.6211 142.921C11.5091 142.879 11.3828 142.858 11.2422 142.858C11.0703 142.858 10.918 142.891 10.7852 142.956C10.6523 143.018 10.5404 143.119 10.4492 143.257C10.3607 143.395 10.293 143.576 10.2461 143.8C10.1992 144.024 10.1758 144.296 10.1758 144.616V145.721C10.1758 145.977 10.1901 146.202 10.2188 146.397C10.25 146.593 10.2956 146.762 10.3555 146.905C10.4154 147.046 10.4883 147.162 10.5742 147.253C10.6602 147.344 10.7591 147.412 10.8711 147.456C10.9857 147.497 11.112 147.518 11.25 147.518C11.4271 147.518 11.582 147.484 11.7148 147.417C11.8477 147.349 11.9583 147.244 12.0469 147.1C12.138 146.955 12.2057 146.768 12.25 146.542C12.2943 146.313 12.3164 146.039 12.3164 145.721ZM14.0424 143.741V143.44C14.0424 143.224 14.0892 143.027 14.183 142.85C14.2767 142.673 14.4108 142.531 14.5853 142.425C14.7598 142.318 14.9668 142.264 15.2064 142.264C15.4512 142.264 15.6595 142.318 15.8314 142.425C16.0059 142.531 16.14 142.673 16.2338 142.85C16.3275 143.027 16.3744 143.224 16.3744 143.44V143.741C16.3744 143.952 16.3275 144.146 16.2338 144.323C16.1426 144.5 16.0098 144.642 15.8353 144.749C15.6635 144.856 15.4564 144.909 15.2142 144.909C14.972 144.909 14.7624 144.856 14.5853 144.749C14.4108 144.642 14.2767 144.5 14.183 144.323C14.0892 144.146 14.0424 143.952 14.0424 143.741ZM14.5853 143.44V143.741C14.5853 143.861 14.6075 143.974 14.6517 144.081C14.6986 144.188 14.7689 144.275 14.8627 144.343C14.9564 144.408 15.0736 144.44 15.2142 144.44C15.3549 144.44 15.4707 144.408 15.5619 144.343C15.653 144.275 15.7207 144.188 15.765 144.081C15.8093 143.974 15.8314 143.861 15.8314 143.741V143.44C15.8314 143.318 15.808 143.203 15.7611 143.096C15.7168 142.987 15.6478 142.9 15.5541 142.835C15.4629 142.767 15.347 142.733 15.2064 142.733C15.0684 142.733 14.9525 142.767 14.8588 142.835C14.7676 142.9 14.6986 142.987 14.6517 143.096C14.6075 143.203 14.5853 143.318 14.5853 143.44ZM16.8119 146.944V146.639C16.8119 146.426 16.8588 146.231 16.9525 146.053C17.0463 145.876 17.1804 145.734 17.3549 145.628C17.5293 145.521 17.7364 145.468 17.976 145.468C18.2207 145.468 18.4291 145.521 18.601 145.628C18.7754 145.734 18.9095 145.876 19.0033 146.053C19.097 146.231 19.1439 146.426 19.1439 146.639V146.944C19.1439 147.158 19.097 147.353 19.0033 147.53C18.9122 147.707 18.7793 147.849 18.6049 147.956C18.433 148.063 18.226 148.116 17.9838 148.116C17.7416 148.116 17.5332 148.063 17.3588 147.956C17.1843 147.849 17.0489 147.707 16.9525 147.53C16.8588 147.353 16.8119 147.158 16.8119 146.944ZM17.3549 146.639V146.944C17.3549 147.064 17.377 147.178 17.4213 147.288C17.4681 147.395 17.5385 147.482 17.6322 147.55C17.726 147.615 17.8431 147.647 17.9838 147.647C18.1244 147.647 18.2403 147.615 18.3314 147.55C18.4252 147.482 18.4942 147.395 18.5385 147.288C18.5827 147.181 18.6049 147.066 18.6049 146.944V146.639C18.6049 146.517 18.5814 146.402 18.5345 146.296C18.4903 146.189 18.4213 146.103 18.3275 146.038C18.2364 145.97 18.1192 145.936 17.976 145.936C17.8379 145.936 17.722 145.97 17.6283 146.038C17.5372 146.103 17.4681 146.189 17.4213 146.296C17.377 146.402 17.3549 146.517 17.3549 146.639ZM18.1556 143.155L15.3783 147.6L14.972 147.343L17.7494 142.897L18.1556 143.155Z" fill="black" fill-opacity="0.54"/>
<path d="M25 4.16113L200 4.16116" stroke="black" stroke-opacity="0.12"/>
<path d="M25 33.1611L200 33.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 61.1611L200 61.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 89.1611L200 89.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 118.161L200 118.161" stroke="black" stroke-opacity="0.12"/>
<line x1="23.2" y1="145.961" x2="202.8" y2="145.961" stroke="black" stroke-opacity="0.7" stroke-width="0.4" stroke-linecap="square"/>
<g clip-path="url(#clip1_4182_11193)">
<line x1="40.45" y1="147.072" x2="40.45" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M32.5091 152.025V152.893C32.5091 153.359 32.4674 153.752 32.3841 154.072C32.3007 154.393 32.1809 154.65 32.0247 154.846C31.8684 155.041 31.6796 155.183 31.4583 155.271C31.2395 155.357 30.9921 155.4 30.7161 155.4C30.4973 155.4 30.2955 155.373 30.1106 155.318C29.9257 155.264 29.7591 155.176 29.6106 155.057C29.4648 154.934 29.3398 154.775 29.2356 154.58C29.1315 154.385 29.052 154.148 28.9973 153.869C28.9427 153.59 28.9153 153.265 28.9153 152.893V152.025C28.9153 151.559 28.957 151.169 29.0403 150.854C29.1262 150.538 29.2473 150.286 29.4036 150.096C29.5598 149.903 29.7473 149.765 29.9661 149.682C30.1874 149.598 30.4348 149.557 30.7083 149.557C30.9296 149.557 31.1328 149.584 31.3177 149.639C31.5052 149.691 31.6718 149.775 31.8177 149.893C31.9635 150.007 32.0872 150.161 32.1887 150.354C32.2929 150.544 32.3723 150.777 32.427 151.053C32.4817 151.329 32.5091 151.653 32.5091 152.025ZM31.7825 153.01V151.904C31.7825 151.649 31.7669 151.425 31.7356 151.232C31.707 151.037 31.664 150.87 31.6067 150.732C31.5494 150.594 31.4765 150.482 31.388 150.396C31.302 150.311 31.2018 150.248 31.0872 150.209C30.9752 150.167 30.8489 150.146 30.7083 150.146C30.5364 150.146 30.3841 150.179 30.2512 150.244C30.1184 150.307 30.0065 150.407 29.9153 150.545C29.8268 150.683 29.7591 150.864 29.7122 151.088C29.6653 151.312 29.6419 151.584 29.6419 151.904V153.01C29.6419 153.265 29.6562 153.49 29.6848 153.686C29.7161 153.881 29.7617 154.05 29.8216 154.193C29.8815 154.334 29.9544 154.45 30.0403 154.541C30.1262 154.632 30.2252 154.7 30.3372 154.744C30.4518 154.786 30.5781 154.807 30.7161 154.807C30.8932 154.807 31.0481 154.773 31.1809 154.705C31.3137 154.637 31.4244 154.532 31.513 154.389C31.6041 154.243 31.6718 154.057 31.7161 153.83C31.7604 153.601 31.7825 153.327 31.7825 153.01ZM35.8964 149.604V155.322H35.1737V150.506L33.7167 151.037V150.385L35.7831 149.604H35.8964ZM41.1124 149.635V155.322H40.3585V149.635H41.1124ZM43.4952 152.193V152.811H40.9483V152.193H43.4952ZM43.8819 149.635V150.252H40.9483V149.635H43.8819ZM46.4216 155.4C46.1273 155.4 45.8604 155.351 45.6208 155.252C45.3838 155.15 45.1794 155.008 45.0075 154.826C44.8383 154.644 44.7081 154.428 44.6169 154.178C44.5258 153.928 44.4802 153.654 44.4802 153.357V153.193C44.4802 152.85 44.531 152.544 44.6325 152.275C44.7341 152.005 44.8721 151.775 45.0466 151.588C45.2211 151.4 45.419 151.258 45.6403 151.162C45.8617 151.066 46.0909 151.018 46.3278 151.018C46.6299 151.018 46.8903 151.07 47.1091 151.174C47.3305 151.278 47.5114 151.424 47.6521 151.611C47.7927 151.796 47.8969 152.015 47.9646 152.268C48.0323 152.518 48.0661 152.791 48.0661 153.088V153.412H44.9099V152.822H47.3435V152.768C47.3331 152.58 47.294 152.398 47.2263 152.221C47.1612 152.044 47.057 151.898 46.9138 151.783C46.7706 151.669 46.5752 151.611 46.3278 151.611C46.1638 151.611 46.0127 151.646 45.8747 151.717C45.7367 151.785 45.6182 151.886 45.5193 152.021C45.4203 152.157 45.3435 152.322 45.2888 152.518C45.2341 152.713 45.2068 152.938 45.2068 153.193V153.357C45.2068 153.558 45.2341 153.747 45.2888 153.924C45.3461 154.098 45.4281 154.252 45.5349 154.385C45.6443 154.518 45.7758 154.622 45.9294 154.697C46.0857 154.773 46.2627 154.811 46.4607 154.811C46.7159 154.811 46.932 154.758 47.1091 154.654C47.2862 154.55 47.4411 154.411 47.5739 154.236L48.0114 154.584C47.9203 154.722 47.8044 154.854 47.6638 154.979C47.5232 155.104 47.35 155.205 47.1443 155.283C46.9411 155.361 46.7002 155.4 46.4216 155.4ZM48.9886 149.322H49.7152V154.502L49.6527 155.322H48.9886V149.322ZM52.5706 153.174V153.256C52.5706 153.563 52.5342 153.848 52.4613 154.111C52.3883 154.372 52.2816 154.598 52.1409 154.791C52.0003 154.984 51.8284 155.133 51.6253 155.24C51.4222 155.347 51.1891 155.4 50.9261 155.4C50.6579 155.4 50.4222 155.355 50.2191 155.264C50.0185 155.17 49.8493 155.036 49.7113 154.861C49.5732 154.687 49.4626 154.476 49.3792 154.229C49.2985 153.981 49.2425 153.702 49.2113 153.393V153.033C49.2425 152.721 49.2985 152.441 49.3792 152.193C49.4626 151.946 49.5732 151.735 49.7113 151.561C49.8493 151.383 50.0185 151.249 50.2191 151.158C50.4196 151.064 50.6527 151.018 50.9183 151.018C51.1839 151.018 51.4196 151.07 51.6253 151.174C51.831 151.275 52.0029 151.421 52.1409 151.611C52.2816 151.801 52.3883 152.029 52.4613 152.295C52.5342 152.558 52.5706 152.851 52.5706 153.174ZM51.8441 153.256V153.174C51.8441 152.963 51.8245 152.765 51.7855 152.58C51.7464 152.393 51.6839 152.229 51.598 152.088C51.512 151.945 51.3988 151.833 51.2581 151.752C51.1175 151.669 50.9443 151.627 50.7386 151.627C50.5563 151.627 50.3975 151.658 50.262 151.721C50.1292 151.783 50.0159 151.868 49.9222 151.975C49.8284 152.079 49.7516 152.199 49.6917 152.334C49.6344 152.467 49.5915 152.605 49.5628 152.748V153.689C49.6045 153.872 49.6722 154.048 49.7659 154.217C49.8623 154.383 49.9899 154.52 50.1488 154.627C50.3102 154.734 50.5094 154.787 50.7464 154.787C50.9417 154.787 51.1084 154.748 51.2464 154.67C51.387 154.589 51.5003 154.479 51.5863 154.338C51.6748 154.197 51.7399 154.035 51.7816 153.85C51.8232 153.665 51.8441 153.467 51.8441 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<line x1="58.1499" y1="147.233" x2="58.1499" y2="146.411" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<g clip-path="url(#clip2_4182_11193)">
<line x1="75.8499" y1="147.233" x2="75.8499" y2="146.411" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M67.909 152.186V153.053C67.909 153.52 67.8673 153.913 67.784 154.233C67.7006 154.553 67.5808 154.811 67.4246 155.007C67.2683 155.202 67.0795 155.344 66.8582 155.432C66.6394 155.518 66.392 155.561 66.116 155.561C65.8972 155.561 65.6954 155.534 65.5105 155.479C65.3256 155.425 65.159 155.337 65.0105 155.218C64.8647 155.095 64.7397 154.936 64.6355 154.741C64.5314 154.546 64.4519 154.309 64.3972 154.03C64.3426 153.751 64.3152 153.426 64.3152 153.053V152.186C64.3152 151.72 64.3569 151.33 64.4402 151.014C64.5261 150.699 64.6472 150.447 64.8035 150.257C64.9597 150.064 65.1472 149.926 65.366 149.843C65.5873 149.759 65.8347 149.718 66.1082 149.718C66.3295 149.718 66.5327 149.745 66.7176 149.8C66.9051 149.852 67.0717 149.936 67.2176 150.053C67.3634 150.168 67.4871 150.322 67.5886 150.514C67.6928 150.705 67.7722 150.938 67.8269 151.214C67.8816 151.49 67.909 151.814 67.909 152.186ZM67.1824 153.171V152.065C67.1824 151.81 67.1668 151.586 67.1355 151.393C67.1069 151.198 67.0639 151.031 67.0066 150.893C66.9493 150.755 66.8764 150.643 66.7879 150.557C66.7019 150.471 66.6017 150.409 66.4871 150.37C66.3751 150.328 66.2488 150.307 66.1082 150.307C65.9363 150.307 65.784 150.34 65.6511 150.405C65.5183 150.468 65.4064 150.568 65.3152 150.706C65.2267 150.844 65.159 151.025 65.1121 151.249C65.0652 151.473 65.0418 151.745 65.0418 152.065V153.171C65.0418 153.426 65.0561 153.651 65.0847 153.846C65.116 154.042 65.1616 154.211 65.2215 154.354C65.2814 154.495 65.3543 154.611 65.4402 154.702C65.5261 154.793 65.6251 154.861 65.7371 154.905C65.8517 154.947 65.978 154.968 66.116 154.968C66.2931 154.968 66.448 154.934 66.5808 154.866C66.7136 154.798 66.8243 154.693 66.9129 154.55C67.004 154.404 67.0717 154.218 67.116 153.991C67.1603 153.762 67.1824 153.488 67.1824 153.171ZM69.976 152.284H70.4916C70.7442 152.284 70.9525 152.242 71.1166 152.159C71.2833 152.073 71.407 151.957 71.4877 151.811C71.571 151.663 71.6127 151.496 71.6127 151.311C71.6127 151.093 71.5762 150.909 71.5033 150.76C71.4304 150.612 71.321 150.5 71.1752 150.425C71.0293 150.349 70.8445 150.311 70.6205 150.311C70.4174 150.311 70.2377 150.352 70.0814 150.432C69.9278 150.51 69.8067 150.622 69.7182 150.768C69.6322 150.914 69.5892 151.086 69.5892 151.284H68.8666C68.8666 150.995 68.9395 150.732 69.0853 150.495C69.2312 150.258 69.4356 150.069 69.6986 149.928C69.9642 149.788 70.2715 149.718 70.6205 149.718C70.9642 149.718 71.265 149.779 71.5228 149.901C71.7807 150.021 71.9812 150.201 72.1244 150.44C72.2676 150.677 72.3392 150.973 72.3392 151.327C72.3392 151.47 72.3054 151.624 72.2377 151.788C72.1726 151.949 72.0697 152.1 71.9291 152.241C71.7911 152.382 71.6114 152.497 71.39 152.589C71.1687 152.677 70.903 152.721 70.5932 152.721H69.976V152.284ZM69.976 152.878V152.444H70.5932C70.9551 152.444 71.2546 152.487 71.4916 152.573C71.7286 152.659 71.9148 152.774 72.0502 152.917C72.1882 153.06 72.2846 153.218 72.3392 153.389C72.3965 153.559 72.4252 153.728 72.4252 153.897C72.4252 154.163 72.3796 154.399 72.2885 154.604C72.1999 154.81 72.0736 154.984 71.9096 155.128C71.7481 155.271 71.558 155.379 71.3392 155.452C71.1205 155.525 70.8822 155.561 70.6244 155.561C70.377 155.561 70.1439 155.526 69.9252 155.456C69.709 155.385 69.5176 155.284 69.351 155.151C69.1843 155.016 69.0541 154.85 68.9603 154.655C68.8666 154.457 68.8197 154.232 68.8197 153.979H69.5424C69.5424 154.177 69.5853 154.35 69.6713 154.499C69.7598 154.647 69.8848 154.763 70.0463 154.846C70.2103 154.927 70.403 154.968 70.6244 154.968C70.8458 154.968 71.0359 154.93 71.1947 154.854C71.3562 154.776 71.4799 154.659 71.5658 154.503C71.6543 154.346 71.6986 154.15 71.6986 153.913C71.6986 153.676 71.6491 153.482 71.5502 153.331C71.4512 153.177 71.3106 153.064 71.1283 152.991C70.9486 152.915 70.7364 152.878 70.4916 152.878H69.976ZM76.5123 149.796V155.483H75.7584V149.796H76.5123ZM78.8951 152.354V152.971H76.3482V152.354H78.8951ZM79.2818 149.796V150.413H76.3482V149.796H79.2818ZM81.8215 155.561C81.5272 155.561 81.2603 155.512 81.0207 155.413C80.7837 155.311 80.5793 155.169 80.4074 154.987C80.2382 154.805 80.108 154.589 80.0168 154.339C79.9257 154.089 79.8801 153.815 79.8801 153.518V153.354C79.8801 153.01 79.9309 152.705 80.0324 152.436C80.134 152.165 80.272 151.936 80.4465 151.749C80.621 151.561 80.8189 151.419 81.0402 151.323C81.2616 151.227 81.4908 151.178 81.7277 151.178C82.0298 151.178 82.2902 151.231 82.509 151.335C82.7304 151.439 82.9113 151.585 83.052 151.772C83.1926 151.957 83.2968 152.176 83.3645 152.428C83.4322 152.678 83.466 152.952 83.466 153.249V153.573H80.3098V152.983H82.7434V152.928C82.733 152.741 82.6939 152.559 82.6262 152.382C82.5611 152.205 82.4569 152.059 82.3137 151.944C82.1705 151.83 81.9751 151.772 81.7277 151.772C81.5637 151.772 81.4126 151.807 81.2746 151.878C81.1366 151.945 81.0181 152.047 80.9192 152.182C80.8202 152.318 80.7434 152.483 80.6887 152.678C80.634 152.874 80.6067 153.099 80.6067 153.354V153.518C80.6067 153.719 80.634 153.908 80.6887 154.085C80.746 154.259 80.828 154.413 80.9348 154.546C81.0442 154.678 81.1757 154.783 81.3293 154.858C81.4856 154.934 81.6626 154.971 81.8606 154.971C82.1158 154.971 82.3319 154.919 82.509 154.815C82.6861 154.711 82.841 154.572 82.9738 154.397L83.4113 154.745C83.3202 154.883 83.2043 155.014 83.0637 155.139C82.9231 155.264 82.7499 155.366 82.5442 155.444C82.341 155.522 82.1001 155.561 81.8215 155.561ZM84.3885 149.483H85.1151V154.663L85.0526 155.483H84.3885V149.483ZM87.9705 153.335V153.417C87.9705 153.724 87.9341 154.009 87.8612 154.272C87.7882 154.533 87.6815 154.759 87.5408 154.952C87.4002 155.145 87.2283 155.294 87.0252 155.401C86.8221 155.508 86.589 155.561 86.326 155.561C86.0578 155.561 85.8221 155.516 85.619 155.425C85.4185 155.331 85.2492 155.197 85.1112 155.022C84.9731 154.848 84.8625 154.637 84.7791 154.389C84.6984 154.142 84.6424 153.863 84.6112 153.553V153.194C84.6424 152.882 84.6984 152.602 84.7791 152.354C84.8625 152.107 84.9731 151.896 85.1112 151.721C85.2492 151.544 85.4185 151.41 85.619 151.319C85.8195 151.225 86.0526 151.178 86.3182 151.178C86.5838 151.178 86.8195 151.231 87.0252 151.335C87.231 151.436 87.4028 151.582 87.5408 151.772C87.6815 151.962 87.7882 152.19 87.8612 152.456C87.9341 152.719 87.9705 153.012 87.9705 153.335ZM87.244 153.417V153.335C87.244 153.124 87.2244 152.926 87.1854 152.741C87.1463 152.553 87.0838 152.389 86.9979 152.249C86.9119 152.106 86.7987 151.994 86.658 151.913C86.5174 151.83 86.3442 151.788 86.1385 151.788C85.9562 151.788 85.7974 151.819 85.6619 151.882C85.5291 151.944 85.4158 152.029 85.3221 152.135C85.2283 152.24 85.1515 152.359 85.0916 152.495C85.0343 152.628 84.9914 152.766 84.9627 152.909V153.85C85.0044 154.033 85.0721 154.208 85.1658 154.378C85.2622 154.544 85.3898 154.681 85.5487 154.788C85.7101 154.895 85.9093 154.948 86.1463 154.948C86.3416 154.948 86.5083 154.909 86.6463 154.831C86.7869 154.75 86.9002 154.639 86.9862 154.499C87.0747 154.358 87.1398 154.195 87.1815 154.01C87.2231 153.826 87.244 153.628 87.244 153.417Z" fill="black" fill-opacity="0.54"/>
</g>
<line x1="93.55" y1="147.233" x2="93.55" y2="146.411" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<g clip-path="url(#clip3_4182_11193)">
<line x1="111.25" y1="147.233" x2="111.25" y2="146.411" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M103.309 152.186V153.053C103.309 153.52 103.267 153.913 103.184 154.233C103.101 154.553 102.981 154.811 102.825 155.007C102.668 155.202 102.48 155.344 102.258 155.432C102.04 155.518 101.792 155.561 101.516 155.561C101.297 155.561 101.096 155.534 100.911 155.479C100.726 155.425 100.559 155.337 100.411 155.218C100.265 155.095 100.14 154.936 100.036 154.741C99.9315 154.546 99.8521 154.309 99.7974 154.03C99.7427 153.751 99.7154 153.426 99.7154 153.053V152.186C99.7154 151.72 99.757 151.33 99.8404 151.014C99.9263 150.699 100.047 150.447 100.204 150.257C100.36 150.064 100.547 149.926 100.766 149.843C100.987 149.759 101.235 149.718 101.508 149.718C101.73 149.718 101.933 149.745 102.118 149.8C102.305 149.852 102.472 149.936 102.618 150.053C102.764 150.168 102.887 150.322 102.989 150.514C103.093 150.705 103.172 150.938 103.227 151.214C103.282 151.49 103.309 151.814 103.309 152.186ZM102.583 153.171V152.065C102.583 151.81 102.567 151.586 102.536 151.393C102.507 151.198 102.464 151.031 102.407 150.893C102.349 150.755 102.277 150.643 102.188 150.557C102.102 150.471 102.002 150.409 101.887 150.37C101.775 150.328 101.649 150.307 101.508 150.307C101.336 150.307 101.184 150.34 101.051 150.405C100.918 150.468 100.807 150.568 100.715 150.706C100.627 150.844 100.559 151.025 100.512 151.249C100.465 151.473 100.442 151.745 100.442 152.065V153.171C100.442 153.426 100.456 153.651 100.485 153.846C100.516 154.042 100.562 154.211 100.622 154.354C100.682 154.495 100.754 154.611 100.84 154.702C100.926 154.793 101.025 154.861 101.137 154.905C101.252 154.947 101.378 154.968 101.516 154.968C101.693 154.968 101.848 154.934 101.981 154.866C102.114 154.798 102.224 154.693 102.313 154.55C102.404 154.404 102.472 154.218 102.516 153.991C102.56 153.762 102.583 153.488 102.583 153.171ZM105.235 152.776L104.657 152.628L104.943 149.796H107.86V150.464H105.556L105.384 152.01C105.488 151.951 105.62 151.895 105.778 151.843C105.94 151.79 106.125 151.764 106.333 151.764C106.596 151.764 106.832 151.81 107.04 151.901C107.249 151.99 107.426 152.117 107.571 152.284C107.72 152.451 107.833 152.651 107.911 152.885C107.989 153.12 108.028 153.382 108.028 153.671C108.028 153.944 107.991 154.195 107.915 154.425C107.842 154.654 107.732 154.854 107.583 155.026C107.435 155.195 107.247 155.327 107.021 155.421C106.797 155.514 106.532 155.561 106.228 155.561C105.999 155.561 105.781 155.53 105.575 155.468C105.372 155.402 105.19 155.305 105.028 155.175C104.87 155.042 104.739 154.878 104.638 154.682C104.539 154.484 104.476 154.253 104.45 153.987H105.138C105.169 154.201 105.232 154.38 105.325 154.526C105.419 154.672 105.541 154.783 105.693 154.858C105.846 154.931 106.025 154.968 106.228 154.968C106.4 154.968 106.552 154.938 106.685 154.878C106.818 154.818 106.929 154.732 107.021 154.62C107.112 154.508 107.181 154.372 107.228 154.214C107.277 154.055 107.302 153.876 107.302 153.678C107.302 153.499 107.277 153.332 107.228 153.178C107.178 153.025 107.104 152.891 107.005 152.776C106.909 152.662 106.79 152.573 106.65 152.51C106.509 152.445 106.347 152.413 106.165 152.413C105.923 152.413 105.739 152.445 105.614 152.51C105.492 152.576 105.366 152.664 105.235 152.776ZM111.912 149.796V155.483H111.159V149.796H111.912ZM114.295 152.354V152.971H111.748V152.354H114.295ZM114.682 149.796V150.413H111.748V149.796H114.682ZM117.222 155.561C116.927 155.561 116.66 155.512 116.421 155.413C116.184 155.311 115.979 155.169 115.808 154.987C115.638 154.805 115.508 154.589 115.417 154.339C115.326 154.089 115.28 153.815 115.28 153.518V153.354C115.28 153.01 115.331 152.705 115.433 152.436C115.534 152.165 115.672 151.936 115.847 151.749C116.021 151.561 116.219 151.419 116.44 151.323C116.662 151.227 116.891 151.178 117.128 151.178C117.43 151.178 117.69 151.231 117.909 151.335C118.13 151.439 118.311 151.585 118.452 151.772C118.593 151.957 118.697 152.176 118.765 152.428C118.832 152.678 118.866 152.952 118.866 153.249V153.573H115.71V152.983H118.144V152.928C118.133 152.741 118.094 152.559 118.026 152.382C117.961 152.205 117.857 152.059 117.714 151.944C117.571 151.83 117.375 151.772 117.128 151.772C116.964 151.772 116.813 151.807 116.675 151.878C116.537 151.945 116.418 152.047 116.319 152.182C116.22 152.318 116.144 152.483 116.089 152.678C116.034 152.874 116.007 153.099 116.007 153.354V153.518C116.007 153.719 116.034 153.908 116.089 154.085C116.146 154.259 116.228 154.413 116.335 154.546C116.444 154.678 116.576 154.783 116.729 154.858C116.886 154.934 117.063 154.971 117.261 154.971C117.516 154.971 117.732 154.919 117.909 154.815C118.086 154.711 118.241 154.572 118.374 154.397L118.811 154.745C118.72 154.883 118.604 155.014 118.464 155.139C118.323 155.264 118.15 155.366 117.944 155.444C117.741 155.522 117.5 155.561 117.222 155.561ZM119.789 149.483H120.515V154.663L120.453 155.483H119.789V149.483ZM123.371 153.335V153.417C123.371 153.724 123.334 154.009 123.261 154.272C123.188 154.533 123.082 154.759 122.941 154.952C122.8 155.145 122.628 155.294 122.425 155.401C122.222 155.508 121.989 155.561 121.726 155.561C121.458 155.561 121.222 155.516 121.019 155.425C120.819 155.331 120.649 155.197 120.511 155.022C120.373 154.848 120.263 154.637 120.179 154.389C120.099 154.142 120.043 153.863 120.011 153.553V153.194C120.043 152.882 120.099 152.602 120.179 152.354C120.263 152.107 120.373 151.896 120.511 151.721C120.649 151.544 120.819 151.41 121.019 151.319C121.22 151.225 121.453 151.178 121.718 151.178C121.984 151.178 122.22 151.231 122.425 151.335C122.631 151.436 122.803 151.582 122.941 151.772C123.082 151.962 123.188 152.19 123.261 152.456C123.334 152.719 123.371 153.012 123.371 153.335ZM122.644 153.417V153.335C122.644 153.124 122.625 152.926 122.586 152.741C122.546 152.553 122.484 152.389 122.398 152.249C122.312 152.106 122.199 151.994 122.058 151.913C121.918 151.83 121.744 151.788 121.539 151.788C121.356 151.788 121.198 151.819 121.062 151.882C120.929 151.944 120.816 152.029 120.722 152.135C120.628 152.24 120.552 152.359 120.492 152.495C120.434 152.628 120.392 152.766 120.363 152.909V153.85C120.405 154.033 120.472 154.208 120.566 154.378C120.662 154.544 120.79 154.681 120.949 154.788C121.11 154.895 121.309 154.948 121.546 154.948C121.742 154.948 121.908 154.909 122.046 154.831C122.187 154.75 122.3 154.639 122.386 154.499C122.475 154.358 122.54 154.195 122.582 154.01C122.623 153.826 122.644 153.628 122.644 153.417Z" fill="black" fill-opacity="0.54"/>
</g>
<line x1="128.95" y1="147.233" x2="128.95" y2="146.411" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<g clip-path="url(#clip4_4182_11193)">
<line x1="146.65" y1="147.233" x2="146.65" y2="146.411" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M138.709 152.186V153.053C138.709 153.52 138.667 153.913 138.584 154.233C138.501 154.553 138.381 154.811 138.225 155.007C138.068 155.202 137.88 155.344 137.658 155.432C137.439 155.518 137.192 155.561 136.916 155.561C136.697 155.561 136.495 155.534 136.311 155.479C136.126 155.425 135.959 155.337 135.811 155.218C135.665 155.095 135.54 154.936 135.436 154.741C135.331 154.546 135.252 154.309 135.197 154.03C135.143 153.751 135.115 153.426 135.115 153.053V152.186C135.115 151.72 135.157 151.33 135.24 151.014C135.326 150.699 135.447 150.447 135.604 150.257C135.76 150.064 135.947 149.926 136.166 149.843C136.387 149.759 136.635 149.718 136.908 149.718C137.13 149.718 137.333 149.745 137.518 149.8C137.705 149.852 137.872 149.936 138.018 150.053C138.163 150.168 138.287 150.322 138.389 150.514C138.493 150.705 138.572 150.938 138.627 151.214C138.682 151.49 138.709 151.814 138.709 152.186ZM137.982 153.171V152.065C137.982 151.81 137.967 151.586 137.936 151.393C137.907 151.198 137.864 151.031 137.807 150.893C137.749 150.755 137.676 150.643 137.588 150.557C137.502 150.471 137.402 150.409 137.287 150.37C137.175 150.328 137.049 150.307 136.908 150.307C136.736 150.307 136.584 150.34 136.451 150.405C136.318 150.468 136.206 150.568 136.115 150.706C136.027 150.844 135.959 151.025 135.912 151.249C135.865 151.473 135.842 151.745 135.842 152.065V153.171C135.842 153.426 135.856 153.651 135.885 153.846C135.916 154.042 135.962 154.211 136.022 154.354C136.081 154.495 136.154 154.611 136.24 154.702C136.326 154.793 136.425 154.861 136.537 154.905C136.652 154.947 136.778 154.968 136.916 154.968C137.093 154.968 137.248 154.934 137.381 154.866C137.514 154.798 137.624 154.693 137.713 154.55C137.804 154.404 137.872 154.218 137.916 153.991C137.96 153.762 137.982 153.488 137.982 153.171ZM143.397 149.796V150.202L141.042 155.483H140.28L142.631 150.389H139.553V149.796H143.397ZM147.312 149.796V155.483H146.558V149.796H147.312ZM149.695 152.354V152.971H147.148V152.354H149.695ZM150.082 149.796V150.413H147.148V149.796H150.082ZM152.622 155.561C152.327 155.561 152.06 155.512 151.821 155.413C151.584 155.311 151.379 155.169 151.207 154.987C151.038 154.805 150.908 154.589 150.817 154.339C150.726 154.089 150.68 153.815 150.68 153.518V153.354C150.68 153.01 150.731 152.705 150.832 152.436C150.934 152.165 151.072 151.936 151.247 151.749C151.421 151.561 151.619 151.419 151.84 151.323C152.062 151.227 152.291 151.178 152.528 151.178C152.83 151.178 153.09 151.231 153.309 151.335C153.53 151.439 153.711 151.585 153.852 151.772C153.993 151.957 154.097 152.176 154.165 152.428C154.232 152.678 154.266 152.952 154.266 153.249V153.573H151.11V152.983H153.543V152.928C153.533 152.741 153.494 152.559 153.426 152.382C153.361 152.205 153.257 152.059 153.114 151.944C152.971 151.83 152.775 151.772 152.528 151.772C152.364 151.772 152.213 151.807 152.075 151.878C151.937 151.945 151.818 152.047 151.719 152.182C151.62 152.318 151.543 152.483 151.489 152.678C151.434 152.874 151.407 153.099 151.407 153.354V153.518C151.407 153.719 151.434 153.908 151.489 154.085C151.546 154.259 151.628 154.413 151.735 154.546C151.844 154.678 151.976 154.783 152.129 154.858C152.286 154.934 152.463 154.971 152.661 154.971C152.916 154.971 153.132 154.919 153.309 154.815C153.486 154.711 153.641 154.572 153.774 154.397L154.211 154.745C154.12 154.883 154.004 155.014 153.864 155.139C153.723 155.264 153.55 155.366 153.344 155.444C153.141 155.522 152.9 155.561 152.622 155.561ZM155.189 149.483H155.915V154.663L155.853 155.483H155.189V149.483ZM158.771 153.335V153.417C158.771 153.724 158.734 154.009 158.661 154.272C158.588 154.533 158.482 154.759 158.341 154.952C158.2 155.145 158.028 155.294 157.825 155.401C157.622 155.508 157.389 155.561 157.126 155.561C156.858 155.561 156.622 155.516 156.419 155.425C156.218 155.331 156.049 155.197 155.911 155.022C155.773 154.848 155.663 154.637 155.579 154.389C155.498 154.142 155.442 153.863 155.411 153.553V153.194C155.442 152.882 155.498 152.602 155.579 152.354C155.663 152.107 155.773 151.896 155.911 151.721C156.049 151.544 156.218 151.41 156.419 151.319C156.62 151.225 156.853 151.178 157.118 151.178C157.384 151.178 157.62 151.231 157.825 151.335C158.031 151.436 158.203 151.582 158.341 151.772C158.482 151.962 158.588 152.19 158.661 152.456C158.734 152.719 158.771 153.012 158.771 153.335ZM158.044 153.417V153.335C158.044 153.124 158.024 152.926 157.985 152.741C157.946 152.553 157.884 152.389 157.798 152.249C157.712 152.106 157.599 151.994 157.458 151.913C157.317 151.83 157.144 151.788 156.939 151.788C156.756 151.788 156.597 151.819 156.462 151.882C156.329 151.944 156.216 152.029 156.122 152.135C156.028 152.24 155.952 152.359 155.892 152.495C155.834 152.628 155.791 152.766 155.763 152.909V153.85C155.804 154.033 155.872 154.208 155.966 154.378C156.062 154.544 156.19 154.681 156.349 154.788C156.51 154.895 156.709 154.948 156.946 154.948C157.142 154.948 157.308 154.909 157.446 154.831C157.587 154.75 157.7 154.639 157.786 154.499C157.875 154.358 157.94 154.195 157.982 154.01C158.023 153.826 158.044 153.628 158.044 153.417Z" fill="black" fill-opacity="0.54"/>
</g>
<line x1="164.35" y1="147.233" x2="164.35" y2="146.411" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<g clip-path="url(#clip5_4182_11193)">
<line x1="182.05" y1="147.233" x2="182.05" y2="146.411" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M174.109 152.186V153.053C174.109 153.52 174.067 153.913 173.984 154.233C173.901 154.553 173.781 154.811 173.625 155.007C173.469 155.202 173.28 155.344 173.058 155.432C172.84 155.518 172.592 155.561 172.316 155.561C172.097 155.561 171.896 155.534 171.711 155.479C171.526 155.425 171.359 155.337 171.211 155.218C171.065 155.095 170.94 154.936 170.836 154.741C170.732 154.546 170.652 154.309 170.597 154.03C170.543 153.751 170.515 153.426 170.515 153.053V152.186C170.515 151.72 170.557 151.33 170.64 151.014C170.726 150.699 170.847 150.447 171.004 150.257C171.16 150.064 171.347 149.926 171.566 149.843C171.788 149.759 172.035 149.718 172.308 149.718C172.53 149.718 172.733 149.745 172.918 149.8C173.105 149.852 173.272 149.936 173.418 150.053C173.564 150.168 173.687 150.322 173.789 150.514C173.893 150.705 173.972 150.938 174.027 151.214C174.082 151.49 174.109 151.814 174.109 152.186ZM173.383 153.171V152.065C173.383 151.81 173.367 151.586 173.336 151.393C173.307 151.198 173.264 151.031 173.207 150.893C173.15 150.755 173.077 150.643 172.988 150.557C172.902 150.471 172.802 150.409 172.687 150.37C172.575 150.328 172.449 150.307 172.308 150.307C172.136 150.307 171.984 150.34 171.851 150.405C171.719 150.468 171.607 150.568 171.515 150.706C171.427 150.844 171.359 151.025 171.312 151.249C171.265 151.473 171.242 151.745 171.242 152.065V153.171C171.242 153.426 171.256 153.651 171.285 153.846C171.316 154.042 171.362 154.211 171.422 154.354C171.482 154.495 171.554 154.611 171.64 154.702C171.726 154.793 171.825 154.861 171.937 154.905C172.052 154.947 172.178 154.968 172.316 154.968C172.493 154.968 172.648 154.934 172.781 154.866C172.914 154.798 173.025 154.693 173.113 154.55C173.204 154.404 173.272 154.218 173.316 153.991C173.36 153.762 173.383 153.488 173.383 153.171ZM175.84 154.878H175.914C176.331 154.878 176.67 154.819 176.93 154.702C177.19 154.585 177.391 154.427 177.532 154.229C177.672 154.031 177.769 153.809 177.821 153.561C177.873 153.311 177.899 153.055 177.899 152.792V151.921C177.899 151.663 177.869 151.434 177.809 151.233C177.752 151.033 177.671 150.865 177.567 150.729C177.465 150.594 177.349 150.491 177.219 150.421C177.089 150.35 176.951 150.315 176.805 150.315C176.638 150.315 176.489 150.349 176.356 150.417C176.226 150.482 176.115 150.574 176.024 150.694C175.935 150.814 175.868 150.955 175.821 151.116C175.774 151.277 175.75 151.453 175.75 151.643C175.75 151.813 175.771 151.977 175.813 152.135C175.855 152.294 175.918 152.438 176.004 152.565C176.09 152.693 176.197 152.794 176.325 152.87C176.455 152.943 176.607 152.979 176.782 152.979C176.943 152.979 177.094 152.948 177.235 152.885C177.378 152.82 177.504 152.733 177.614 152.624C177.726 152.512 177.814 152.385 177.879 152.245C177.947 152.104 177.986 151.957 177.996 151.803H178.34C178.34 152.02 178.297 152.233 178.211 152.444C178.128 152.652 178.011 152.843 177.86 153.014C177.709 153.186 177.532 153.324 177.329 153.428C177.125 153.53 176.904 153.581 176.664 153.581C176.383 153.581 176.14 153.526 175.934 153.417C175.728 153.307 175.559 153.162 175.426 152.979C175.296 152.797 175.198 152.594 175.133 152.37C175.071 152.143 175.039 151.914 175.039 151.682C175.039 151.412 175.077 151.158 175.153 150.921C175.228 150.684 175.34 150.475 175.489 150.296C175.637 150.113 175.821 149.971 176.039 149.87C176.261 149.768 176.516 149.718 176.805 149.718C177.131 149.718 177.408 149.783 177.637 149.913C177.866 150.043 178.052 150.218 178.196 150.436C178.342 150.655 178.448 150.901 178.516 151.175C178.584 151.448 178.618 151.729 178.618 152.018V152.28C178.618 152.574 178.598 152.874 178.559 153.178C178.523 153.481 178.451 153.77 178.344 154.046C178.24 154.322 178.088 154.569 177.887 154.788C177.687 155.004 177.425 155.176 177.102 155.303C176.782 155.428 176.386 155.491 175.914 155.491H175.84V154.878ZM182.713 149.796V155.483H181.959V149.796H182.713ZM185.095 152.354V152.971H182.548V152.354H185.095ZM185.482 149.796V150.413H182.548V149.796H185.482ZM188.022 155.561C187.727 155.561 187.46 155.512 187.221 155.413C186.984 155.311 186.78 155.169 186.608 154.987C186.438 154.805 186.308 154.589 186.217 154.339C186.126 154.089 186.08 153.815 186.08 153.518V153.354C186.08 153.01 186.131 152.705 186.233 152.436C186.334 152.165 186.472 151.936 186.647 151.749C186.821 151.561 187.019 151.419 187.24 151.323C187.462 151.227 187.691 151.178 187.928 151.178C188.23 151.178 188.49 151.231 188.709 151.335C188.931 151.439 189.112 151.585 189.252 151.772C189.393 151.957 189.497 152.176 189.565 152.428C189.632 152.678 189.666 152.952 189.666 153.249V153.573H186.51V152.983H188.944V152.928C188.933 152.741 188.894 152.559 188.826 152.382C188.761 152.205 188.657 152.059 188.514 151.944C188.371 151.83 188.175 151.772 187.928 151.772C187.764 151.772 187.613 151.807 187.475 151.878C187.337 151.945 187.218 152.047 187.119 152.182C187.02 152.318 186.944 152.483 186.889 152.678C186.834 152.874 186.807 153.099 186.807 153.354V153.518C186.807 153.719 186.834 153.908 186.889 154.085C186.946 154.259 187.028 154.413 187.135 154.546C187.244 154.678 187.376 154.783 187.53 154.858C187.686 154.934 187.863 154.971 188.061 154.971C188.316 154.971 188.532 154.919 188.709 154.815C188.886 154.711 189.041 154.572 189.174 154.397L189.612 154.745C189.52 154.883 189.405 155.014 189.264 155.139C189.123 155.264 188.95 155.366 188.744 155.444C188.541 155.522 188.3 155.561 188.022 155.561ZM190.589 149.483H191.315V154.663L191.253 155.483H190.589V149.483ZM194.171 153.335V153.417C194.171 153.724 194.134 154.009 194.061 154.272C193.988 154.533 193.882 154.759 193.741 154.952C193.6 155.145 193.429 155.294 193.225 155.401C193.022 155.508 192.789 155.561 192.526 155.561C192.258 155.561 192.022 155.516 191.819 155.425C191.619 155.331 191.449 155.197 191.311 155.022C191.173 154.848 191.063 154.637 190.979 154.389C190.899 154.142 190.843 153.863 190.811 153.553V153.194C190.843 152.882 190.899 152.602 190.979 152.354C191.063 152.107 191.173 151.896 191.311 151.721C191.449 151.544 191.619 151.41 191.819 151.319C192.02 151.225 192.253 151.178 192.518 151.178C192.784 151.178 193.02 151.231 193.225 151.335C193.431 151.436 193.603 151.582 193.741 151.772C193.882 151.962 193.988 152.19 194.061 152.456C194.134 152.719 194.171 153.012 194.171 153.335ZM193.444 153.417V153.335C193.444 153.124 193.425 152.926 193.386 152.741C193.347 152.553 193.284 152.389 193.198 152.249C193.112 152.106 192.999 151.994 192.858 151.913C192.718 151.83 192.544 151.788 192.339 151.788C192.156 151.788 191.998 151.819 191.862 151.882C191.729 151.944 191.616 152.029 191.522 152.135C191.429 152.24 191.352 152.359 191.292 152.495C191.235 152.628 191.192 152.766 191.163 152.909V153.85C191.205 154.033 191.272 154.208 191.366 154.378C191.462 154.544 191.59 154.681 191.749 154.788C191.91 154.895 192.11 154.948 192.347 154.948C192.542 154.948 192.708 154.909 192.847 154.831C192.987 154.75 193.1 154.639 193.186 154.499C193.275 154.358 193.34 154.195 193.382 154.01C193.423 153.826 193.444 153.628 193.444 153.417Z" fill="black" fill-opacity="0.54"/>
</g>
<circle cx="41" cy="73.1611" r="3" fill="#2196F3"/>
<circle cx="59" cy="53" r="3" fill="#2196F3"/>
<circle cx="77" cy="81.1611" r="3" fill="#4CAF50"/>
<circle cx="95" cy="87" r="3" fill="#4CAF50"/>
<circle cx="41" cy="113.161" r="3" fill="#4CAF50"/>
<circle cx="59" cy="93" r="3" fill="#4CAF50"/>
<circle cx="112" cy="90.1611" r="3" fill="#4CAF50"/>
<circle cx="148" cy="81.1611" r="3" fill="#4CAF50"/>
<circle cx="130" cy="103" r="3" fill="#4CAF50"/>
<circle cx="183" cy="121.161" r="3" fill="#4CAF50"/>
<circle cx="166" cy="109" r="3" fill="#4CAF50"/>
<circle cx="77" cy="37" r="3" fill="#2196F3"/>
<circle cx="95" cy="39" r="3" fill="#2196F3"/>
<circle cx="112" cy="19.1611" r="3" fill="#2196F3"/>
<circle cx="148" cy="37" r="3" fill="#2196F3"/>
<circle cx="130" cy="44" r="3" fill="#2196F3"/>
<circle cx="183" cy="23" r="3" fill="#2196F3"/>
<circle cx="166" cy="44" r="3" fill="#2196F3"/>
<circle cx="77" cy="72" r="3" fill="#FFC107"/>
<circle cx="95" cy="55" r="3" fill="#FFC107"/>
<circle cx="112" cy="66.1611" r="3" fill="#FFC107"/>
<circle cx="148" cy="51.1611" r="3" fill="#FFC107"/>
<circle cx="130" cy="72" r="3" fill="#FFC107"/>
<circle cx="183" cy="81" r="3" fill="#FFC107"/>
<circle cx="166" cy="59" r="3" fill="#FFC107"/>
<circle cx="28" cy="89" r="3" fill="#FFC107"/>
<circle cx="41" cy="97" r="3" fill="#FFC107"/>
<circle cx="59" cy="68.5781" r="3" fill="#FFC107"/>
<circle cx="28" cy="118.161" r="3" fill="#2196F3"/>
<circle cx="28" cy="129.489" r="3" fill="#4CAF50"/>
</g>
<defs>
<clipPath id="clip0_4182_11193">
<rect width="200" height="160" fill="white"/>
</clipPath>
<clipPath id="clip1_4182_11193">
<rect width="35.4" height="10" fill="white" transform="translate(23 146.161)"/>
</clipPath>
<clipPath id="clip2_4182_11193">
<rect width="35.4" height="10.322" fill="white" transform="translate(58.3999 146.161)"/>
</clipPath>
<clipPath id="clip3_4182_11193">
<rect width="35.4" height="10.322" fill="white" transform="translate(93.8 146.161)"/>
</clipPath>
<clipPath id="clip4_4182_11193">
<rect width="35.4" height="10.322" fill="white" transform="translate(129.2 146.161)"/>
</clipPath>
<clipPath id="clip5_4182_11193">
<rect width="35.4" height="10.322" fill="white" transform="translate(164.6 146.161)"/>
</clipPath>
</defs>
</svg>
",
+ "description": "Displays changes to time-series data over time—for example, temperature or humidity readings.",
+ "descriptor": {
+ "type": "timeseries",
+ "sizeX": 8,
+ "sizeY": 5,
+ "resources": [],
+ "templateHtml": "\n",
+ "templateCss": "",
+ "controllerScript": "self.onInit = function() {\n self.ctx.$scope.timeSeriesChartWidget.onInit();\n};\n\nself.onDataUpdated = function() {\n self.ctx.$scope.timeSeriesChartWidget.onDataUpdated();\n}\n\nself.onLatestDataUpdated = function() {\n self.ctx.$scope.timeSeriesChartWidget.onLatestDataUpdated();\n}\n\nself.typeParameters = function() {\n return {\n chartType: 'point',\n previewWidth: '80%',\n embedTitlePanel: true,\n hasAdditionalLatestDataKeys: true,\n dataKeySettingsFunction: TbTimeSeriesChart.dataKeySettings('point'),\n defaultDataKeysFunction: function() {\n return [{ name: 'temperature', label: 'Temperature', type: 'timeseries', units: '°C', decimals: 0 }];\n }\n };\n}\n",
+ "settingsSchema": "{}",
+ "dataKeySettingsSchema": "{}",
+ "latestDataKeySettingsSchema": "{}",
+ "settingsDirective": "tb-time-series-chart-widget-settings",
+ "dataKeySettingsDirective": "tb-time-series-chart-key-settings",
+ "latestDataKeySettingsDirective": "",
+ "hasBasicMode": true,
+ "basicModeDirective": "tb-time-series-chart-basic-config",
+ "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"showInLegend\":true,\"dataHiddenByDefault\":false,\"type\":\"line\",\"lineSettings\":{\"showLine\":false,\"step\":false,\"stepType\":\"start\",\"smooth\":false,\"lineType\":\"solid\",\"lineWidth\":2,\"showPoints\":true,\"showPointLabel\":false,\"pointLabelPosition\":\"top\",\"pointLabelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"pointLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"pointShape\":\"circle\",\"pointSize\":8,\"fillAreaSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}},\"barSettings\":{\"showBorder\":false,\"borderWidth\":2,\"borderRadius\":0,\"showLabel\":false,\"labelPosition\":\"top\",\"labelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.76)\",\"backgroundSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}}},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#FFC107\",\"settings\":{\"showInLegend\":true,\"dataHiddenByDefault\":false,\"type\":\"line\",\"lineSettings\":{\"showLine\":false,\"step\":false,\"stepType\":\"start\",\"smooth\":false,\"lineType\":\"solid\",\"lineWidth\":2,\"showPoints\":true,\"showPointLabel\":false,\"pointLabelPosition\":\"top\",\"pointLabelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"pointLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"pointShape\":\"circle\",\"pointSize\":8,\"fillAreaSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}},\"barSettings\":{\"showBorder\":false,\"borderWidth\":2,\"borderRadius\":0,\"showLabel\":false,\"labelPosition\":\"top\",\"labelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.76)\",\"backgroundSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}}},\"_hash\":0.5534217244004682,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]},\"latestDataKeys\":null}],\"timewindow\":{\"hideInterval\":false,\"hideLastInterval\":false,\"hideQuickInterval\":false,\"hideAggregation\":false,\"hideAggInterval\":false,\"hideTimezone\":false,\"selectedTab\":0,\"realtime\":{\"realtimeType\":0,\"timewindowMs\":60000,\"quickInterval\":\"CURRENT_DAY\",\"interval\":1000},\"aggregation\":{\"type\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"showLegend\":true,\"legendConfig\":{\"direction\":\"column\",\"position\":\"top\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":true,\"showTotal\":false,\"showLatest\":false},\"thresholds\":[],\"dataZoom\":true,\"stack\":false,\"yAxis\":{\"show\":true,\"label\":\"\",\"labelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"600\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.54)\",\"position\":\"left\",\"showTickLabels\":true,\"tickLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"tickLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"showTicks\":true,\"ticksColor\":\"rgba(0, 0, 0, 0.54)\",\"showLine\":true,\"lineColor\":\"rgba(0, 0, 0, 0.54)\",\"showSplitLines\":true,\"splitLinesColor\":\"rgba(0, 0, 0, 0.12)\"},\"xAxis\":{\"show\":true,\"label\":\"\",\"labelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"600\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.54)\",\"position\":\"bottom\",\"showTickLabels\":true,\"tickLabelFont\":{\"family\":\"Roboto\",\"size\":10,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"tickLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"ticksFormat\":{},\"showTicks\":true,\"ticksColor\":\"rgba(0, 0, 0, 0.54)\",\"showLine\":true,\"lineColor\":\"rgba(0, 0, 0, 0.54)\",\"showSplitLines\":true,\"splitLinesColor\":\"rgba(0, 0, 0, 0.12)\"},\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipTrigger\":\"axis\",\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":null,\"lastUpdateAgo\":false,\"custom\":false,\"auto\":true,\"autoDateFormatSettings\":{}},\"tooltipDateFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"tooltipDateColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipDateInterval\":true,\"tooltipBackgroundColor\":\"rgba(255, 255, 255, 0.76)\",\"tooltipBackgroundBlur\":4,\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}},\"yAxes\":{\"default\":{\"units\":null,\"decimals\":0,\"show\":true,\"label\":\"\",\"labelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"600\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.54)\",\"position\":\"left\",\"showTickLabels\":true,\"tickLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"tickLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"ticksFormatter\":null,\"showTicks\":true,\"ticksColor\":\"rgba(0, 0, 0, 0.54)\",\"showLine\":true,\"lineColor\":\"rgba(0, 0, 0, 0.54)\",\"showSplitLines\":true,\"splitLinesColor\":\"rgba(0, 0, 0, 0.12)\",\"id\":\"default\",\"order\":0}},\"noAggregationBarWidthSettings\":{\"strategy\":\"group\",\"groupWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000},\"barWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000}},\"animation\":{\"animation\":true,\"animationThreshold\":2000,\"animationDuration\":500,\"animationEasing\":\"cubicOut\",\"animationDelay\":0,\"animationDurationUpdate\":300,\"animationEasingUpdate\":\"cubicOut\",\"animationDelayUpdate\":0},\"padding\":\"12px\"},\"title\":\"Point chart\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":null,\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"thermostat\",\"iconColor\":\"#1F6BDD\",\"useDashboardTimewindow\":false,\"displayTimewindow\":true,\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleColor\":\"rgba(0, 0, 0, 0.87)\",\"titleTooltip\":\"\",\"widgetStyle\":{},\"widgetCss\":\"\",\"pageSize\":1024,\"units\":\"\",\"decimals\":null,\"noDataDisplayMessage\":\"\",\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":null,\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true},\"margin\":\"0px\",\"borderRadius\":\"0px\",\"iconSize\":\"0px\"}"
+ },
+ "tags": [
+ "chart",
+ "time series",
+ "time-series",
+ "point",
+ "point chart"
+ ]
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/range_chart.json b/application/src/main/data/json/system/widget_types/range_chart.json
index 981e3582c5..72cbeeacbb 100644
--- a/application/src/main/data/json/system/widget_types/range_chart.json
+++ b/application/src/main/data/json/system/widget_types/range_chart.json
@@ -2,7 +2,7 @@
"fqn": "range_chart",
"name": "Range chart",
"deprecated": false,
- "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAC/VBMVEX////////8/PwAAAD///////+bsfP+wEzu7u73lkzz8/P1eWTT09PN1emRpeOcsvSxsbGQpeLc3NyXl5epqanjXHPLy8tti+OgoKD/wU26urr29vbts0fnkUf39/fIrYP4l02oqKjJroPl5eWUrPPDw8PCwsLJroSQqfKLpfKDn/HU1NSnu/X/tzD/pwNyku//vD//sB3m5ub2jj98mfB2lfD2hTD/rRPu8v3/3qD1fCD3+f7K1vnnjEf1eh30awSWrvOBnfFkhOLld1n1dRX0cxH/9N/1cVvld1jmjEf2izn/qQry9f2Yr/P/+u/+9u+RpuP82r//yGDdM1D3kEPzWD32gSixwfBWeN//2JDzY0v+vkf/siT+5+RBaNr7x6DbYWXxTC96mPD+7N+VqN35tID2emX3oWD3k0fm6/zc5PvV3vq2xveWrfL+8/Hd3d09ZNr/6b/6vZCPj4/2h3TfQl3bKkjaIUD/ujnxQCL0bwrC0PiWqN5Kbt3/79D6zMqGhob/0n/iUWn0aVH+vUPZGjr/tSuwwvZpiOLR0dH+2I97e3v1dWDkcV3fPVnxSCr/qw+Jo/F/m/GLoum3xOj64uZef+H41NoyW9hdfNbJycnxqLT7x5/4no/nb4P/zXDiVm3hS2TlcV3zXEPyUzj+uTTwRCbkbRB+mOaareN5k+FyjuBHbNw4YNn7xr3/47D70LD5t6zumqjngJH/2I+Ojo7lYnf4oWC+mF7utEj2iDTmfSrxRyrunw/kZwLL1vWWrfS/zPORqfP98fKjt/GGofHv7+/+7erK0umHnuKDm+Lf39/t5d7829bm2dT949Dzt8HqwLFse6r4raDsjJz3lIPopHzGpnT4q3DZVmXSNkvnj0LnjD7mgjbjWzHiSzHwRyrunQXv8/3+9POquOWot+Tu4s3u3b3rzrfUxrHu166boa6coK76uKzTvJvoppv6vpDuyYfdboDmkXH1fGffR2H3oV/kbVnnjkHtrTbOIDTiUiLhUCD/rhTuoROM0RHwAAAABXRSTlMg77MAvxFwlo8AAA5CSURBVHja1JtJaBNRGMfj8scXk8MwSYZxoiFhaC9FEQoRA7YHE6K9iMZ4KIoWcTkpqK3oRVH05HISwX1Db66guF48eHHFBfcFQUUQ933BL6PxZZyZRE2+of4aMhPyWvKb73vzf3nQQL9A/z743+lLGoE+Qlea0JLShVA0mFHFwP9Hn0CgL7QwdERgKnGlmY7QBYgNGwY2lleHBjLSNwAIpdlAFPRIQERBsIjcvDGQEUEimqLq0FFysUR4WLKiG5yQiKGiJGIqIJYCKQEGDhV6wAmJCD3VBDWqCxCmrjeBg+7tK06DkQD8Yd3C2ML1YMM/kY2FWM9GsOGfyLLuWOEg2PBPZMW22JotYMM3kYs9sdjbw2DDN5Eta2KxbQWw4ZtIYRmJrAAbfomsXxgjFq4DF36JXCmQB2eQ+CWybHuMKPAFiU8i61bESqy5Ai58EtnYY4l08wWJTyKHuy2R7d3gwieRnmWkwRok/ogsoc6y4FzI84tYsU4wBwm/iBXrP+i5CC74RcqxTnAu5C0RMypgppQ4lCaIlN6CxnKwUBZZcwhsWN/ZE4CeUA3TiCIiEImjoVCs/6T7MNggkXAk1YIo4lGoCaEDiQQIRRGN4fynaWVu3BRskIjRBJ0sbPtaDRR5fm/1jtWrV+/YsXrH+3uCDRJpDpNI5Me+VlwnMYFG8qYz9IvdZ8AFicQjioKmlC4A0JFeNJSuvBRZuxdcBEAIlGcGkUBDWdIVkuy6DCb4c+TqzpmhED0sipvBBL9IMU8WZToXgAd+kSknQhUs7wQP/CKXd1WK5E88BAv8IvnllSKruO6/7CJzFq0KVbJ2ClhgF9nbFbLRdQ4ssIss6LSLFJ+BBXaRYinWZ9LPT3YyBQmviIx19iCpS2QOanK1GCJ4g6R+kQVLUIvO5SE7+SLqgkWkmEcNptwP/c4i1AeDyIGu3VNqDSn+DyL5zp3VZ66M9Zm9WeTcfVpwVJvvtliXInNQBwwiFHU1UkHGOvcaRYqYKoSiAc0mEs2KwB8wZRFF3apdVa8vuRIzfRRZaiAiVMPUDOiq+KN9rQO7an/jo1h3cIJTxCgJIB5FWMR1wBSoTdGax/ku75LIWJ/pU0WEoRr4y32tS1/GjB4zevSYu9eEJ6/vjh5DY8pPNJ6ePl8SPARIIBqZr0ZKFQHiEUATtUXGHh87dtSosaPu7DkrvDh+ZxQNGVt6EHQsne15IngIgKCKGIaigaCDjppMXxz8SW6G55j2oAu58eDBEkGCZExYmCZqc6Qt+JOOHDzYRGOcZPeDgX/OkczEYLJ8iafCnWQ6SNA4G21T8Y9wiGzKyk/WkYE77bN/OPRmkcyx2s2yn2R7u8h4muqybTpa4casScEKkr1SZFbaPn/Hw4VMa9CNzAz8Exwi09sn2q71MbeSXKCquTGpF4lMbfutXxa7lORFeZAcm+xtInTvtZN2KUlrR4VE76zI1Jw9G4h2R0lkrCftKpNmwZ2qic8i0pp2XOtJrQ7brDSoHJ5MH/H6s+NQBQYRucySzHaUJFlhaxPyFMnMgycsIu9ss9irYXJyHtmF0h6tNa69FZ5wiIyjj+hWkun2hs86FX5WJAlXxufavXuLQ2Rqm3s8XIdExrq9raqsAzAvk/XuLQ6RTIcVCcnfS5IdB4kj1muLJI+lPXuLQ4SWWbUTm2I9+bci6dbZXr3FIkLLLHdm58ZV9Elb0FMk7T71KHfq6i1LZG6LQEJrAehovZA4cm62vffleZssiYx15xJlYsZjrlsLhDoo/9dbSjU0s8mAoqlV9rWut5UFHCoTqSQy1r1wisgaUm/VJ6LGof/Y12pW4zoQ9hJxLLNsRtlfJdmU/WsRus3V2VsBEIZm29fyZFMu6E0HlUTG+l+KpDvKi896RDQDKO9r6YDqua91+/iQKuwpb9btue096NYp4capD9Z7Z+va1zJ1VY0rYSoLoWtzI/AQefRgsIOj8vTjSWHx9KRzkDx7IFx4/ONXvr2sT0TTNBEPt8AirCXgwYSVA4hBA0rIM8mIkSixdfKAKgyDC/u+Wu8NHQ4XGp4j32kvYxWFgSiKVsOkVlnyVrARbJYJM1XID6QJWKQT/Qm7VAFBLLbKH1hZ2/iBq6s4WW/MDle8oCHeIeT47ry85MlW96pKyvy8zlntWcNA9rtfb5nMwXoDSOZ0W4Ik211hs7zoxhS5guQKZatbTRdgvQHEVfp/mSZp8yJ60QXSLC82kS0GZF30Acj9u7K9pF0gdaE1kS0SRIyWW0AQA+Mm8OtzkGOqNZEtDgSiT6qoFWhz63OQrXeAlM5v2HBh1dK1AtmDENkiQdwWk0SoE6SxmsgWB5KlQAAnLMg80ZrIFgdiDlw9EOSI/TD1NpmtOg8EqQstDAaudhlcfLHytnDZsqdAkNIE3St6ISBy8Gu5bM2TDEBCxiwuZfIMxNiz+VK21imAhIxZLBOAwF5n+9Z+FQiysp0DCfMkWW169jqbLVN9B4FkTeBtC5yBjyAL11oqTLbyRIeBWMO2KRSClDv9YrYy1wKZDM6f6HKcdIxZ0Hx7qiD35Pn/ua8iprpafLZK40GieBaf39PH0fBjOIUxC6YsXrtSPShZepfrW27rQT4HaqhmIxVHavoF67oKIFz/NY8gdeNn/tBs4evM6Q4SqdHlOAzovcKOKQACl6eytXB/QeLLMR7/kGoFK27DQDQXixzKTgVljxswKo6NwVBsCDgH5wMM/QbfNt18QU495Zz8RdkfyLEsLXT30OveSy+99Bs6ltWVlfHKMnoklhTNyPM0T5ITEtx8uNh7tYbt841vJyL0h4ep2qLfAj7/J/Lm7Y1Mxnv869a18bvWz3O4CBFRtJCIojAKQyyxjkVb7fqlTYTG2IVX7A/bZgc0wzq2n6O5icVza412yhvvc/4zn4Izuv+dBQrX7+aqlDw0kS9PV/xK4yO+OOftZ5xjo6tiwVWdKztdtl0vHY98buK+HUXZ8M7h6XEKjx/36PZ79BxZZRWTAEZBesaxFIGB24KOU2dlYMHWbB4SdLkbJXK3kfewRu1D5NNpYNR8H1ggSrO5dCKSVO7Bu1iK5GKivjOKWFg1su43y4y5EFnn03IBY927JCDzSbzq3KKtQ3YwUtpGCKNEkmU/CphIhHrAJZFGSDtpqCv52hJSbAyRHhkinY0mhAJ8clKZRH5lQwOARVvbhmWrPi/hQiSJjbmSF2dIB5KRJiDC0IBxbaUxO/XytSqYA5FtQe7hvXtlZO8kQ5naosfBMe1pZuNCRMSvSgd0050hECLVctiRaEsHbsoTYkLEkhAfgNG4JHISxMGureSBsf4iaXZAiVA5GsGAKvxOeOPUvs3IGFRbdG43697SH8/IqvCJWGvQbBcC8VVd4vw131hY5lYvkn3SOXybWRNCFzjVip0INVkqPMjrbsAEtLbo3NZyD2/656nEzJaQyvvJBEhiRmHVVir3KL1IyqymRKgTjdV/HwbHzwe1VSa7rnOzV0skZ5QI3bAnhEfU502tLsrBvRcky1QdQ0dKxJ4Qd4CfF32Wp09+epH8q+56WqSG4Wj98yCHlQ1JiCGBQhk6KONpQBD04pxH8DZ7moN4WfbgwF5d8Kh4c0XWb+Dfo2cRVARvfgdP+iH8pdlprKGtioudRztN8vq68zYv/ZPD9OKF1Ej+S4dUvbj9j68jsd4zqmhNs7V3uT7C5SshNVSMRgouHTOqBOe05ZKFB6qOR0KiThDbjWylNxpxkFx7VGeZjLAJrFjPaxUMogwPVPGovbeNrcZI8IeR206ylV7XfHdtN67Y62hJKAZZleKw+pP4n8BASrN16UPkbtwK/+1ohCuAjxpG8nCX34u/vW1Mm1IyZqvlNHp5dz1xEXvEiurXwiRCeaxpe/3LlzA/4xcqERqzNjdpJaZiq6Jv99TxZ2B9MWkKCgJRtTBUaLlZ0YF/+Zj9hMcviKlnmF48Di3rb+DHiFRqyykuQHBcWRD2vn8799/x/Ond27dp8bh79+mnJkctX2M9w4AxP7h/vsbOrMkdnT9/NI/1QRvBbCcaWS2a3MGTJ9Ha0I0slrWPJwdo4nDn4LCuDN3IfFln69UCTbxbrt7WlaEbidmarXZ/NXm0ipXBG6mz9epZwv08+gdvpM7W692EO3wfy4M3ss7WzrOUercXy8M3sliFDnmbUnNEDN8IZSs996YYvpGQreUC3dgAIz5bs94O2QAjPluvDtGDDTBC2Zod7aIHm2BksaJzbx82wch8+XoPfdgEI5jN0IuNMLJYoB/BCJNghpcYG+RGFQ6Dwhz9ODZSSIwFJLh1xTTMa93Z+m1o3cWWJyR98KBZ90a0Xs9r5fTxx/j4uYt9cELSq3mznnHFbDJBlx5y8MgAYe29CUXLgMAFhE72yjF4ZPBQcMcvdGSqMHmgcm/ojqAPR5RgDV1OznNrJlTUI6BEA3csMOGFI6kvpVJq1O1SoZRulzI+SqRdp1/B3wC2sN7dwwmsQM6Q534hWK6hRZVEte/8dsowBVglHVN9jK3SS8tKGtRuLUUuVYdUAO1SmSORdhkJ40VURsy+s4IZWzizfqWo1utdlOa0LTTXtI+K0ikXJFWGWTEqtGxKuVDtUlsY1ioV+7xMpL9rRAluBZ+CT41TiEYs84dkXPi/5YzjWkTpFh95KTPHUh6lYJapdinLmWmVagvjEunvGgGXgjNYIZSORuwEBMWclE6CGZgiSicY8Upa3hNcoJgKE6Vjy/dHHVLIVqkoyVkqzU6hFYrW0dgb4XBvxMgKRVtWH3LrnlJUo1VIioNkGPP4bbhvAFNUEUxyYh66WloRrdKy4JN2qeEGqTQ7i3+EPGnoZLvJvItlSMnTWbb57wJH9RLtM9lpbDpOnc3O/ACb/i1NA1ABvwAAAABJRU5ErkJggg==",
+ "image": "tb-image:cmFuZ2VfY2hhcnRfc3lzdGVtX3dpZGdldF9pbWFnZS5wbmc=:IlJhbmdlIGNoYXJ0IiBzeXN0ZW0gd2lkZ2V0IGltYWdl;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAC/VBMVEX////////8/PwAAAD///////+bsfP+wEzu7u73lkzz8/P1eWTT09PN1emRpeOcsvSxsbGQpeLc3NyXl5epqanjXHPLy8tti+OgoKD/wU26urr29vbts0fnkUf39/fIrYP4l02oqKjJroPl5eWUrPPDw8PCwsLJroSQqfKLpfKDn/HU1NSnu/X/tzD/pwNyku//vD//sB3m5ub2jj98mfB2lfD2hTD/rRPu8v3/3qD1fCD3+f7K1vnnjEf1eh30awSWrvOBnfFkhOLld1n1dRX0cxH/9N/1cVvld1jmjEf2izn/qQry9f2Yr/P/+u/+9u+RpuP82r//yGDdM1D3kEPzWD32gSixwfBWeN//2JDzY0v+vkf/siT+5+RBaNr7x6DbYWXxTC96mPD+7N+VqN35tID2emX3oWD3k0fm6/zc5PvV3vq2xveWrfL+8/Hd3d09ZNr/6b/6vZCPj4/2h3TfQl3bKkjaIUD/ujnxQCL0bwrC0PiWqN5Kbt3/79D6zMqGhob/0n/iUWn0aVH+vUPZGjr/tSuwwvZpiOLR0dH+2I97e3v1dWDkcV3fPVnxSCr/qw+Jo/F/m/GLoum3xOj64uZef+H41NoyW9hdfNbJycnxqLT7x5/4no/nb4P/zXDiVm3hS2TlcV3zXEPyUzj+uTTwRCbkbRB+mOaareN5k+FyjuBHbNw4YNn7xr3/47D70LD5t6zumqjngJH/2I+Ojo7lYnf4oWC+mF7utEj2iDTmfSrxRyrunw/kZwLL1vWWrfS/zPORqfP98fKjt/GGofHv7+/+7erK0umHnuKDm+Lf39/t5d7829bm2dT949Dzt8HqwLFse6r4raDsjJz3lIPopHzGpnT4q3DZVmXSNkvnj0LnjD7mgjbjWzHiSzHwRyrunQXv8/3+9POquOWot+Tu4s3u3b3rzrfUxrHu166boa6coK76uKzTvJvoppv6vpDuyYfdboDmkXH1fGffR2H3oV/kbVnnjkHtrTbOIDTiUiLhUCD/rhTuoROM0RHwAAAABXRSTlMg77MAvxFwlo8AAA5CSURBVHja1JtJaBNRGMfj8scXk8MwSYZxoiFhaC9FEQoRA7YHE6K9iMZ4KIoWcTkpqK3oRVH05HISwX1Db66guF48eHHFBfcFQUUQ933BL6PxZZyZRE2+of4aMhPyWvKb73vzf3nQQL9A/z743+lLGoE+Qlea0JLShVA0mFHFwP9Hn0CgL7QwdERgKnGlmY7QBYgNGwY2lleHBjLSNwAIpdlAFPRIQERBsIjcvDGQEUEimqLq0FFysUR4WLKiG5yQiKGiJGIqIJYCKQEGDhV6wAmJCD3VBDWqCxCmrjeBg+7tK06DkQD8Yd3C2ML1YMM/kY2FWM9GsOGfyLLuWOEg2PBPZMW22JotYMM3kYs9sdjbw2DDN5Eta2KxbQWw4ZtIYRmJrAAbfomsXxgjFq4DF36JXCmQB2eQ+CWybHuMKPAFiU8i61bESqy5Ai58EtnYY4l08wWJTyKHuy2R7d3gwieRnmWkwRok/ogsoc6y4FzI84tYsU4wBwm/iBXrP+i5CC74RcqxTnAu5C0RMypgppQ4lCaIlN6CxnKwUBZZcwhsWN/ZE4CeUA3TiCIiEImjoVCs/6T7MNggkXAk1YIo4lGoCaEDiQQIRRGN4fynaWVu3BRskIjRBJ0sbPtaDRR5fm/1jtWrV+/YsXrH+3uCDRJpDpNI5Me+VlwnMYFG8qYz9IvdZ8AFicQjioKmlC4A0JFeNJSuvBRZuxdcBEAIlGcGkUBDWdIVkuy6DCb4c+TqzpmhED0sipvBBL9IMU8WZToXgAd+kSknQhUs7wQP/CKXd1WK5E88BAv8IvnllSKruO6/7CJzFq0KVbJ2ClhgF9nbFbLRdQ4ssIss6LSLFJ+BBXaRYinWZ9LPT3YyBQmviIx19iCpS2QOanK1GCJ4g6R+kQVLUIvO5SE7+SLqgkWkmEcNptwP/c4i1AeDyIGu3VNqDSn+DyL5zp3VZ66M9Zm9WeTcfVpwVJvvtliXInNQBwwiFHU1UkHGOvcaRYqYKoSiAc0mEs2KwB8wZRFF3apdVa8vuRIzfRRZaiAiVMPUDOiq+KN9rQO7an/jo1h3cIJTxCgJIB5FWMR1wBSoTdGax/ku75LIWJ/pU0WEoRr4y32tS1/GjB4zevSYu9eEJ6/vjh5DY8pPNJ6ePl8SPARIIBqZr0ZKFQHiEUATtUXGHh87dtSosaPu7DkrvDh+ZxQNGVt6EHQsne15IngIgKCKGIaigaCDjppMXxz8SW6G55j2oAu58eDBEkGCZExYmCZqc6Qt+JOOHDzYRGOcZPeDgX/OkczEYLJ8iafCnWQ6SNA4G21T8Y9wiGzKyk/WkYE77bN/OPRmkcyx2s2yn2R7u8h4muqybTpa4casScEKkr1SZFbaPn/Hw4VMa9CNzAz8Exwi09sn2q71MbeSXKCquTGpF4lMbfutXxa7lORFeZAcm+xtInTvtZN2KUlrR4VE76zI1Jw9G4h2R0lkrCftKpNmwZ2qic8i0pp2XOtJrQ7brDSoHJ5MH/H6s+NQBQYRucySzHaUJFlhaxPyFMnMgycsIu9ss9irYXJyHtmF0h6tNa69FZ5wiIyjj+hWkun2hs86FX5WJAlXxufavXuLQ2Rqm3s8XIdExrq9raqsAzAvk/XuLQ6RTIcVCcnfS5IdB4kj1muLJI+lPXuLQ4SWWbUTm2I9+bci6dbZXr3FIkLLLHdm58ZV9Elb0FMk7T71KHfq6i1LZG6LQEJrAehovZA4cm62vffleZssiYx15xJlYsZjrlsLhDoo/9dbSjU0s8mAoqlV9rWut5UFHCoTqSQy1r1wisgaUm/VJ6LGof/Y12pW4zoQ9hJxLLNsRtlfJdmU/WsRus3V2VsBEIZm29fyZFMu6E0HlUTG+l+KpDvKi896RDQDKO9r6YDqua91+/iQKuwpb9btue096NYp4capD9Z7Z+va1zJ1VY0rYSoLoWtzI/AQefRgsIOj8vTjSWHx9KRzkDx7IFx4/ONXvr2sT0TTNBEPt8AirCXgwYSVA4hBA0rIM8mIkSixdfKAKgyDC/u+Wu8NHQ4XGp4j32kvYxWFgSiKVsOkVlnyVrARbJYJM1XID6QJWKQT/Qm7VAFBLLbKH1hZ2/iBq6s4WW/MDle8oCHeIeT47ry85MlW96pKyvy8zlntWcNA9rtfb5nMwXoDSOZ0W4Ik211hs7zoxhS5guQKZatbTRdgvQHEVfp/mSZp8yJ60QXSLC82kS0GZF30Acj9u7K9pF0gdaE1kS0SRIyWW0AQA+Mm8OtzkGOqNZEtDgSiT6qoFWhz63OQrXeAlM5v2HBh1dK1AtmDENkiQdwWk0SoE6SxmsgWB5KlQAAnLMg80ZrIFgdiDlw9EOSI/TD1NpmtOg8EqQstDAaudhlcfLHytnDZsqdAkNIE3St6ISBy8Gu5bM2TDEBCxiwuZfIMxNiz+VK21imAhIxZLBOAwF5n+9Z+FQiysp0DCfMkWW169jqbLVN9B4FkTeBtC5yBjyAL11oqTLbyRIeBWMO2KRSClDv9YrYy1wKZDM6f6HKcdIxZ0Hx7qiD35Pn/ua8iprpafLZK40GieBaf39PH0fBjOIUxC6YsXrtSPShZepfrW27rQT4HaqhmIxVHavoF67oKIFz/NY8gdeNn/tBs4evM6Q4SqdHlOAzovcKOKQACl6eytXB/QeLLMR7/kGoFK27DQDQXixzKTgVljxswKo6NwVBsCDgH5wMM/QbfNt18QU495Zz8RdkfyLEsLXT30OveSy+99Bs6ltWVlfHKMnoklhTNyPM0T5ITEtx8uNh7tYbt841vJyL0h4ep2qLfAj7/J/Lm7Y1Mxnv869a18bvWz3O4CBFRtJCIojAKQyyxjkVb7fqlTYTG2IVX7A/bZgc0wzq2n6O5icVza412yhvvc/4zn4Izuv+dBQrX7+aqlDw0kS9PV/xK4yO+OOftZ5xjo6tiwVWdKztdtl0vHY98buK+HUXZ8M7h6XEKjx/36PZ79BxZZRWTAEZBesaxFIGB24KOU2dlYMHWbB4SdLkbJXK3kfewRu1D5NNpYNR8H1ggSrO5dCKSVO7Bu1iK5GKivjOKWFg1su43y4y5EFnn03IBY927JCDzSbzq3KKtQ3YwUtpGCKNEkmU/CphIhHrAJZFGSDtpqCv52hJSbAyRHhkinY0mhAJ8clKZRH5lQwOARVvbhmWrPi/hQiSJjbmSF2dIB5KRJiDC0IBxbaUxO/XytSqYA5FtQe7hvXtlZO8kQ5naosfBMe1pZuNCRMSvSgd0050hECLVctiRaEsHbsoTYkLEkhAfgNG4JHISxMGureSBsf4iaXZAiVA5GsGAKvxOeOPUvs3IGFRbdG43697SH8/IqvCJWGvQbBcC8VVd4vw131hY5lYvkn3SOXybWRNCFzjVip0INVkqPMjrbsAEtLbo3NZyD2/656nEzJaQyvvJBEhiRmHVVir3KL1IyqymRKgTjdV/HwbHzwe1VSa7rnOzV0skZ5QI3bAnhEfU502tLsrBvRcky1QdQ0dKxJ4Qd4CfF32Wp09+epH8q+56WqSG4Wj98yCHlQ1JiCGBQhk6KONpQBD04pxH8DZ7moN4WfbgwF5d8Kh4c0XWb+Dfo2cRVARvfgdP+iH8pdlprKGtioudRztN8vq68zYv/ZPD9OKF1Ej+S4dUvbj9j68jsd4zqmhNs7V3uT7C5SshNVSMRgouHTOqBOe05ZKFB6qOR0KiThDbjWylNxpxkFx7VGeZjLAJrFjPaxUMogwPVPGovbeNrcZI8IeR206ylV7XfHdtN67Y62hJKAZZleKw+pP4n8BASrN16UPkbtwK/+1ohCuAjxpG8nCX34u/vW1Mm1IyZqvlNHp5dz1xEXvEiurXwiRCeaxpe/3LlzA/4xcqERqzNjdpJaZiq6Jv99TxZ2B9MWkKCgJRtTBUaLlZ0YF/+Zj9hMcviKlnmF48Di3rb+DHiFRqyykuQHBcWRD2vn8799/x/Ond27dp8bh79+mnJkctX2M9w4AxP7h/vsbOrMkdnT9/NI/1QRvBbCcaWS2a3MGTJ9Ha0I0slrWPJwdo4nDn4LCuDN3IfFln69UCTbxbrt7WlaEbidmarXZ/NXm0ipXBG6mz9epZwv08+gdvpM7W692EO3wfy4M3ss7WzrOUercXy8M3sliFDnmbUnNEDN8IZSs996YYvpGQreUC3dgAIz5bs94O2QAjPluvDtGDDTBC2Zod7aIHm2BksaJzbx82wch8+XoPfdgEI5jN0IuNMLJYoB/BCJNghpcYG+RGFQ6Dwhz9ODZSSIwFJLh1xTTMa93Z+m1o3cWWJyR98KBZ90a0Xs9r5fTxx/j4uYt9cELSq3mznnHFbDJBlx5y8MgAYe29CUXLgMAFhE72yjF4ZPBQcMcvdGSqMHmgcm/ojqAPR5RgDV1OznNrJlTUI6BEA3csMOGFI6kvpVJq1O1SoZRulzI+SqRdp1/B3wC2sN7dwwmsQM6Q534hWK6hRZVEte/8dsowBVglHVN9jK3SS8tKGtRuLUUuVYdUAO1SmSORdhkJ40VURsy+s4IZWzizfqWo1utdlOa0LTTXtI+K0ikXJFWGWTEqtGxKuVDtUlsY1ioV+7xMpL9rRAluBZ+CT41TiEYs84dkXPi/5YzjWkTpFh95KTPHUh6lYJapdinLmWmVagvjEunvGgGXgjNYIZSORuwEBMWclE6CGZgiSicY8Upa3hNcoJgKE6Vjy/dHHVLIVqkoyVkqzU6hFYrW0dgb4XBvxMgKRVtWH3LrnlJUo1VIioNkGPP4bbhvAFNUEUxyYh66WloRrdKy4JN2qeEGqTQ7i3+EPGnoZLvJvItlSMnTWbb57wJH9RLtM9lpbDpOnc3O/ACb/i1NA1ABvwAAAABJRU5ErkJggg==",
"description": "Displays changes to time-series data over time visualized with color ranges — for example, temperature or humidity readings.",
"descriptor": {
"type": "timeseries",
@@ -20,9 +20,8 @@
"latestDataKeySettingsDirective": "",
"hasBasicMode": true,
"basicModeDirective": "tb-range-chart-basic-config",
- "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temperature\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}]}],\"timewindow\":{\"hideInterval\":false,\"hideLastInterval\":false,\"hideQuickInterval\":false,\"hideAggregation\":false,\"hideAggInterval\":false,\"hideTimezone\":false,\"selectedTab\":0,\"realtime\":{\"realtimeType\":0,\"timewindowMs\":60000,\"quickInterval\":\"CURRENT_DAY\",\"interval\":1000},\"aggregation\":{\"type\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"dataZoom\":true,\"rangeColors\":[{\"to\":-20,\"color\":\"#234CC7\"},{\"from\":-20,\"to\":0,\"color\":\"#305AD7\"},{\"from\":0,\"to\":10,\"color\":\"#7191EF\"},{\"from\":10,\"to\":20,\"color\":\"#FFA600\"},{\"from\":20,\"to\":30,\"color\":\"#F36900\"},{\"from\":30,\"to\":40,\"color\":\"#F04022\"},{\"from\":40,\"color\":\"#D81838\"}],\"outOfRangeColor\":\"#ccc\",\"fillArea\":true,\"showLegend\":true,\"legendPosition\":\"top\",\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":\"dd MMM yyyy HH:mm\",\"lastUpdateAgo\":false,\"custom\":false},\"tooltipDateFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"tooltipDateColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipBackgroundColor\":\"rgba(255, 255, 255, 0.76)\",\"tooltipBackgroundBlur\":4,\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}}},\"title\":\"Range chart\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":null,\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"thermostat\",\"iconColor\":\"#1F6BDD\",\"useDashboardTimewindow\":false,\"displayTimewindow\":true,\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleColor\":\"rgba(0, 0, 0, 0.87)\",\"titleTooltip\":\"\",\"widgetStyle\":{},\"widgetCss\":\"\",\"pageSize\":1024,\"units\":\"°C\",\"decimals\":0,\"noDataDisplayMessage\":\"\",\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":null,\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true},\"margin\":\"0px\",\"borderRadius\":\"0px\",\"iconSize\":\"0px\"}"
+ "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temperature\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}]}],\"timewindow\":{\"hideInterval\":false,\"hideLastInterval\":false,\"hideQuickInterval\":false,\"hideAggregation\":false,\"hideAggInterval\":false,\"hideTimezone\":false,\"selectedTab\":0,\"realtime\":{\"realtimeType\":0,\"timewindowMs\":60000,\"quickInterval\":\"CURRENT_DAY\",\"interval\":1000},\"aggregation\":{\"type\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"dataZoom\":true,\"rangeColors\":[{\"to\":-20,\"color\":\"#234CC7\"},{\"from\":-20,\"to\":0,\"color\":\"#305AD7\"},{\"from\":0,\"to\":10,\"color\":\"#7191EF\"},{\"from\":10,\"to\":20,\"color\":\"#FFA600\"},{\"from\":20,\"to\":30,\"color\":\"#F36900\"},{\"from\":30,\"to\":40,\"color\":\"#F04022\"},{\"from\":40,\"color\":\"#D81838\"}],\"outOfRangeColor\":\"#ccc\",\"fillArea\":true,\"showLegend\":true,\"legendPosition\":\"top\",\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":null,\"lastUpdateAgo\":false,\"custom\":false,\"auto\":true,\"autoDateFormatSettings\":{}},\"tooltipDateFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"tooltipDateColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipBackgroundColor\":\"rgba(255, 255, 255, 0.76)\",\"tooltipBackgroundBlur\":4,\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}},\"tooltipDateInterval\":true},\"title\":\"Range chart\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":null,\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"thermostat\",\"iconColor\":\"#1F6BDD\",\"useDashboardTimewindow\":false,\"displayTimewindow\":true,\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleColor\":\"rgba(0, 0, 0, 0.87)\",\"titleTooltip\":\"\",\"widgetStyle\":{},\"widgetCss\":\"\",\"pageSize\":1024,\"units\":\"°C\",\"decimals\":0,\"noDataDisplayMessage\":\"\",\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":null,\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true},\"margin\":\"0px\",\"borderRadius\":\"0px\",\"iconSize\":\"0px\"}"
},
- "externalId": null,
"tags": [
"range",
"color range",
diff --git a/application/src/main/data/json/system/widget_types/time_series_chart.json b/application/src/main/data/json/system/widget_types/time_series_chart.json
new file mode 100644
index 0000000000..9b2069ca6b
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/time_series_chart.json
@@ -0,0 +1,36 @@
+{
+ "fqn": "time_series_chart",
+ "name": "Time series chart",
+ "deprecated": false,
+ "image": "tb-image:Y2hhcnQuc3Zn:IlRpbWUgc2VyaWVzIGNoYXJ0IiBzeXN0ZW0gd2lkZ2V0IGltYWdl;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_4053_185113)">
<path d="M2.84766 1.28125V7H2.125V2.18359L0.667969 2.71484V2.0625L2.73438 1.28125H2.84766ZM8.67517 3.70312V4.57031C8.67517 5.03646 8.63351 5.42969 8.55017 5.75C8.46684 6.07031 8.34705 6.32812 8.1908 6.52344C8.03455 6.71875 7.84575 6.86068 7.62439 6.94922C7.40564 7.03516 7.15825 7.07812 6.8822 7.07812C6.66345 7.07812 6.46163 7.05078 6.27673 6.99609C6.09184 6.94141 5.92517 6.85417 5.77673 6.73438C5.6309 6.61198 5.5059 6.45312 5.40173 6.25781C5.29757 6.0625 5.21814 5.82552 5.16345 5.54688C5.10877 5.26823 5.08142 4.94271 5.08142 4.57031V3.70312C5.08142 3.23698 5.12309 2.84635 5.20642 2.53125C5.29236 2.21615 5.41345 1.96354 5.5697 1.77344C5.72595 1.58073 5.91345 1.44271 6.1322 1.35938C6.35356 1.27604 6.60095 1.23438 6.87439 1.23438C7.09575 1.23438 7.29887 1.26172 7.48377 1.31641C7.67127 1.36849 7.83793 1.45312 7.98377 1.57031C8.1296 1.6849 8.2533 1.83854 8.35486 2.03125C8.45903 2.22135 8.53845 2.45443 8.59314 2.73047C8.64783 3.00651 8.67517 3.33073 8.67517 3.70312ZM7.94861 4.6875V3.58203C7.94861 3.32682 7.93298 3.10286 7.90173 2.91016C7.87309 2.71484 7.83012 2.54818 7.77283 2.41016C7.71554 2.27214 7.64262 2.16016 7.55408 2.07422C7.46814 1.98828 7.36788 1.92578 7.2533 1.88672C7.14132 1.84505 7.01502 1.82422 6.87439 1.82422C6.70252 1.82422 6.55017 1.85677 6.41736 1.92188C6.28455 1.98438 6.17257 2.08464 6.08142 2.22266C5.99288 2.36068 5.92517 2.54167 5.8783 2.76562C5.83142 2.98958 5.80798 3.26172 5.80798 3.58203V4.6875C5.80798 4.94271 5.82231 5.16797 5.85095 5.36328C5.8822 5.55859 5.92778 5.72786 5.98767 5.87109C6.04757 6.01172 6.12048 6.1276 6.20642 6.21875C6.29236 6.3099 6.39132 6.3776 6.5033 6.42188C6.61788 6.46354 6.74418 6.48438 6.8822 6.48438C7.05929 6.48438 7.21423 6.45052 7.34705 6.38281C7.47986 6.3151 7.59054 6.20964 7.67908 6.06641C7.77022 5.92057 7.83793 5.73438 7.8822 5.50781C7.92647 5.27865 7.94861 5.00521 7.94861 4.6875ZM13.3074 3.70312V4.57031C13.3074 5.03646 13.2657 5.42969 13.1824 5.75C13.099 6.07031 12.9793 6.32812 12.823 6.52344C12.6668 6.71875 12.4779 6.86068 12.2566 6.94922C12.0378 7.03516 11.7904 7.07812 11.5144 7.07812C11.2957 7.07812 11.0938 7.05078 10.9089 6.99609C10.724 6.94141 10.5574 6.85417 10.4089 6.73438C10.2631 6.61198 10.1381 6.45312 10.0339 6.25781C9.92977 6.0625 9.85034 5.82552 9.79566 5.54688C9.74097 5.26823 9.71363 4.94271 9.71363 4.57031V3.70312C9.71363 3.23698 9.75529 2.84635 9.83863 2.53125C9.92456 2.21615 10.0457 1.96354 10.2019 1.77344C10.3582 1.58073 10.5457 1.44271 10.7644 1.35938C10.9858 1.27604 11.2332 1.23438 11.5066 1.23438C11.7279 1.23438 11.9311 1.26172 12.116 1.31641C12.3035 1.36849 12.4701 1.45312 12.616 1.57031C12.7618 1.6849 12.8855 1.83854 12.9871 2.03125C13.0912 2.22135 13.1707 2.45443 13.2253 2.73047C13.28 3.00651 13.3074 3.33073 13.3074 3.70312ZM12.5808 4.6875V3.58203C12.5808 3.32682 12.5652 3.10286 12.5339 2.91016C12.5053 2.71484 12.4623 2.54818 12.405 2.41016C12.3477 2.27214 12.2748 2.16016 12.1863 2.07422C12.1003 1.98828 12.0001 1.92578 11.8855 1.88672C11.7735 1.84505 11.6472 1.82422 11.5066 1.82422C11.3347 1.82422 11.1824 1.85677 11.0496 1.92188C10.9168 1.98438 10.8048 2.08464 10.7136 2.22266C10.6251 2.36068 10.5574 2.54167 10.5105 2.76562C10.4636 2.98958 10.4402 3.26172 10.4402 3.58203V4.6875C10.4402 4.94271 10.4545 5.16797 10.4832 5.36328C10.5144 5.55859 10.56 5.72786 10.6199 5.87109C10.6798 6.01172 10.7527 6.1276 10.8386 6.21875C10.9246 6.3099 11.0235 6.3776 11.1355 6.42188C11.2501 6.46354 11.3764 6.48438 11.5144 6.48438C11.6915 6.48438 11.8464 6.45052 11.9793 6.38281C12.1121 6.3151 12.2227 6.20964 12.3113 6.06641C12.4024 5.92057 12.4701 5.73438 12.5144 5.50781C12.5587 5.27865 12.5808 5.00521 12.5808 4.6875ZM14.3068 2.70703V2.40625C14.3068 2.1901 14.3536 1.99349 14.4474 1.81641C14.5411 1.63932 14.6753 1.4974 14.8497 1.39062C15.0242 1.28385 15.2312 1.23047 15.4708 1.23047C15.7156 1.23047 15.924 1.28385 16.0958 1.39062C16.2703 1.4974 16.4044 1.63932 16.4982 1.81641C16.5919 1.99349 16.6388 2.1901 16.6388 2.40625V2.70703C16.6388 2.91797 16.5919 3.11198 16.4982 3.28906C16.407 3.46615 16.2742 3.60807 16.0997 3.71484C15.9279 3.82161 15.7208 3.875 15.4786 3.875C15.2365 3.875 15.0268 3.82161 14.8497 3.71484C14.6753 3.60807 14.5411 3.46615 14.4474 3.28906C14.3536 3.11198 14.3068 2.91797 14.3068 2.70703ZM14.8497 2.40625V2.70703C14.8497 2.82682 14.8719 2.9401 14.9161 3.04688C14.963 3.15365 15.0333 3.24089 15.1271 3.30859C15.2208 3.3737 15.338 3.40625 15.4786 3.40625C15.6193 3.40625 15.7352 3.3737 15.8263 3.30859C15.9174 3.24089 15.9852 3.15365 16.0294 3.04688C16.0737 2.9401 16.0958 2.82682 16.0958 2.70703V2.40625C16.0958 2.28385 16.0724 2.16927 16.0255 2.0625C15.9812 1.95312 15.9122 1.86589 15.8185 1.80078C15.7273 1.73307 15.6115 1.69922 15.4708 1.69922C15.3328 1.69922 15.2169 1.73307 15.1232 1.80078C15.032 1.86589 14.963 1.95312 14.9161 2.0625C14.8719 2.16927 14.8497 2.28385 14.8497 2.40625ZM17.0763 5.91016V5.60547C17.0763 5.39193 17.1232 5.19661 17.2169 5.01953C17.3107 4.84245 17.4448 4.70052 17.6193 4.59375C17.7937 4.48698 18.0008 4.43359 18.2404 4.43359C18.4852 4.43359 18.6935 4.48698 18.8654 4.59375C19.0398 4.70052 19.174 4.84245 19.2677 5.01953C19.3615 5.19661 19.4083 5.39193 19.4083 5.60547V5.91016C19.4083 6.1237 19.3615 6.31901 19.2677 6.49609C19.1766 6.67318 19.0437 6.8151 18.8693 6.92188C18.6974 7.02865 18.4904 7.08203 18.2482 7.08203C18.006 7.08203 17.7977 7.02865 17.6232 6.92188C17.4487 6.8151 17.3133 6.67318 17.2169 6.49609C17.1232 6.31901 17.0763 6.1237 17.0763 5.91016ZM17.6193 5.60547V5.91016C17.6193 6.02995 17.6414 6.14453 17.6857 6.25391C17.7325 6.36068 17.8029 6.44792 17.8966 6.51562C17.9904 6.58073 18.1075 6.61328 18.2482 6.61328C18.3888 6.61328 18.5047 6.58073 18.5958 6.51562C18.6896 6.44792 18.7586 6.36068 18.8029 6.25391C18.8471 6.14714 18.8693 6.03255 18.8693 5.91016V5.60547C18.8693 5.48307 18.8458 5.36849 18.799 5.26172C18.7547 5.15495 18.6857 5.06901 18.5919 5.00391C18.5008 4.9362 18.3836 4.90234 18.2404 4.90234C18.1023 4.90234 17.9865 4.9362 17.8927 5.00391C17.8016 5.06901 17.7325 5.15495 17.6857 5.26172C17.6414 5.36849 17.6193 5.48307 17.6193 5.60547ZM18.42 2.12109L15.6427 6.56641L15.2365 6.30859L18.0138 1.86328L18.42 2.12109Z" fill="black" fill-opacity="0.54"/>
<path d="M8.05859 33.668C8.05859 34.0143 7.97786 34.3086 7.81641 34.5508C7.65755 34.7904 7.44141 34.9727 7.16797 35.0977C6.89714 35.2227 6.59115 35.2852 6.25 35.2852C5.90885 35.2852 5.60156 35.2227 5.32812 35.0977C5.05469 34.9727 4.83854 34.7904 4.67969 34.5508C4.52083 34.3086 4.44141 34.0143 4.44141 33.668C4.44141 33.4414 4.48438 33.2344 4.57031 33.0469C4.65885 32.8568 4.78255 32.6914 4.94141 32.5508C5.10286 32.4102 5.29297 32.3021 5.51172 32.2266C5.73307 32.1484 5.97656 32.1094 6.24219 32.1094C6.59115 32.1094 6.90234 32.1771 7.17578 32.3125C7.44922 32.4453 7.66406 32.6289 7.82031 32.8633C7.97917 33.0977 8.05859 33.3659 8.05859 33.668ZM7.33203 33.6523C7.33203 33.4414 7.28646 33.2552 7.19531 33.0938C7.10417 32.9297 6.97656 32.8021 6.8125 32.7109C6.64844 32.6198 6.45833 32.5742 6.24219 32.5742C6.02083 32.5742 5.82943 32.6198 5.66797 32.7109C5.50911 32.8021 5.38542 32.9297 5.29688 33.0938C5.20833 33.2552 5.16406 33.4414 5.16406 33.6523C5.16406 33.8711 5.20703 34.0586 5.29297 34.2148C5.38151 34.3685 5.50651 34.487 5.66797 34.5703C5.83203 34.651 6.02604 34.6914 6.25 34.6914C6.47396 34.6914 6.66667 34.651 6.82812 34.5703C6.98958 34.487 7.11328 34.3685 7.19922 34.2148C7.28776 34.0586 7.33203 33.8711 7.33203 33.6523ZM7.92578 31C7.92578 31.276 7.85286 31.5247 7.70703 31.7461C7.5612 31.9674 7.36198 32.1419 7.10938 32.2695C6.85677 32.3971 6.57031 32.4609 6.25 32.4609C5.92448 32.4609 5.63411 32.3971 5.37891 32.2695C5.1263 32.1419 4.92839 31.9674 4.78516 31.7461C4.64193 31.5247 4.57031 31.276 4.57031 31C4.57031 30.6693 4.64193 30.388 4.78516 30.1562C4.93099 29.9245 5.13021 29.7474 5.38281 29.625C5.63542 29.5026 5.92318 29.4414 6.24609 29.4414C6.57161 29.4414 6.86068 29.5026 7.11328 29.625C7.36589 29.7474 7.5638 29.9245 7.70703 30.1562C7.85286 30.388 7.92578 30.6693 7.92578 31ZM7.20312 31.0117C7.20312 30.8216 7.16276 30.6536 7.08203 30.5078C7.0013 30.362 6.88932 30.2474 6.74609 30.1641C6.60286 30.0781 6.4362 30.0352 6.24609 30.0352C6.05599 30.0352 5.88932 30.0755 5.74609 30.1562C5.60547 30.2344 5.49479 30.3464 5.41406 30.4922C5.33594 30.638 5.29688 30.8112 5.29688 31.0117C5.29688 31.207 5.33594 31.3776 5.41406 31.5234C5.49479 31.6693 5.60677 31.7826 5.75 31.8633C5.89323 31.944 6.0599 31.9844 6.25 31.9844C6.4401 31.9844 6.60547 31.944 6.74609 31.8633C6.88932 31.7826 7.0013 31.6693 7.08203 31.5234C7.16276 31.3776 7.20312 31.207 7.20312 31.0117ZM12.6752 31.9102V32.7773C12.6752 33.2435 12.6335 33.6367 12.5502 33.957C12.4668 34.2773 12.347 34.5352 12.1908 34.7305C12.0345 34.9258 11.8457 35.0677 11.6244 35.1562C11.4056 35.2422 11.1582 35.2852 10.8822 35.2852C10.6635 35.2852 10.4616 35.2578 10.2767 35.2031C10.0918 35.1484 9.92517 35.0612 9.77673 34.9414C9.6309 34.819 9.5059 34.6602 9.40173 34.4648C9.29757 34.2695 9.21814 34.0326 9.16345 33.7539C9.10877 33.4753 9.08142 33.1497 9.08142 32.7773V31.9102C9.08142 31.444 9.12309 31.0534 9.20642 30.7383C9.29236 30.4232 9.41345 30.1706 9.5697 29.9805C9.72595 29.7878 9.91345 29.6497 10.1322 29.5664C10.3536 29.4831 10.601 29.4414 10.8744 29.4414C11.0957 29.4414 11.2989 29.4688 11.4838 29.5234C11.6713 29.5755 11.8379 29.6602 11.9838 29.7773C12.1296 29.8919 12.2533 30.0456 12.3549 30.2383C12.459 30.4284 12.5385 30.6615 12.5931 30.9375C12.6478 31.2135 12.6752 31.5378 12.6752 31.9102ZM11.9486 32.8945V31.7891C11.9486 31.5339 11.933 31.3099 11.9017 31.1172C11.8731 30.9219 11.8301 30.7552 11.7728 30.6172C11.7155 30.4792 11.6426 30.3672 11.5541 30.2812C11.4681 30.1953 11.3679 30.1328 11.2533 30.0938C11.1413 30.0521 11.015 30.0312 10.8744 30.0312C10.7025 30.0312 10.5502 30.0638 10.4174 30.1289C10.2845 30.1914 10.1726 30.2917 10.0814 30.4297C9.99288 30.5677 9.92517 30.7487 9.8783 30.9727C9.83142 31.1966 9.80798 31.4688 9.80798 31.7891V32.8945C9.80798 33.1497 9.82231 33.375 9.85095 33.5703C9.8822 33.7656 9.92778 33.9349 9.98767 34.0781C10.0476 34.2188 10.1205 34.3346 10.2064 34.4258C10.2924 34.5169 10.3913 34.5846 10.5033 34.6289C10.6179 34.6706 10.7442 34.6914 10.8822 34.6914C11.0593 34.6914 11.2142 34.6576 11.347 34.5898C11.4799 34.5221 11.5905 34.4167 11.6791 34.2734C11.7702 34.1276 11.8379 33.9414 11.8822 33.7148C11.9265 33.4857 11.9486 33.2122 11.9486 32.8945ZM13.6746 30.9141V30.6133C13.6746 30.3971 13.7214 30.2005 13.8152 30.0234C13.9089 29.8464 14.0431 29.7044 14.2175 29.5977C14.392 29.4909 14.599 29.4375 14.8386 29.4375C15.0834 29.4375 15.2918 29.4909 15.4636 29.5977C15.6381 29.7044 15.7722 29.8464 15.866 30.0234C15.9597 30.2005 16.0066 30.3971 16.0066 30.6133V30.9141C16.0066 31.125 15.9597 31.319 15.866 31.4961C15.7748 31.6732 15.642 31.8151 15.4675 31.9219C15.2957 32.0286 15.0886 32.082 14.8464 32.082C14.6043 32.082 14.3946 32.0286 14.2175 31.9219C14.0431 31.8151 13.9089 31.6732 13.8152 31.4961C13.7214 31.319 13.6746 31.125 13.6746 30.9141ZM14.2175 30.6133V30.9141C14.2175 31.0339 14.2397 31.1471 14.2839 31.2539C14.3308 31.3607 14.4011 31.4479 14.4949 31.5156C14.5886 31.5807 14.7058 31.6133 14.8464 31.6133C14.9871 31.6133 15.1029 31.5807 15.1941 31.5156C15.2852 31.4479 15.3529 31.3607 15.3972 31.2539C15.4415 31.1471 15.4636 31.0339 15.4636 30.9141V30.6133C15.4636 30.4909 15.4402 30.3763 15.3933 30.2695C15.349 30.1602 15.28 30.0729 15.1863 30.0078C15.0951 29.9401 14.9793 29.9062 14.8386 29.9062C14.7006 29.9062 14.5847 29.9401 14.491 30.0078C14.3998 30.0729 14.3308 30.1602 14.2839 30.2695C14.2397 30.3763 14.2175 30.4909 14.2175 30.6133ZM16.4441 34.1172V33.8125C16.4441 33.599 16.491 33.4036 16.5847 33.2266C16.6785 33.0495 16.8126 32.9076 16.9871 32.8008C17.1615 32.694 17.3686 32.6406 17.6082 32.6406C17.8529 32.6406 18.0613 32.694 18.2332 32.8008C18.4076 32.9076 18.5418 33.0495 18.6355 33.2266C18.7293 33.4036 18.7761 33.599 18.7761 33.8125V34.1172C18.7761 34.3307 18.7293 34.526 18.6355 34.7031C18.5444 34.8802 18.4115 35.0221 18.2371 35.1289C18.0652 35.2357 17.8582 35.2891 17.616 35.2891C17.3738 35.2891 17.1654 35.2357 16.991 35.1289C16.8165 35.0221 16.6811 34.8802 16.5847 34.7031C16.491 34.526 16.4441 34.3307 16.4441 34.1172ZM16.9871 33.8125V34.1172C16.9871 34.237 17.0092 34.3516 17.0535 34.4609C17.1003 34.5677 17.1707 34.6549 17.2644 34.7227C17.3582 34.7878 17.4753 34.8203 17.616 34.8203C17.7566 34.8203 17.8725 34.7878 17.9636 34.7227C18.0574 34.6549 18.1264 34.5677 18.1707 34.4609C18.2149 34.3542 18.2371 34.2396 18.2371 34.1172V33.8125C18.2371 33.6901 18.2136 33.5755 18.1668 33.4688C18.1225 33.362 18.0535 33.276 17.9597 33.2109C17.8686 33.1432 17.7514 33.1094 17.6082 33.1094C17.4701 33.1094 17.3543 33.1432 17.2605 33.2109C17.1694 33.276 17.1003 33.362 17.0535 33.4688C17.0092 33.5755 16.9871 33.6901 16.9871 33.8125ZM17.7878 30.3281L15.0105 34.7734L14.6043 34.5156L17.3816 30.0703L17.7878 30.3281Z" fill="black" fill-opacity="0.54"/>
<path d="M7.24609 57.7178H7.30859V58.3311H7.24609C6.86328 58.3311 6.54297 58.3936 6.28516 58.5186C6.02734 58.641 5.82292 58.8063 5.67188 59.0146C5.52083 59.2204 5.41146 59.4521 5.34375 59.71C5.27865 59.9678 5.24609 60.2295 5.24609 60.4951V61.3311C5.24609 61.5837 5.27604 61.8076 5.33594 62.0029C5.39583 62.1956 5.47786 62.3584 5.58203 62.4912C5.6862 62.624 5.80339 62.7243 5.93359 62.792C6.06641 62.8597 6.20443 62.8936 6.34766 62.8936C6.51432 62.8936 6.66276 62.8623 6.79297 62.7998C6.92318 62.7347 7.03255 62.6449 7.12109 62.5303C7.21224 62.4131 7.28125 62.2751 7.32812 62.1162C7.375 61.9574 7.39844 61.7829 7.39844 61.5928C7.39844 61.4235 7.3776 61.2607 7.33594 61.1045C7.29427 60.9456 7.23047 60.805 7.14453 60.6826C7.05859 60.5576 6.95052 60.46 6.82031 60.3896C6.69271 60.3167 6.54036 60.2803 6.36328 60.2803C6.16276 60.2803 5.97526 60.3298 5.80078 60.4287C5.62891 60.5251 5.48698 60.6527 5.375 60.8115C5.26562 60.9678 5.20312 61.1383 5.1875 61.3232L4.80469 61.3193C4.84115 61.0277 4.90885 60.779 5.00781 60.5732C5.10938 60.3649 5.23438 60.1956 5.38281 60.0654C5.53385 59.9326 5.70182 59.8363 5.88672 59.7764C6.07422 59.7139 6.27214 59.6826 6.48047 59.6826C6.76432 59.6826 7.00911 59.736 7.21484 59.8428C7.42057 59.9495 7.58984 60.0928 7.72266 60.2725C7.85547 60.4495 7.95312 60.6501 8.01562 60.874C8.08073 61.0954 8.11328 61.3232 8.11328 61.5576C8.11328 61.8258 8.07552 62.0771 8 62.3115C7.92448 62.5459 7.8112 62.7516 7.66016 62.9287C7.51172 63.1058 7.32812 63.2438 7.10938 63.3428C6.89062 63.4417 6.63672 63.4912 6.34766 63.4912C6.04036 63.4912 5.77214 63.4287 5.54297 63.3037C5.3138 63.1761 5.1237 63.0068 4.97266 62.7959C4.82161 62.585 4.70833 62.3506 4.63281 62.0928C4.55729 61.835 4.51953 61.5732 4.51953 61.3076V60.9678C4.51953 60.5667 4.5599 60.1735 4.64062 59.7881C4.72135 59.4027 4.86068 59.0537 5.05859 58.7412C5.25911 58.4287 5.53646 58.18 5.89062 57.9951C6.24479 57.8102 6.69661 57.7178 7.24609 57.7178ZM12.6752 60.1162V60.9834C12.6752 61.4495 12.6335 61.8428 12.5502 62.1631C12.4668 62.4834 12.347 62.7412 12.1908 62.9365C12.0345 63.1318 11.8457 63.2738 11.6244 63.3623C11.4056 63.4482 11.1582 63.4912 10.8822 63.4912C10.6635 63.4912 10.4616 63.4639 10.2767 63.4092C10.0918 63.3545 9.92517 63.2673 9.77673 63.1475C9.6309 63.0251 9.5059 62.8662 9.40173 62.6709C9.29757 62.4756 9.21814 62.2386 9.16345 61.96C9.10877 61.6813 9.08142 61.3558 9.08142 60.9834V60.1162C9.08142 59.6501 9.12309 59.2594 9.20642 58.9443C9.29236 58.6292 9.41345 58.3766 9.5697 58.1865C9.72595 57.9938 9.91345 57.8558 10.1322 57.7725C10.3536 57.6891 10.601 57.6475 10.8744 57.6475C11.0957 57.6475 11.2989 57.6748 11.4838 57.7295C11.6713 57.7816 11.8379 57.8662 11.9838 57.9834C12.1296 58.098 12.2533 58.2516 12.3549 58.4443C12.459 58.6344 12.5385 58.8675 12.5931 59.1436C12.6478 59.4196 12.6752 59.7438 12.6752 60.1162ZM11.9486 61.1006V59.9951C11.9486 59.7399 11.933 59.516 11.9017 59.3232C11.8731 59.1279 11.8301 58.9613 11.7728 58.8232C11.7155 58.6852 11.6426 58.5732 11.5541 58.4873C11.4681 58.4014 11.3679 58.3389 11.2533 58.2998C11.1413 58.2581 11.015 58.2373 10.8744 58.2373C10.7025 58.2373 10.5502 58.2699 10.4174 58.335C10.2845 58.3975 10.1726 58.4977 10.0814 58.6357C9.99288 58.7738 9.92517 58.9548 9.8783 59.1787C9.83142 59.4027 9.80798 59.6748 9.80798 59.9951V61.1006C9.80798 61.3558 9.82231 61.5811 9.85095 61.7764C9.8822 61.9717 9.92778 62.141 9.98767 62.2842C10.0476 62.4248 10.1205 62.5407 10.2064 62.6318C10.2924 62.723 10.3913 62.7907 10.5033 62.835C10.6179 62.8766 10.7442 62.8975 10.8822 62.8975C11.0593 62.8975 11.2142 62.8636 11.347 62.7959C11.4799 62.7282 11.5905 62.6227 11.6791 62.4795C11.7702 62.3337 11.8379 62.1475 11.8822 61.9209C11.9265 61.6917 11.9486 61.4183 11.9486 61.1006ZM13.6746 59.1201V58.8193C13.6746 58.6032 13.7214 58.4066 13.8152 58.2295C13.9089 58.0524 14.0431 57.9105 14.2175 57.8037C14.392 57.6969 14.599 57.6436 14.8386 57.6436C15.0834 57.6436 15.2918 57.6969 15.4636 57.8037C15.6381 57.9105 15.7722 58.0524 15.866 58.2295C15.9597 58.4066 16.0066 58.6032 16.0066 58.8193V59.1201C16.0066 59.3311 15.9597 59.5251 15.866 59.7021C15.7748 59.8792 15.642 60.0212 15.4675 60.1279C15.2957 60.2347 15.0886 60.2881 14.8464 60.2881C14.6043 60.2881 14.3946 60.2347 14.2175 60.1279C14.0431 60.0212 13.9089 59.8792 13.8152 59.7021C13.7214 59.5251 13.6746 59.3311 13.6746 59.1201ZM14.2175 58.8193V59.1201C14.2175 59.2399 14.2397 59.3532 14.2839 59.46C14.3308 59.5667 14.4011 59.654 14.4949 59.7217C14.5886 59.7868 14.7058 59.8193 14.8464 59.8193C14.9871 59.8193 15.1029 59.7868 15.1941 59.7217C15.2852 59.654 15.3529 59.5667 15.3972 59.46C15.4415 59.3532 15.4636 59.2399 15.4636 59.1201V58.8193C15.4636 58.6969 15.4402 58.5824 15.3933 58.4756C15.349 58.3662 15.28 58.279 15.1863 58.2139C15.0951 58.1462 14.9793 58.1123 14.8386 58.1123C14.7006 58.1123 14.5847 58.1462 14.491 58.2139C14.3998 58.279 14.3308 58.3662 14.2839 58.4756C14.2397 58.5824 14.2175 58.6969 14.2175 58.8193ZM16.4441 62.3232V62.0186C16.4441 61.805 16.491 61.6097 16.5847 61.4326C16.6785 61.2555 16.8126 61.1136 16.9871 61.0068C17.1615 60.9001 17.3686 60.8467 17.6082 60.8467C17.8529 60.8467 18.0613 60.9001 18.2332 61.0068C18.4076 61.1136 18.5418 61.2555 18.6355 61.4326C18.7293 61.6097 18.7761 61.805 18.7761 62.0186V62.3232C18.7761 62.5368 18.7293 62.7321 18.6355 62.9092C18.5444 63.0863 18.4115 63.2282 18.2371 63.335C18.0652 63.4417 17.8582 63.4951 17.616 63.4951C17.3738 63.4951 17.1654 63.4417 16.991 63.335C16.8165 63.2282 16.6811 63.0863 16.5847 62.9092C16.491 62.7321 16.4441 62.5368 16.4441 62.3232ZM16.9871 62.0186V62.3232C16.9871 62.443 17.0092 62.5576 17.0535 62.667C17.1003 62.7738 17.1707 62.861 17.2644 62.9287C17.3582 62.9938 17.4753 63.0264 17.616 63.0264C17.7566 63.0264 17.8725 62.9938 17.9636 62.9287C18.0574 62.861 18.1264 62.7738 18.1707 62.667C18.2149 62.5602 18.2371 62.4456 18.2371 62.3232V62.0186C18.2371 61.8962 18.2136 61.7816 18.1668 61.6748C18.1225 61.568 18.0535 61.4821 17.9597 61.417C17.8686 61.3493 17.7514 61.3154 17.6082 61.3154C17.4701 61.3154 17.3543 61.3493 17.2605 61.417C17.1694 61.4821 17.1003 61.568 17.0535 61.6748C17.0092 61.7816 16.9871 61.8962 16.9871 62.0186ZM17.7878 58.5342L15.0105 62.9795L14.6043 62.7217L17.3816 58.2764L17.7878 58.5342Z" fill="black" fill-opacity="0.54"/>
<path d="M8.31641 89.7061V90.2998H4.20703V89.874L6.75391 85.9326H7.34375L6.71094 87.0732L5.02734 89.7061H8.31641ZM7.52344 85.9326V91.6201H6.80078V85.9326H7.52344ZM12.6752 88.3232V89.1904C12.6752 89.6566 12.6335 90.0498 12.5502 90.3701C12.4668 90.6904 12.347 90.9482 12.1908 91.1436C12.0345 91.3389 11.8457 91.4808 11.6244 91.5693C11.4056 91.6553 11.1582 91.6982 10.8822 91.6982C10.6635 91.6982 10.4616 91.6709 10.2767 91.6162C10.0918 91.5615 9.92517 91.4743 9.77673 91.3545C9.6309 91.2321 9.5059 91.0732 9.40173 90.8779C9.29757 90.6826 9.21814 90.4456 9.16345 90.167C9.10877 89.8883 9.08142 89.5628 9.08142 89.1904V88.3232C9.08142 87.8571 9.12309 87.4665 9.20642 87.1514C9.29236 86.8363 9.41345 86.5837 9.5697 86.3936C9.72595 86.2008 9.91345 86.0628 10.1322 85.9795C10.3536 85.8962 10.601 85.8545 10.8744 85.8545C11.0957 85.8545 11.2989 85.8818 11.4838 85.9365C11.6713 85.9886 11.8379 86.0732 11.9838 86.1904C12.1296 86.305 12.2533 86.4587 12.3549 86.6514C12.459 86.8415 12.5385 87.0745 12.5931 87.3506C12.6478 87.6266 12.6752 87.9508 12.6752 88.3232ZM11.9486 89.3076V88.2021C11.9486 87.9469 11.933 87.723 11.9017 87.5303C11.8731 87.335 11.8301 87.1683 11.7728 87.0303C11.7155 86.8923 11.6426 86.7803 11.5541 86.6943C11.4681 86.6084 11.3679 86.5459 11.2533 86.5068C11.1413 86.4652 11.015 86.4443 10.8744 86.4443C10.7025 86.4443 10.5502 86.4769 10.4174 86.542C10.2845 86.6045 10.1726 86.7048 10.0814 86.8428C9.99288 86.9808 9.92517 87.1618 9.8783 87.3857C9.83142 87.6097 9.80798 87.8818 9.80798 88.2021V89.3076C9.80798 89.5628 9.82231 89.7881 9.85095 89.9834C9.8822 90.1787 9.92778 90.348 9.98767 90.4912C10.0476 90.6318 10.1205 90.7477 10.2064 90.8389C10.2924 90.93 10.3913 90.9977 10.5033 91.042C10.6179 91.0837 10.7442 91.1045 10.8822 91.1045C11.0593 91.1045 11.2142 91.0706 11.347 91.0029C11.4799 90.9352 11.5905 90.8298 11.6791 90.6865C11.7702 90.5407 11.8379 90.3545 11.8822 90.1279C11.9265 89.8988 11.9486 89.6253 11.9486 89.3076ZM13.6746 87.3271V87.0264C13.6746 86.8102 13.7214 86.6136 13.8152 86.4365C13.9089 86.2594 14.0431 86.1175 14.2175 86.0107C14.392 85.904 14.599 85.8506 14.8386 85.8506C15.0834 85.8506 15.2918 85.904 15.4636 86.0107C15.6381 86.1175 15.7722 86.2594 15.866 86.4365C15.9597 86.6136 16.0066 86.8102 16.0066 87.0264V87.3271C16.0066 87.5381 15.9597 87.7321 15.866 87.9092C15.7748 88.0863 15.642 88.2282 15.4675 88.335C15.2957 88.4417 15.0886 88.4951 14.8464 88.4951C14.6043 88.4951 14.3946 88.4417 14.2175 88.335C14.0431 88.2282 13.9089 88.0863 13.8152 87.9092C13.7214 87.7321 13.6746 87.5381 13.6746 87.3271ZM14.2175 87.0264V87.3271C14.2175 87.4469 14.2397 87.5602 14.2839 87.667C14.3308 87.7738 14.4011 87.861 14.4949 87.9287C14.5886 87.9938 14.7058 88.0264 14.8464 88.0264C14.9871 88.0264 15.1029 87.9938 15.1941 87.9287C15.2852 87.861 15.3529 87.7738 15.3972 87.667C15.4415 87.5602 15.4636 87.4469 15.4636 87.3271V87.0264C15.4636 86.904 15.4402 86.7894 15.3933 86.6826C15.349 86.5732 15.28 86.486 15.1863 86.4209C15.0951 86.3532 14.9793 86.3193 14.8386 86.3193C14.7006 86.3193 14.5847 86.3532 14.491 86.4209C14.3998 86.486 14.3308 86.5732 14.2839 86.6826C14.2397 86.7894 14.2175 86.904 14.2175 87.0264ZM16.4441 90.5303V90.2256C16.4441 90.012 16.491 89.8167 16.5847 89.6396C16.6785 89.4626 16.8126 89.3206 16.9871 89.2139C17.1615 89.1071 17.3686 89.0537 17.6082 89.0537C17.8529 89.0537 18.0613 89.1071 18.2332 89.2139C18.4076 89.3206 18.5418 89.4626 18.6355 89.6396C18.7293 89.8167 18.7761 90.012 18.7761 90.2256V90.5303C18.7761 90.7438 18.7293 90.9391 18.6355 91.1162C18.5444 91.2933 18.4115 91.4352 18.2371 91.542C18.0652 91.6488 17.8582 91.7021 17.616 91.7021C17.3738 91.7021 17.1654 91.6488 16.991 91.542C16.8165 91.4352 16.6811 91.2933 16.5847 91.1162C16.491 90.9391 16.4441 90.7438 16.4441 90.5303ZM16.9871 90.2256V90.5303C16.9871 90.6501 17.0092 90.7646 17.0535 90.874C17.1003 90.9808 17.1707 91.068 17.2644 91.1357C17.3582 91.2008 17.4753 91.2334 17.616 91.2334C17.7566 91.2334 17.8725 91.2008 17.9636 91.1357C18.0574 91.068 18.1264 90.9808 18.1707 90.874C18.2149 90.7673 18.2371 90.6527 18.2371 90.5303V90.2256C18.2371 90.1032 18.2136 89.9886 18.1668 89.8818C18.1225 89.7751 18.0535 89.6891 17.9597 89.624C17.8686 89.5563 17.7514 89.5225 17.6082 89.5225C17.4701 89.5225 17.3543 89.5563 17.2605 89.624C17.1694 89.6891 17.1003 89.7751 17.0535 89.8818C17.0092 89.9886 16.9871 90.1032 16.9871 90.2256ZM17.7878 86.7412L15.0105 91.1865L14.6043 90.9287L17.3816 86.4834L17.7878 86.7412Z" fill="black" fill-opacity="0.54"/>
<path d="M8.19922 119.233V119.827H4.47656V119.308L6.33984 117.233C6.56901 116.978 6.74609 116.762 6.87109 116.585C6.9987 116.405 7.08724 116.245 7.13672 116.104C7.1888 115.961 7.21484 115.815 7.21484 115.667C7.21484 115.479 7.17578 115.31 7.09766 115.159C7.02214 115.006 6.91016 114.883 6.76172 114.792C6.61328 114.701 6.43359 114.655 6.22266 114.655C5.97005 114.655 5.75911 114.705 5.58984 114.804C5.42318 114.9 5.29818 115.035 5.21484 115.21C5.13151 115.384 5.08984 115.585 5.08984 115.812H4.36719C4.36719 115.491 4.4375 115.198 4.57812 114.933C4.71875 114.667 4.92708 114.456 5.20312 114.3C5.47917 114.141 5.81901 114.062 6.22266 114.062C6.58203 114.062 6.88932 114.125 7.14453 114.253C7.39974 114.378 7.59505 114.555 7.73047 114.784C7.86849 115.011 7.9375 115.276 7.9375 115.581C7.9375 115.748 7.90885 115.917 7.85156 116.089C7.79688 116.258 7.72005 116.427 7.62109 116.597C7.52474 116.766 7.41146 116.933 7.28125 117.097C7.15365 117.261 7.01693 117.422 6.87109 117.581L5.34766 119.233H8.19922ZM12.6752 116.53V117.397C12.6752 117.864 12.6335 118.257 12.5502 118.577C12.4668 118.897 12.347 119.155 12.1908 119.351C12.0345 119.546 11.8457 119.688 11.6244 119.776C11.4056 119.862 11.1582 119.905 10.8822 119.905C10.6635 119.905 10.4616 119.878 10.2767 119.823C10.0918 119.769 9.92517 119.681 9.77673 119.562C9.6309 119.439 9.5059 119.28 9.40173 119.085C9.29757 118.89 9.21814 118.653 9.16345 118.374C9.10877 118.095 9.08142 117.77 9.08142 117.397V116.53C9.08142 116.064 9.12309 115.674 9.20642 115.358C9.29236 115.043 9.41345 114.791 9.5697 114.601C9.72595 114.408 9.91345 114.27 10.1322 114.187C10.3536 114.103 10.601 114.062 10.8744 114.062C11.0957 114.062 11.2989 114.089 11.4838 114.144C11.6713 114.196 11.8379 114.28 11.9838 114.397C12.1296 114.512 12.2533 114.666 12.3549 114.858C12.459 115.049 12.5385 115.282 12.5931 115.558C12.6478 115.834 12.6752 116.158 12.6752 116.53ZM11.9486 117.515V116.409C11.9486 116.154 11.933 115.93 11.9017 115.737C11.8731 115.542 11.8301 115.375 11.7728 115.237C11.7155 115.099 11.6426 114.987 11.5541 114.901C11.4681 114.815 11.3679 114.753 11.2533 114.714C11.1413 114.672 11.015 114.651 10.8744 114.651C10.7025 114.651 10.5502 114.684 10.4174 114.749C10.2845 114.812 10.1726 114.912 10.0814 115.05C9.99288 115.188 9.92517 115.369 9.8783 115.593C9.83142 115.817 9.80798 116.089 9.80798 116.409V117.515C9.80798 117.77 9.82231 117.995 9.85095 118.19C9.8822 118.386 9.92778 118.555 9.98767 118.698C10.0476 118.839 10.1205 118.955 10.2064 119.046C10.2924 119.137 10.3913 119.205 10.5033 119.249C10.6179 119.291 10.7442 119.312 10.8822 119.312C11.0593 119.312 11.2142 119.278 11.347 119.21C11.4799 119.142 11.5905 119.037 11.6791 118.894C11.7702 118.748 11.8379 118.562 11.8822 118.335C11.9265 118.106 11.9486 117.832 11.9486 117.515ZM13.6746 115.534V115.233C13.6746 115.017 13.7214 114.821 13.8152 114.644C13.9089 114.466 14.0431 114.325 14.2175 114.218C14.392 114.111 14.599 114.058 14.8386 114.058C15.0834 114.058 15.2918 114.111 15.4636 114.218C15.6381 114.325 15.7722 114.466 15.866 114.644C15.9597 114.821 16.0066 115.017 16.0066 115.233V115.534C16.0066 115.745 15.9597 115.939 15.866 116.116C15.7748 116.293 15.642 116.435 15.4675 116.542C15.2957 116.649 15.0886 116.702 14.8464 116.702C14.6043 116.702 14.3946 116.649 14.2175 116.542C14.0431 116.435 13.9089 116.293 13.8152 116.116C13.7214 115.939 13.6746 115.745 13.6746 115.534ZM14.2175 115.233V115.534C14.2175 115.654 14.2397 115.767 14.2839 115.874C14.3308 115.981 14.4011 116.068 14.4949 116.136C14.5886 116.201 14.7058 116.233 14.8464 116.233C14.9871 116.233 15.1029 116.201 15.1941 116.136C15.2852 116.068 15.3529 115.981 15.3972 115.874C15.4415 115.767 15.4636 115.654 15.4636 115.534V115.233C15.4636 115.111 15.4402 114.996 15.3933 114.89C15.349 114.78 15.28 114.693 15.1863 114.628C15.0951 114.56 14.9793 114.526 14.8386 114.526C14.7006 114.526 14.5847 114.56 14.491 114.628C14.3998 114.693 14.3308 114.78 14.2839 114.89C14.2397 114.996 14.2175 115.111 14.2175 115.233ZM16.4441 118.737V118.433C16.4441 118.219 16.491 118.024 16.5847 117.847C16.6785 117.67 16.8126 117.528 16.9871 117.421C17.1615 117.314 17.3686 117.261 17.6082 117.261C17.8529 117.261 18.0613 117.314 18.2332 117.421C18.4076 117.528 18.5418 117.67 18.6355 117.847C18.7293 118.024 18.7761 118.219 18.7761 118.433V118.737C18.7761 118.951 18.7293 119.146 18.6355 119.323C18.5444 119.5 18.4115 119.642 18.2371 119.749C18.0652 119.856 17.8582 119.909 17.616 119.909C17.3738 119.909 17.1654 119.856 16.991 119.749C16.8165 119.642 16.6811 119.5 16.5847 119.323C16.491 119.146 16.4441 118.951 16.4441 118.737ZM16.9871 118.433V118.737C16.9871 118.857 17.0092 118.972 17.0535 119.081C17.1003 119.188 17.1707 119.275 17.2644 119.343C17.3582 119.408 17.4753 119.44 17.616 119.44C17.7566 119.44 17.8725 119.408 17.9636 119.343C18.0574 119.275 18.1264 119.188 18.1707 119.081C18.2149 118.974 18.2371 118.86 18.2371 118.737V118.433C18.2371 118.31 18.2136 118.196 18.1668 118.089C18.1225 117.982 18.0535 117.896 17.9597 117.831C17.8686 117.763 17.7514 117.729 17.6082 117.729C17.4701 117.729 17.3543 117.763 17.2605 117.831C17.1694 117.896 17.1003 117.982 17.0535 118.089C17.0092 118.196 16.9871 118.31 16.9871 118.433ZM17.7878 114.948L15.0105 119.394L14.6043 119.136L17.3816 114.69L17.7878 114.948Z" fill="black" fill-opacity="0.54"/>
<path d="M13.043 144.737V145.604C13.043 146.071 13.0013 146.464 12.918 146.784C12.8346 147.104 12.7148 147.362 12.5586 147.558C12.4023 147.753 12.2135 147.895 11.9922 147.983C11.7734 148.069 11.526 148.112 11.25 148.112C11.0312 148.112 10.8294 148.085 10.6445 148.03C10.4596 147.976 10.293 147.888 10.1445 147.769C9.9987 147.646 9.8737 147.487 9.76953 147.292C9.66536 147.097 9.58594 146.86 9.53125 146.581C9.47656 146.302 9.44922 145.977 9.44922 145.604V144.737C9.44922 144.271 9.49089 143.881 9.57422 143.565C9.66016 143.25 9.78125 142.998 9.9375 142.808C10.0938 142.615 10.2812 142.477 10.5 142.394C10.7214 142.31 10.9688 142.269 11.2422 142.269C11.4635 142.269 11.6667 142.296 11.8516 142.351C12.0391 142.403 12.2057 142.487 12.3516 142.604C12.4974 142.719 12.6211 142.873 12.7227 143.065C12.8268 143.256 12.9062 143.489 12.9609 143.765C13.0156 144.041 13.043 144.365 13.043 144.737ZM12.3164 145.722V144.616C12.3164 144.361 12.3008 144.137 12.2695 143.944C12.2409 143.749 12.1979 143.582 12.1406 143.444C12.0833 143.306 12.0104 143.194 11.9219 143.108C11.8359 143.022 11.7357 142.96 11.6211 142.921C11.5091 142.879 11.3828 142.858 11.2422 142.858C11.0703 142.858 10.918 142.891 10.7852 142.956C10.6523 143.019 10.5404 143.119 10.4492 143.257C10.3607 143.395 10.293 143.576 10.2461 143.8C10.1992 144.024 10.1758 144.296 10.1758 144.616V145.722C10.1758 145.977 10.1901 146.202 10.2188 146.397C10.25 146.593 10.2956 146.762 10.3555 146.905C10.4154 147.046 10.4883 147.162 10.5742 147.253C10.6602 147.344 10.7591 147.412 10.8711 147.456C10.9857 147.498 11.112 147.519 11.25 147.519C11.4271 147.519 11.582 147.485 11.7148 147.417C11.8477 147.349 11.9583 147.244 12.0469 147.101C12.138 146.955 12.2057 146.769 12.25 146.542C12.2943 146.313 12.3164 146.039 12.3164 145.722ZM14.0424 143.741V143.44C14.0424 143.224 14.0892 143.028 14.183 142.851C14.2767 142.674 14.4108 142.532 14.5853 142.425C14.7598 142.318 14.9668 142.265 15.2064 142.265C15.4512 142.265 15.6595 142.318 15.8314 142.425C16.0059 142.532 16.14 142.674 16.2338 142.851C16.3275 143.028 16.3744 143.224 16.3744 143.44V143.741C16.3744 143.952 16.3275 144.146 16.2338 144.323C16.1426 144.5 16.0098 144.642 15.8353 144.749C15.6635 144.856 15.4564 144.909 15.2142 144.909C14.972 144.909 14.7624 144.856 14.5853 144.749C14.4108 144.642 14.2767 144.5 14.183 144.323C14.0892 144.146 14.0424 143.952 14.0424 143.741ZM14.5853 143.44V143.741C14.5853 143.861 14.6075 143.974 14.6517 144.081C14.6986 144.188 14.7689 144.275 14.8627 144.343C14.9564 144.408 15.0736 144.44 15.2142 144.44C15.3549 144.44 15.4707 144.408 15.5619 144.343C15.653 144.275 15.7207 144.188 15.765 144.081C15.8093 143.974 15.8314 143.861 15.8314 143.741V143.44C15.8314 143.318 15.808 143.203 15.7611 143.097C15.7168 142.987 15.6478 142.9 15.5541 142.835C15.4629 142.767 15.347 142.733 15.2064 142.733C15.0684 142.733 14.9525 142.767 14.8588 142.835C14.7676 142.9 14.6986 142.987 14.6517 143.097C14.6075 143.203 14.5853 143.318 14.5853 143.44ZM16.8119 146.944V146.64C16.8119 146.426 16.8588 146.231 16.9525 146.054C17.0463 145.877 17.1804 145.735 17.3549 145.628C17.5293 145.521 17.7364 145.468 17.976 145.468C18.2207 145.468 18.4291 145.521 18.601 145.628C18.7754 145.735 18.9095 145.877 19.0033 146.054C19.097 146.231 19.1439 146.426 19.1439 146.64V146.944C19.1439 147.158 19.097 147.353 19.0033 147.53C18.9122 147.707 18.7793 147.849 18.6049 147.956C18.433 148.063 18.226 148.116 17.9838 148.116C17.7416 148.116 17.5332 148.063 17.3588 147.956C17.1843 147.849 17.0489 147.707 16.9525 147.53C16.8588 147.353 16.8119 147.158 16.8119 146.944ZM17.3549 146.64V146.944C17.3549 147.064 17.377 147.179 17.4213 147.288C17.4681 147.395 17.5385 147.482 17.6322 147.55C17.726 147.615 17.8431 147.647 17.9838 147.647C18.1244 147.647 18.2403 147.615 18.3314 147.55C18.4252 147.482 18.4942 147.395 18.5385 147.288C18.5827 147.181 18.6049 147.067 18.6049 146.944V146.64C18.6049 146.517 18.5814 146.403 18.5345 146.296C18.4903 146.189 18.4213 146.103 18.3275 146.038C18.2364 145.97 18.1192 145.937 17.976 145.937C17.8379 145.937 17.722 145.97 17.6283 146.038C17.5372 146.103 17.4681 146.189 17.4213 146.296C17.377 146.403 17.3549 146.517 17.3549 146.64ZM18.1556 143.155L15.3783 147.601L14.972 147.343L17.7494 142.897L18.1556 143.155Z" fill="black" fill-opacity="0.54"/>
<path d="M138 58C138 56.8954 138.895 56 140 56H154C155.105 56 156 56.8954 156 58V146H138V58Z" fill="#3FA71A"/>
<path d="M25 4.16113L200 4.16116" stroke="black" stroke-opacity="0.12"/>
<path d="M25 33.1611L200 33.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 61.1611L200 61.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 89.1611L200 89.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 118.161L200 118.161" stroke="black" stroke-opacity="0.12"/>
<line x1="23.2" y1="145.961" x2="202.8" y2="145.961" stroke="black" stroke-opacity="0.7" stroke-width="0.4" stroke-linecap="square"/>
<line x1="40.4502" y1="148.072" x2="40.4502" y2="147.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M32.5091 152.025V152.893C32.5091 153.359 32.4674 153.752 32.3841 154.072C32.3007 154.393 32.1809 154.65 32.0247 154.846C31.8684 155.041 31.6796 155.183 31.4583 155.271C31.2395 155.357 30.9921 155.4 30.7161 155.4C30.4973 155.4 30.2955 155.373 30.1106 155.318C29.9257 155.264 29.7591 155.176 29.6106 155.057C29.4648 154.934 29.3398 154.775 29.2356 154.58C29.1315 154.385 29.052 154.148 28.9973 153.869C28.9427 153.59 28.9153 153.265 28.9153 152.893V152.025C28.9153 151.559 28.957 151.169 29.0403 150.854C29.1262 150.538 29.2473 150.286 29.4036 150.096C29.5598 149.903 29.7473 149.765 29.9661 149.682C30.1874 149.598 30.4348 149.557 30.7083 149.557C30.9296 149.557 31.1328 149.584 31.3177 149.639C31.5052 149.691 31.6718 149.775 31.8177 149.893C31.9635 150.007 32.0872 150.161 32.1887 150.354C32.2929 150.544 32.3723 150.777 32.427 151.053C32.4817 151.329 32.5091 151.653 32.5091 152.025ZM31.7825 153.01V151.904C31.7825 151.649 31.7669 151.425 31.7356 151.232C31.707 151.037 31.664 150.87 31.6067 150.732C31.5494 150.594 31.4765 150.482 31.388 150.396C31.302 150.311 31.2018 150.248 31.0872 150.209C30.9752 150.167 30.8489 150.146 30.7083 150.146C30.5364 150.146 30.3841 150.179 30.2512 150.244C30.1184 150.307 30.0065 150.407 29.9153 150.545C29.8268 150.683 29.7591 150.864 29.7122 151.088C29.6653 151.312 29.6419 151.584 29.6419 151.904V153.01C29.6419 153.265 29.6562 153.49 29.6848 153.686C29.7161 153.881 29.7617 154.05 29.8216 154.193C29.8815 154.334 29.9544 154.45 30.0403 154.541C30.1262 154.632 30.2252 154.7 30.3372 154.744C30.4518 154.786 30.5781 154.807 30.7161 154.807C30.8932 154.807 31.0481 154.773 31.1809 154.705C31.3137 154.637 31.4244 154.532 31.513 154.389C31.6041 154.243 31.6718 154.057 31.7161 153.83C31.7604 153.601 31.7825 153.327 31.7825 153.01ZM35.8964 149.604V155.322H35.1737V150.506L33.7167 151.037V150.385L35.7831 149.604H35.8964ZM41.1124 149.635V155.322H40.3585V149.635H41.1124ZM43.4952 152.193V152.811H40.9483V152.193H43.4952ZM43.8819 149.635V150.252H40.9483V149.635H43.8819ZM46.4216 155.4C46.1273 155.4 45.8604 155.351 45.6208 155.252C45.3838 155.15 45.1794 155.008 45.0075 154.826C44.8383 154.644 44.7081 154.428 44.6169 154.178C44.5258 153.928 44.4802 153.654 44.4802 153.357V153.193C44.4802 152.85 44.531 152.544 44.6325 152.275C44.7341 152.005 44.8721 151.775 45.0466 151.588C45.2211 151.4 45.419 151.258 45.6403 151.162C45.8617 151.066 46.0909 151.018 46.3278 151.018C46.6299 151.018 46.8903 151.07 47.1091 151.174C47.3305 151.278 47.5114 151.424 47.6521 151.611C47.7927 151.796 47.8969 152.015 47.9646 152.268C48.0323 152.518 48.0661 152.791 48.0661 153.088V153.412H44.9099V152.822H47.3435V152.768C47.3331 152.58 47.294 152.398 47.2263 152.221C47.1612 152.044 47.057 151.898 46.9138 151.783C46.7706 151.669 46.5752 151.611 46.3278 151.611C46.1638 151.611 46.0127 151.646 45.8747 151.717C45.7367 151.785 45.6182 151.886 45.5193 152.021C45.4203 152.157 45.3435 152.322 45.2888 152.518C45.2341 152.713 45.2068 152.938 45.2068 153.193V153.357C45.2068 153.558 45.2341 153.747 45.2888 153.924C45.3461 154.098 45.4281 154.252 45.5349 154.385C45.6443 154.518 45.7758 154.622 45.9294 154.697C46.0857 154.773 46.2627 154.811 46.4607 154.811C46.7159 154.811 46.932 154.758 47.1091 154.654C47.2862 154.55 47.4411 154.411 47.5739 154.236L48.0114 154.584C47.9203 154.722 47.8044 154.854 47.6638 154.979C47.5232 155.104 47.35 155.205 47.1443 155.283C46.9411 155.361 46.7002 155.4 46.4216 155.4ZM48.9886 149.322H49.7152V154.502L49.6527 155.322H48.9886V149.322ZM52.5706 153.174V153.256C52.5706 153.563 52.5342 153.848 52.4613 154.111C52.3883 154.372 52.2816 154.598 52.1409 154.791C52.0003 154.984 51.8284 155.133 51.6253 155.24C51.4222 155.347 51.1891 155.4 50.9261 155.4C50.6579 155.4 50.4222 155.355 50.2191 155.264C50.0185 155.17 49.8493 155.036 49.7113 154.861C49.5732 154.687 49.4626 154.476 49.3792 154.229C49.2985 153.981 49.2425 153.702 49.2113 153.393V153.033C49.2425 152.721 49.2985 152.441 49.3792 152.193C49.4626 151.946 49.5732 151.735 49.7113 151.561C49.8493 151.383 50.0185 151.249 50.2191 151.158C50.4196 151.064 50.6527 151.018 50.9183 151.018C51.1839 151.018 51.4196 151.07 51.6253 151.174C51.831 151.275 52.0029 151.421 52.1409 151.611C52.2816 151.801 52.3883 152.029 52.4613 152.295C52.5342 152.558 52.5706 152.851 52.5706 153.174ZM51.8441 153.256V153.174C51.8441 152.963 51.8245 152.765 51.7855 152.58C51.7464 152.393 51.6839 152.229 51.598 152.088C51.512 151.945 51.3988 151.833 51.2581 151.752C51.1175 151.669 50.9443 151.627 50.7386 151.627C50.5563 151.627 50.3975 151.658 50.262 151.721C50.1292 151.783 50.0159 151.868 49.9222 151.975C49.8284 152.079 49.7516 152.199 49.6917 152.334C49.6344 152.467 49.5915 152.605 49.5628 152.748V153.689C49.6045 153.872 49.6722 154.048 49.7659 154.217C49.8623 154.383 49.9899 154.52 50.1488 154.627C50.3102 154.734 50.5094 154.787 50.7464 154.787C50.9417 154.787 51.1084 154.748 51.2464 154.67C51.387 154.589 51.5003 154.479 51.5863 154.338C51.6748 154.197 51.7399 154.035 51.7816 153.85C51.8232 153.665 51.8441 153.467 51.8441 153.256Z" fill="black" fill-opacity="0.54"/>
<g clip-path="url(#clip1_4053_185113)">
<line x1="75.8501" y1="147.072" x2="75.8501" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M67.909 152.025V152.893C67.909 153.359 67.8673 153.752 67.784 154.072C67.7006 154.393 67.5808 154.65 67.4246 154.846C67.2683 155.041 67.0795 155.183 66.8582 155.271C66.6394 155.357 66.392 155.4 66.116 155.4C65.8972 155.4 65.6954 155.373 65.5105 155.318C65.3256 155.264 65.159 155.176 65.0105 155.057C64.8647 154.934 64.7397 154.775 64.6355 154.58C64.5314 154.385 64.4519 154.148 64.3972 153.869C64.3426 153.59 64.3152 153.265 64.3152 152.893V152.025C64.3152 151.559 64.3569 151.169 64.4402 150.854C64.5261 150.538 64.6472 150.286 64.8035 150.096C64.9597 149.903 65.1472 149.765 65.366 149.682C65.5873 149.598 65.8347 149.557 66.1082 149.557C66.3295 149.557 66.5327 149.584 66.7176 149.639C66.9051 149.691 67.0717 149.775 67.2176 149.893C67.3634 150.007 67.4871 150.161 67.5886 150.354C67.6928 150.544 67.7722 150.777 67.8269 151.053C67.8816 151.329 67.909 151.653 67.909 152.025ZM67.1824 153.01V151.904C67.1824 151.649 67.1668 151.425 67.1355 151.232C67.1069 151.037 67.0639 150.87 67.0066 150.732C66.9493 150.594 66.8764 150.482 66.7879 150.396C66.7019 150.311 66.6017 150.248 66.4871 150.209C66.3751 150.167 66.2488 150.146 66.1082 150.146C65.9363 150.146 65.784 150.179 65.6511 150.244C65.5183 150.307 65.4064 150.407 65.3152 150.545C65.2267 150.683 65.159 150.864 65.1121 151.088C65.0652 151.312 65.0418 151.584 65.0418 151.904V153.01C65.0418 153.265 65.0561 153.49 65.0847 153.686C65.116 153.881 65.1616 154.05 65.2215 154.193C65.2814 154.334 65.3543 154.45 65.4402 154.541C65.5261 154.632 65.6251 154.7 65.7371 154.744C65.8517 154.786 65.978 154.807 66.116 154.807C66.2931 154.807 66.448 154.773 66.5808 154.705C66.7136 154.637 66.8243 154.532 66.9129 154.389C67.004 154.243 67.0717 154.057 67.116 153.83C67.1603 153.601 67.1824 153.327 67.1824 153.01ZM72.6478 154.729V155.322H68.9252V154.803L70.7885 152.729C71.0176 152.473 71.1947 152.257 71.3197 152.08C71.4473 151.9 71.5359 151.74 71.5853 151.6C71.6374 151.456 71.6635 151.311 71.6635 151.162C71.6635 150.975 71.6244 150.805 71.5463 150.654C71.4708 150.501 71.3588 150.378 71.2103 150.287C71.0619 150.196 70.8822 150.15 70.6713 150.15C70.4187 150.15 70.2077 150.2 70.0385 150.299C69.8718 150.395 69.7468 150.531 69.6635 150.705C69.5801 150.88 69.5385 151.08 69.5385 151.307H68.8158C68.8158 150.986 68.8861 150.693 69.0267 150.428C69.1674 150.162 69.3757 149.951 69.6517 149.795C69.9278 149.636 70.2676 149.557 70.6713 149.557C71.0307 149.557 71.3379 149.62 71.5932 149.748C71.8484 149.873 72.0437 150.05 72.1791 150.279C72.3171 150.506 72.3861 150.771 72.3861 151.076C72.3861 151.243 72.3575 151.412 72.3002 151.584C72.2455 151.753 72.1687 151.923 72.0697 152.092C71.9734 152.261 71.8601 152.428 71.7299 152.592C71.6023 152.756 71.4655 152.917 71.3197 153.076L69.7963 154.729H72.6478ZM76.5123 149.635V155.322H75.7584V149.635H76.5123ZM78.8951 152.193V152.811H76.3482V152.193H78.8951ZM79.2818 149.635V150.252H76.3482V149.635H79.2818ZM81.8215 155.4C81.5272 155.4 81.2603 155.351 81.0207 155.252C80.7837 155.15 80.5793 155.008 80.4074 154.826C80.2382 154.644 80.108 154.428 80.0168 154.178C79.9257 153.928 79.8801 153.654 79.8801 153.357V153.193C79.8801 152.85 79.9309 152.544 80.0324 152.275C80.134 152.005 80.272 151.775 80.4465 151.588C80.621 151.4 80.8189 151.258 81.0402 151.162C81.2616 151.066 81.4908 151.018 81.7277 151.018C82.0298 151.018 82.2902 151.07 82.509 151.174C82.7304 151.278 82.9113 151.424 83.052 151.611C83.1926 151.796 83.2968 152.015 83.3645 152.268C83.4322 152.518 83.466 152.791 83.466 153.088V153.412H80.3098V152.822H82.7434V152.768C82.733 152.58 82.6939 152.398 82.6262 152.221C82.5611 152.044 82.4569 151.898 82.3137 151.783C82.1705 151.669 81.9751 151.611 81.7277 151.611C81.5637 151.611 81.4126 151.646 81.2746 151.717C81.1366 151.785 81.0181 151.886 80.9192 152.021C80.8202 152.157 80.7434 152.322 80.6887 152.518C80.634 152.713 80.6067 152.938 80.6067 153.193V153.357C80.6067 153.558 80.634 153.747 80.6887 153.924C80.746 154.098 80.828 154.252 80.9348 154.385C81.0442 154.518 81.1757 154.622 81.3293 154.697C81.4856 154.773 81.6626 154.811 81.8606 154.811C82.1158 154.811 82.3319 154.758 82.509 154.654C82.6861 154.55 82.841 154.411 82.9738 154.236L83.4113 154.584C83.3202 154.722 83.2043 154.854 83.0637 154.979C82.9231 155.104 82.7499 155.205 82.5442 155.283C82.341 155.361 82.1001 155.4 81.8215 155.4ZM84.3885 149.322H85.1151V154.502L85.0526 155.322H84.3885V149.322ZM87.9705 153.174V153.256C87.9705 153.563 87.9341 153.848 87.8612 154.111C87.7882 154.372 87.6815 154.598 87.5408 154.791C87.4002 154.984 87.2283 155.133 87.0252 155.24C86.8221 155.347 86.589 155.4 86.326 155.4C86.0578 155.4 85.8221 155.355 85.619 155.264C85.4185 155.17 85.2492 155.036 85.1112 154.861C84.9731 154.687 84.8625 154.476 84.7791 154.229C84.6984 153.981 84.6424 153.702 84.6112 153.393V153.033C84.6424 152.721 84.6984 152.441 84.7791 152.193C84.8625 151.946 84.9731 151.735 85.1112 151.561C85.2492 151.383 85.4185 151.249 85.619 151.158C85.8195 151.064 86.0526 151.018 86.3182 151.018C86.5838 151.018 86.8195 151.07 87.0252 151.174C87.231 151.275 87.4028 151.421 87.5408 151.611C87.6815 151.801 87.7882 152.029 87.8612 152.295C87.9341 152.558 87.9705 152.851 87.9705 153.174ZM87.244 153.256V153.174C87.244 152.963 87.2244 152.765 87.1854 152.58C87.1463 152.393 87.0838 152.229 86.9979 152.088C86.9119 151.945 86.7987 151.833 86.658 151.752C86.5174 151.669 86.3442 151.627 86.1385 151.627C85.9562 151.627 85.7974 151.658 85.6619 151.721C85.5291 151.783 85.4158 151.868 85.3221 151.975C85.2283 152.079 85.1515 152.199 85.0916 152.334C85.0343 152.467 84.9914 152.605 84.9627 152.748V153.689C85.0044 153.872 85.0721 154.048 85.1658 154.217C85.2622 154.383 85.3898 154.52 85.5487 154.627C85.7101 154.734 85.9093 154.787 86.1463 154.787C86.3416 154.787 86.5083 154.748 86.6463 154.67C86.7869 154.589 86.9002 154.479 86.9862 154.338C87.0747 154.197 87.1398 154.035 87.1815 153.85C87.2231 153.665 87.244 153.467 87.244 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip2_4053_185113)">
<line x1="111.25" y1="147.072" x2="111.25" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M103.309 152.025V152.893C103.309 153.359 103.267 153.752 103.184 154.072C103.101 154.393 102.981 154.65 102.824 154.846C102.668 155.041 102.479 155.183 102.258 155.271C102.039 155.357 101.792 155.4 101.516 155.4C101.297 155.4 101.095 155.373 100.91 155.318C100.726 155.264 100.559 155.176 100.41 155.057C100.265 154.934 100.14 154.775 100.035 154.58C99.9313 154.385 99.8518 154.148 99.7971 153.869C99.7425 153.59 99.7151 153.265 99.7151 152.893V152.025C99.7151 151.559 99.7568 151.169 99.8401 150.854C99.9261 150.538 100.047 150.286 100.203 150.096C100.36 149.903 100.547 149.765 100.766 149.682C100.987 149.598 101.235 149.557 101.508 149.557C101.729 149.557 101.933 149.584 102.117 149.639C102.305 149.691 102.472 149.775 102.617 149.893C102.763 150.007 102.887 150.161 102.989 150.354C103.093 150.544 103.172 150.777 103.227 151.053C103.282 151.329 103.309 151.653 103.309 152.025ZM102.582 153.01V151.904C102.582 151.649 102.567 151.425 102.535 151.232C102.507 151.037 102.464 150.87 102.407 150.732C102.349 150.594 102.276 150.482 102.188 150.396C102.102 150.311 102.002 150.248 101.887 150.209C101.775 150.167 101.649 150.146 101.508 150.146C101.336 150.146 101.184 150.179 101.051 150.244C100.918 150.307 100.806 150.407 100.715 150.545C100.627 150.683 100.559 150.864 100.512 151.088C100.465 151.312 100.442 151.584 100.442 151.904V153.01C100.442 153.265 100.456 153.49 100.485 153.686C100.516 153.881 100.561 154.05 100.621 154.193C100.681 154.334 100.754 154.45 100.84 154.541C100.926 154.632 101.025 154.7 101.137 154.744C101.252 154.786 101.378 154.807 101.516 154.807C101.693 154.807 101.848 154.773 101.981 154.705C102.114 154.637 102.224 154.532 102.313 154.389C102.404 154.243 102.472 154.057 102.516 153.83C102.56 153.601 102.582 153.327 102.582 153.01ZM105.376 152.123H105.891C106.144 152.123 106.352 152.081 106.516 151.998C106.683 151.912 106.807 151.796 106.888 151.65C106.971 151.502 107.013 151.335 107.013 151.15C107.013 150.932 106.976 150.748 106.903 150.6C106.83 150.451 106.721 150.339 106.575 150.264C106.429 150.188 106.244 150.15 106.02 150.15C105.817 150.15 105.638 150.191 105.481 150.271C105.328 150.35 105.207 150.462 105.118 150.607C105.032 150.753 104.989 150.925 104.989 151.123H104.266C104.266 150.834 104.339 150.571 104.485 150.334C104.631 150.097 104.836 149.908 105.099 149.768C105.364 149.627 105.671 149.557 106.02 149.557C106.364 149.557 106.665 149.618 106.923 149.74C107.181 149.86 107.381 150.04 107.524 150.279C107.668 150.516 107.739 150.812 107.739 151.166C107.739 151.309 107.705 151.463 107.638 151.627C107.572 151.788 107.47 151.939 107.329 152.08C107.191 152.221 107.011 152.337 106.79 152.428C106.569 152.516 106.303 152.561 105.993 152.561H105.376V152.123ZM105.376 152.717V152.283H105.993C106.355 152.283 106.655 152.326 106.891 152.412C107.128 152.498 107.315 152.613 107.45 152.756C107.588 152.899 107.684 153.057 107.739 153.229C107.796 153.398 107.825 153.567 107.825 153.736C107.825 154.002 107.78 154.238 107.688 154.443C107.6 154.649 107.474 154.824 107.309 154.967C107.148 155.11 106.958 155.218 106.739 155.291C106.52 155.364 106.282 155.4 106.024 155.4C105.777 155.4 105.544 155.365 105.325 155.295C105.109 155.225 104.918 155.123 104.751 154.99C104.584 154.855 104.454 154.689 104.36 154.494C104.266 154.296 104.22 154.071 104.22 153.818H104.942C104.942 154.016 104.985 154.189 105.071 154.338C105.16 154.486 105.285 154.602 105.446 154.686C105.61 154.766 105.803 154.807 106.024 154.807C106.246 154.807 106.436 154.769 106.595 154.693C106.756 154.615 106.88 154.498 106.966 154.342C107.054 154.186 107.099 153.989 107.099 153.752C107.099 153.515 107.049 153.321 106.95 153.17C106.851 153.016 106.711 152.903 106.528 152.83C106.349 152.755 106.136 152.717 105.891 152.717H105.376ZM111.912 149.635V155.322H111.158V149.635H111.912ZM114.295 152.193V152.811H111.748V152.193H114.295ZM114.682 149.635V150.252H111.748V149.635H114.682ZM117.221 155.4C116.927 155.4 116.66 155.351 116.421 155.252C116.184 155.15 115.979 155.008 115.807 154.826C115.638 154.644 115.508 154.428 115.417 154.178C115.326 153.928 115.28 153.654 115.28 153.357V153.193C115.28 152.85 115.331 152.544 115.432 152.275C115.534 152.005 115.672 151.775 115.846 151.588C116.021 151.4 116.219 151.258 116.44 151.162C116.662 151.066 116.891 151.018 117.128 151.018C117.43 151.018 117.69 151.07 117.909 151.174C118.13 151.278 118.311 151.424 118.452 151.611C118.592 151.796 118.697 152.015 118.764 152.268C118.832 152.518 118.866 152.791 118.866 153.088V153.412H115.71V152.822H118.143V152.768C118.133 152.58 118.094 152.398 118.026 152.221C117.961 152.044 117.857 151.898 117.714 151.783C117.57 151.669 117.375 151.611 117.128 151.611C116.964 151.611 116.813 151.646 116.675 151.717C116.537 151.785 116.418 151.886 116.319 152.021C116.22 152.157 116.143 152.322 116.089 152.518C116.034 152.713 116.007 152.938 116.007 153.193V153.357C116.007 153.558 116.034 153.747 116.089 153.924C116.146 154.098 116.228 154.252 116.335 154.385C116.444 154.518 116.576 154.622 116.729 154.697C116.885 154.773 117.063 154.811 117.26 154.811C117.516 154.811 117.732 154.758 117.909 154.654C118.086 154.55 118.241 154.411 118.374 154.236L118.811 154.584C118.72 154.722 118.604 154.854 118.464 154.979C118.323 155.104 118.15 155.205 117.944 155.283C117.741 155.361 117.5 155.4 117.221 155.4ZM119.788 149.322H120.515V154.502L120.452 155.322H119.788V149.322ZM123.37 153.174V153.256C123.37 153.563 123.334 153.848 123.261 154.111C123.188 154.372 123.081 154.598 122.941 154.791C122.8 154.984 122.628 155.133 122.425 155.24C122.222 155.347 121.989 155.4 121.726 155.4C121.458 155.4 121.222 155.355 121.019 155.264C120.818 155.17 120.649 155.036 120.511 154.861C120.373 154.687 120.262 154.476 120.179 154.229C120.098 153.981 120.042 153.702 120.011 153.393V153.033C120.042 152.721 120.098 152.441 120.179 152.193C120.262 151.946 120.373 151.735 120.511 151.561C120.649 151.383 120.818 151.249 121.019 151.158C121.219 151.064 121.452 151.018 121.718 151.018C121.984 151.018 122.219 151.07 122.425 151.174C122.631 151.275 122.803 151.421 122.941 151.611C123.081 151.801 123.188 152.029 123.261 152.295C123.334 152.558 123.37 152.851 123.37 153.174ZM122.644 153.256V153.174C122.644 152.963 122.624 152.765 122.585 152.58C122.546 152.393 122.484 152.229 122.398 152.088C122.312 151.945 122.199 151.833 122.058 151.752C121.917 151.669 121.744 151.627 121.538 151.627C121.356 151.627 121.197 151.658 121.062 151.721C120.929 151.783 120.816 151.868 120.722 151.975C120.628 152.079 120.551 152.199 120.492 152.334C120.434 152.467 120.391 152.605 120.363 152.748V153.689C120.404 153.872 120.472 154.048 120.566 154.217C120.662 154.383 120.79 154.52 120.949 154.627C121.11 154.734 121.309 154.787 121.546 154.787C121.742 154.787 121.908 154.748 122.046 154.67C122.187 154.589 122.3 154.479 122.386 154.338C122.475 154.197 122.54 154.035 122.581 153.85C122.623 153.665 122.644 153.467 122.644 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip3_4053_185113)">
<line x1="146.65" y1="147.072" x2="146.65" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M138.709 152.025V152.893C138.709 153.359 138.668 153.752 138.584 154.072C138.501 154.393 138.381 154.65 138.225 154.846C138.069 155.041 137.88 155.183 137.658 155.271C137.44 155.357 137.192 155.4 136.916 155.4C136.698 155.4 136.496 155.373 136.311 155.318C136.126 155.264 135.959 155.176 135.811 155.057C135.665 154.934 135.54 154.775 135.436 154.58C135.332 154.385 135.252 154.148 135.198 153.869C135.143 153.59 135.116 153.265 135.116 152.893V152.025C135.116 151.559 135.157 151.169 135.241 150.854C135.326 150.538 135.448 150.286 135.604 150.096C135.76 149.903 135.948 149.765 136.166 149.682C136.388 149.598 136.635 149.557 136.908 149.557C137.13 149.557 137.333 149.584 137.518 149.639C137.705 149.691 137.872 149.775 138.018 149.893C138.164 150.007 138.287 150.161 138.389 150.354C138.493 150.544 138.573 150.777 138.627 151.053C138.682 151.329 138.709 151.653 138.709 152.025ZM137.983 153.01V151.904C137.983 151.649 137.967 151.425 137.936 151.232C137.907 151.037 137.864 150.87 137.807 150.732C137.75 150.594 137.677 150.482 137.588 150.396C137.502 150.311 137.402 150.248 137.287 150.209C137.175 150.167 137.049 150.146 136.908 150.146C136.737 150.146 136.584 150.179 136.451 150.244C136.319 150.307 136.207 150.407 136.116 150.545C136.027 150.683 135.959 150.864 135.912 151.088C135.866 151.312 135.842 151.584 135.842 151.904V153.01C135.842 153.265 135.856 153.49 135.885 153.686C135.916 153.881 135.962 154.05 136.022 154.193C136.082 154.334 136.155 154.45 136.241 154.541C136.326 154.632 136.425 154.7 136.537 154.744C136.652 154.786 136.778 154.807 136.916 154.807C137.093 154.807 137.248 154.773 137.381 154.705C137.514 154.637 137.625 154.532 137.713 154.389C137.804 154.243 137.872 154.057 137.916 153.83C137.961 153.601 137.983 153.327 137.983 153.01ZM143.565 153.408V154.002H139.456V153.576L142.003 149.635H142.593L141.96 150.775L140.276 153.408H143.565ZM142.772 149.635V155.322H142.05V149.635H142.772ZM147.313 149.635V155.322H146.559V149.635H147.313ZM149.695 152.193V152.811H147.149V152.193H149.695ZM150.082 149.635V150.252H147.149V149.635H150.082ZM152.622 155.4C152.328 155.4 152.061 155.351 151.821 155.252C151.584 155.15 151.38 155.008 151.208 154.826C151.038 154.644 150.908 154.428 150.817 154.178C150.726 153.928 150.68 153.654 150.68 153.357V153.193C150.68 152.85 150.731 152.544 150.833 152.275C150.934 152.005 151.072 151.775 151.247 151.588C151.421 151.4 151.619 151.258 151.841 151.162C152.062 151.066 152.291 151.018 152.528 151.018C152.83 151.018 153.091 151.07 153.309 151.174C153.531 151.278 153.712 151.424 153.852 151.611C153.993 151.796 154.097 152.015 154.165 152.268C154.232 152.518 154.266 152.791 154.266 153.088V153.412H151.11V152.822H153.544V152.768C153.533 152.58 153.494 152.398 153.426 152.221C153.361 152.044 153.257 151.898 153.114 151.783C152.971 151.669 152.775 151.611 152.528 151.611C152.364 151.611 152.213 151.646 152.075 151.717C151.937 151.785 151.818 151.886 151.719 152.021C151.62 152.157 151.544 152.322 151.489 152.518C151.434 152.713 151.407 152.938 151.407 153.193V153.357C151.407 153.558 151.434 153.747 151.489 153.924C151.546 154.098 151.628 154.252 151.735 154.385C151.844 154.518 151.976 154.622 152.13 154.697C152.286 154.773 152.463 154.811 152.661 154.811C152.916 154.811 153.132 154.758 153.309 154.654C153.486 154.55 153.641 154.411 153.774 154.236L154.212 154.584C154.12 154.722 154.005 154.854 153.864 154.979C153.723 155.104 153.55 155.205 153.344 155.283C153.141 155.361 152.9 155.4 152.622 155.4ZM155.189 149.322H155.915V154.502L155.853 155.322H155.189V149.322ZM158.771 153.174V153.256C158.771 153.563 158.734 153.848 158.661 154.111C158.589 154.372 158.482 154.598 158.341 154.791C158.201 154.984 158.029 155.133 157.826 155.24C157.622 155.347 157.389 155.4 157.126 155.4C156.858 155.4 156.622 155.355 156.419 155.264C156.219 155.17 156.049 155.036 155.911 154.861C155.773 154.687 155.663 154.476 155.579 154.229C155.499 153.981 155.443 153.702 155.411 153.393V153.033C155.443 152.721 155.499 152.441 155.579 152.193C155.663 151.946 155.773 151.735 155.911 151.561C156.049 151.383 156.219 151.249 156.419 151.158C156.62 151.064 156.853 151.018 157.118 151.018C157.384 151.018 157.62 151.07 157.826 151.174C158.031 151.275 158.203 151.421 158.341 151.611C158.482 151.801 158.589 152.029 158.661 152.295C158.734 152.558 158.771 152.851 158.771 153.174ZM158.044 153.256V153.174C158.044 152.963 158.025 152.765 157.986 152.58C157.947 152.393 157.884 152.229 157.798 152.088C157.712 151.945 157.599 151.833 157.458 151.752C157.318 151.669 157.145 151.627 156.939 151.627C156.757 151.627 156.598 151.658 156.462 151.721C156.329 151.783 156.216 151.868 156.122 151.975C156.029 152.079 155.952 152.199 155.892 152.334C155.835 152.467 155.792 152.605 155.763 152.748V153.689C155.805 153.872 155.872 154.048 155.966 154.217C156.062 154.383 156.19 154.52 156.349 154.627C156.51 154.734 156.71 154.787 156.947 154.787C157.142 154.787 157.309 154.748 157.447 154.67C157.587 154.589 157.701 154.479 157.786 154.338C157.875 154.197 157.94 154.035 157.982 153.85C158.023 153.665 158.044 153.467 158.044 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip4_4053_185113)">
<line x1="182.05" y1="147.072" x2="182.05" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M174.109 152.025V152.893C174.109 153.359 174.067 153.752 173.984 154.072C173.901 154.393 173.781 154.65 173.625 154.846C173.469 155.041 173.28 155.183 173.058 155.271C172.84 155.357 172.592 155.4 172.316 155.4C172.097 155.4 171.896 155.373 171.711 155.318C171.526 155.264 171.359 155.176 171.211 155.057C171.065 154.934 170.94 154.775 170.836 154.58C170.732 154.385 170.652 154.148 170.597 153.869C170.543 153.59 170.515 153.265 170.515 152.893V152.025C170.515 151.559 170.557 151.169 170.64 150.854C170.726 150.538 170.847 150.286 171.004 150.096C171.16 149.903 171.347 149.765 171.566 149.682C171.788 149.598 172.035 149.557 172.308 149.557C172.53 149.557 172.733 149.584 172.918 149.639C173.105 149.691 173.272 149.775 173.418 149.893C173.564 150.007 173.687 150.161 173.789 150.354C173.893 150.544 173.972 150.777 174.027 151.053C174.082 151.329 174.109 151.653 174.109 152.025ZM173.383 153.01V151.904C173.383 151.649 173.367 151.425 173.336 151.232C173.307 151.037 173.264 150.87 173.207 150.732C173.15 150.594 173.077 150.482 172.988 150.396C172.902 150.311 172.802 150.248 172.687 150.209C172.575 150.167 172.449 150.146 172.308 150.146C172.136 150.146 171.984 150.179 171.851 150.244C171.719 150.307 171.607 150.407 171.515 150.545C171.427 150.683 171.359 150.864 171.312 151.088C171.265 151.312 171.242 151.584 171.242 151.904V153.01C171.242 153.265 171.256 153.49 171.285 153.686C171.316 153.881 171.362 154.05 171.422 154.193C171.482 154.334 171.554 154.45 171.64 154.541C171.726 154.632 171.825 154.7 171.937 154.744C172.052 154.786 172.178 154.807 172.316 154.807C172.493 154.807 172.648 154.773 172.781 154.705C172.914 154.637 173.025 154.532 173.113 154.389C173.204 154.243 173.272 154.057 173.316 153.83C173.36 153.601 173.383 153.327 173.383 153.01ZM176.036 152.615L175.457 152.467L175.743 149.635H178.661V150.303H176.356L176.184 151.85C176.288 151.79 176.42 151.734 176.579 151.682C176.74 151.63 176.925 151.604 177.133 151.604C177.396 151.604 177.632 151.649 177.84 151.74C178.049 151.829 178.226 151.956 178.371 152.123C178.52 152.29 178.633 152.49 178.711 152.725C178.789 152.959 178.829 153.221 178.829 153.51C178.829 153.783 178.791 154.035 178.715 154.264C178.642 154.493 178.532 154.693 178.383 154.865C178.235 155.035 178.047 155.166 177.821 155.26C177.597 155.354 177.332 155.4 177.028 155.4C176.799 155.4 176.581 155.369 176.375 155.307C176.172 155.242 175.99 155.144 175.829 155.014C175.67 154.881 175.539 154.717 175.438 154.521C175.339 154.324 175.276 154.092 175.25 153.826H175.938C175.969 154.04 176.032 154.219 176.125 154.365C176.219 154.511 176.342 154.622 176.493 154.697C176.646 154.77 176.825 154.807 177.028 154.807C177.2 154.807 177.352 154.777 177.485 154.717C177.618 154.657 177.73 154.571 177.821 154.459C177.912 154.347 177.981 154.212 178.028 154.053C178.077 153.894 178.102 153.715 178.102 153.518C178.102 153.338 178.077 153.171 178.028 153.018C177.978 152.864 177.904 152.73 177.805 152.615C177.709 152.501 177.59 152.412 177.45 152.35C177.309 152.285 177.148 152.252 176.965 152.252C176.723 152.252 176.539 152.285 176.414 152.35C176.292 152.415 176.166 152.503 176.036 152.615ZM182.713 149.635V155.322H181.959V149.635H182.713ZM185.095 152.193V152.811H182.548V152.193H185.095ZM185.482 149.635V150.252H182.548V149.635H185.482ZM188.022 155.4C187.727 155.4 187.46 155.351 187.221 155.252C186.984 155.15 186.78 155.008 186.608 154.826C186.438 154.644 186.308 154.428 186.217 154.178C186.126 153.928 186.08 153.654 186.08 153.357V153.193C186.08 152.85 186.131 152.544 186.233 152.275C186.334 152.005 186.472 151.775 186.647 151.588C186.821 151.4 187.019 151.258 187.24 151.162C187.462 151.066 187.691 151.018 187.928 151.018C188.23 151.018 188.49 151.07 188.709 151.174C188.931 151.278 189.112 151.424 189.252 151.611C189.393 151.796 189.497 152.015 189.565 152.268C189.632 152.518 189.666 152.791 189.666 153.088V153.412H186.51V152.822H188.944V152.768C188.933 152.58 188.894 152.398 188.826 152.221C188.761 152.044 188.657 151.898 188.514 151.783C188.371 151.669 188.175 151.611 187.928 151.611C187.764 151.611 187.613 151.646 187.475 151.717C187.337 151.785 187.218 151.886 187.119 152.021C187.02 152.157 186.944 152.322 186.889 152.518C186.834 152.713 186.807 152.938 186.807 153.193V153.357C186.807 153.558 186.834 153.747 186.889 153.924C186.946 154.098 187.028 154.252 187.135 154.385C187.244 154.518 187.376 154.622 187.53 154.697C187.686 154.773 187.863 154.811 188.061 154.811C188.316 154.811 188.532 154.758 188.709 154.654C188.886 154.55 189.041 154.411 189.174 154.236L189.612 154.584C189.52 154.722 189.405 154.854 189.264 154.979C189.123 155.104 188.95 155.205 188.744 155.283C188.541 155.361 188.3 155.4 188.022 155.4ZM190.589 149.322H191.315V154.502L191.253 155.322H190.589V149.322ZM194.171 153.174V153.256C194.171 153.563 194.134 153.848 194.061 154.111C193.988 154.372 193.882 154.598 193.741 154.791C193.6 154.984 193.429 155.133 193.225 155.24C193.022 155.347 192.789 155.4 192.526 155.4C192.258 155.4 192.022 155.355 191.819 155.264C191.619 155.17 191.449 155.036 191.311 154.861C191.173 154.687 191.063 154.476 190.979 154.229C190.899 153.981 190.843 153.702 190.811 153.393V153.033C190.843 152.721 190.899 152.441 190.979 152.193C191.063 151.946 191.173 151.735 191.311 151.561C191.449 151.383 191.619 151.249 191.819 151.158C192.02 151.064 192.253 151.018 192.518 151.018C192.784 151.018 193.02 151.07 193.225 151.174C193.431 151.275 193.603 151.421 193.741 151.611C193.882 151.801 193.988 152.029 194.061 152.295C194.134 152.558 194.171 152.851 194.171 153.174ZM193.444 153.256V153.174C193.444 152.963 193.425 152.765 193.386 152.58C193.347 152.393 193.284 152.229 193.198 152.088C193.112 151.945 192.999 151.833 192.858 151.752C192.718 151.669 192.544 151.627 192.339 151.627C192.156 151.627 191.998 151.658 191.862 151.721C191.729 151.783 191.616 151.868 191.522 151.975C191.429 152.079 191.352 152.199 191.292 152.334C191.235 152.467 191.192 152.605 191.163 152.748V153.689C191.205 153.872 191.272 154.048 191.366 154.217C191.462 154.383 191.59 154.52 191.749 154.627C191.91 154.734 192.11 154.787 192.347 154.787C192.542 154.787 192.708 154.748 192.847 154.67C192.987 154.589 193.1 154.479 193.186 154.338C193.275 154.197 193.34 154.035 193.382 153.85C193.423 153.665 193.444 153.467 193.444 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<path d="M27 107.445L40 88.0962L75.865 45.0802C76.2166 44.6586 76.8423 44.5992 77.2669 44.9471L111.135 72.7006C111.366 72.8902 111.67 72.9662 111.963 72.908L146.794 65.991C146.93 65.964 147.059 65.9089 147.172 65.8292L184.267 39.8468C184.419 39.74 184.539 39.5927 184.612 39.4215L198.5 7" stroke="#FBDB0F" stroke-width="2" stroke-linecap="round"/>
<circle cx="76" cy="45.1611" r="1.5" fill="white" stroke="#FBDB0F"/>
<circle cx="112" cy="73.1611" r="1.5" fill="white" stroke="#FBDB0F"/>
<circle cx="147" cy="66.1611" r="1.5" fill="white" stroke="#FBDB0F"/>
<circle cx="185" cy="39.1611" r="1.5" fill="white" stroke="#FBDB0F"/>
<circle cx="198" cy="7" r="1.5" fill="white" stroke="#FBDB0F"/>
<path d="M28.5 107.114C28.5 107.972 27.8197 108.651 27 108.651C26.1803 108.651 25.5 107.972 25.5 107.114C25.5 106.256 26.1803 105.576 27 105.576C27.8197 105.576 28.5 106.256 28.5 107.114Z" fill="white" stroke="#FBDB0F"/>
<path d="M41.5 87.7768C41.5 88.6347 40.8197 89.3143 40 89.3143C39.1803 89.3143 38.5 88.6347 38.5 87.7768C38.5 86.9188 39.1803 86.2393 40 86.2393C40.8197 86.2393 41.5 86.9188 41.5 87.7768Z" fill="white" stroke="#FBDB0F"/>
<path d="M32 122C32 120.895 32.8954 120 34 120H48C49.1046 120 50 120.895 50 122V146H32V122Z" fill="#3FA71A"/>
<path d="M67 78C67 76.8954 67.8954 76 69 76H83C84.1046 76 85 76.8954 85 78V146H67V78Z" fill="#3FA71A"/>
<path d="M102 92C102 90.8954 102.895 90 104 90H118C119.105 90 120 90.8954 120 92V146H102V92Z" fill="#3FA71A"/>
<path d="M173 105C173 103.895 173.895 103 175 103H189C190.105 103 191 103.895 191 105V146H173V105Z" fill="#3FA71A"/>
<path d="M27 118L40 71.7792L78.5 84L119 32L148 36.5L182 71.7792L195.311 100.216L197 107" stroke="#4B70DD" stroke-width="2" stroke-linecap="round"/>
<circle cx="78" cy="84.1611" r="1.5" fill="white" stroke="#4B70DD"/>
<circle cx="40" cy="72.1611" r="1.5" fill="white" stroke="#4B70DD"/>
<circle cx="119" cy="32" r="1.5" fill="white" stroke="#4B70DD"/>
<circle cx="182" cy="72.1611" r="1.5" fill="white" stroke="#4B70DD"/>
<circle cx="197" cy="107" r="1.5" fill="white" stroke="#4B70DD"/>
<circle cx="27" cy="117.161" r="1.5" fill="white" stroke="#4B70DD"/>
<circle cx="147" cy="37.1611" r="1.5" fill="white" stroke="#4B70DD"/>
</g>
<defs>
<clipPath id="clip0_4053_185113">
<rect width="200" height="160" fill="white"/>
</clipPath>
<clipPath id="clip1_4053_185113">
<rect width="35.4" height="10.322" fill="white" transform="translate(58.3999 146)"/>
</clipPath>
<clipPath id="clip2_4053_185113">
<rect width="35.4" height="10.322" fill="white" transform="translate(93.7998 146)"/>
</clipPath>
<clipPath id="clip3_4053_185113">
<rect width="35.4" height="10.322" fill="white" transform="translate(129.2 146)"/>
</clipPath>
<clipPath id="clip4_4053_185113">
<rect width="35.4" height="10.322" fill="white" transform="translate(164.6 146)"/>
</clipPath>
</defs>
</svg>
",
+ "description": "Displays changes to time-series data over time—for example, temperature or humidity readings.",
+ "descriptor": {
+ "type": "timeseries",
+ "sizeX": 8,
+ "sizeY": 5,
+ "resources": [],
+ "templateHtml": "\n",
+ "templateCss": "",
+ "controllerScript": "self.onInit = function() {\n self.ctx.$scope.timeSeriesChartWidget.onInit();\n};\n\nself.onDataUpdated = function() {\n self.ctx.$scope.timeSeriesChartWidget.onDataUpdated();\n}\n\nself.onLatestDataUpdated = function() {\n self.ctx.$scope.timeSeriesChartWidget.onLatestDataUpdated();\n}\n\nself.typeParameters = function() {\n return {\n previewWidth: '80%',\n embedTitlePanel: true,\n hasAdditionalLatestDataKeys: true,\n dataKeySettingsFunction: TbTimeSeriesChart.dataKeySettings(),\n defaultDataKeysFunction: function() {\n return [{ name: 'temperature', label: 'Temperature', type: 'timeseries', units: '°C', decimals: 0 }];\n }\n };\n}\n",
+ "settingsSchema": "{}",
+ "dataKeySettingsSchema": "{}",
+ "latestDataKeySettingsSchema": "{}",
+ "settingsDirective": "tb-time-series-chart-widget-settings",
+ "dataKeySettingsDirective": "tb-time-series-chart-key-settings",
+ "latestDataKeySettingsDirective": "",
+ "hasBasicMode": true,
+ "basicModeDirective": "tb-time-series-chart-basic-config",
+ "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#FFC107\",\"settings\":{\"type\":\"bar\"},\"_hash\":0.5534217244004682,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]},\"latestDataKeys\":null}],\"timewindow\":{\"hideInterval\":false,\"hideLastInterval\":false,\"hideQuickInterval\":false,\"hideAggregation\":false,\"hideAggInterval\":false,\"hideTimezone\":false,\"selectedTab\":0,\"realtime\":{\"realtimeType\":0,\"timewindowMs\":60000,\"quickInterval\":\"CURRENT_DAY\",\"interval\":1000},\"aggregation\":{\"type\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"showLegend\":true,\"legendConfig\":{\"direction\":\"column\",\"position\":\"top\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":true,\"showTotal\":false,\"showLatest\":false},\"thresholds\":[],\"dataZoom\":true,\"stack\":false,\"yAxis\":{\"show\":true,\"label\":\"\",\"labelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"600\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.54)\",\"position\":\"left\",\"showTickLabels\":true,\"tickLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"tickLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"showTicks\":true,\"ticksColor\":\"rgba(0, 0, 0, 0.54)\",\"showLine\":true,\"lineColor\":\"rgba(0, 0, 0, 0.54)\",\"showSplitLines\":true,\"splitLinesColor\":\"rgba(0, 0, 0, 0.12)\"},\"xAxis\":{\"show\":true,\"label\":\"\",\"labelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"600\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.54)\",\"position\":\"bottom\",\"showTickLabels\":true,\"tickLabelFont\":{\"family\":\"Roboto\",\"size\":10,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"tickLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"ticksFormat\":{},\"showTicks\":true,\"ticksColor\":\"rgba(0, 0, 0, 0.54)\",\"showLine\":true,\"lineColor\":\"rgba(0, 0, 0, 0.54)\",\"showSplitLines\":true,\"splitLinesColor\":\"rgba(0, 0, 0, 0.12)\"},\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipTrigger\":\"axis\",\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":null,\"lastUpdateAgo\":false,\"custom\":false,\"auto\":true,\"autoDateFormatSettings\":{}},\"tooltipDateFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"tooltipDateColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipDateInterval\":true,\"tooltipBackgroundColor\":\"rgba(255, 255, 255, 0.76)\",\"tooltipBackgroundBlur\":4,\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}},\"yAxes\":{\"default\":{\"units\":null,\"decimals\":0,\"show\":true,\"label\":\"\",\"labelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"600\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.54)\",\"position\":\"left\",\"showTickLabels\":true,\"tickLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"tickLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"ticksFormatter\":null,\"showTicks\":true,\"ticksColor\":\"rgba(0, 0, 0, 0.54)\",\"showLine\":true,\"lineColor\":\"rgba(0, 0, 0, 0.54)\",\"showSplitLines\":true,\"splitLinesColor\":\"rgba(0, 0, 0, 0.12)\",\"id\":\"default\",\"order\":0}},\"noAggregationBarWidthSettings\":{\"strategy\":\"group\",\"groupWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000},\"barWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000}},\"animation\":{\"animation\":true,\"animationThreshold\":2000,\"animationDuration\":500,\"animationEasing\":\"cubicOut\",\"animationDelay\":0,\"animationDurationUpdate\":300,\"animationEasingUpdate\":\"cubicOut\",\"animationDelayUpdate\":0},\"padding\":\"12px\"},\"title\":\"Time series chart\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":null,\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"thermostat\",\"iconColor\":\"#1F6BDD\",\"useDashboardTimewindow\":false,\"displayTimewindow\":true,\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleColor\":\"rgba(0, 0, 0, 0.87)\",\"titleTooltip\":\"\",\"widgetStyle\":{},\"widgetCss\":\"\",\"pageSize\":1024,\"units\":\"\",\"decimals\":null,\"noDataDisplayMessage\":\"\",\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":null,\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true},\"margin\":\"0px\",\"borderRadius\":\"0px\",\"iconSize\":\"0px\"}"
+ },
+ "tags": [
+ "chart",
+ "time series",
+ "time-series",
+ "line",
+ "line chart",
+ "bar",
+ "bar chart",
+ "point",
+ "point chart"
+ ]
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/timeseries_bar_chart.json b/application/src/main/data/json/system/widget_types/timeseries_bar_chart.json
index ff9c7971f0..ebb0d2680d 100644
--- a/application/src/main/data/json/system/widget_types/timeseries_bar_chart.json
+++ b/application/src/main/data/json/system/widget_types/timeseries_bar_chart.json
@@ -1,8 +1,8 @@
{
"fqn": "charts.timeseries_bars_flot",
"name": "Timeseries Bar Chart",
- "deprecated": false,
- "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAABOFBMVEUAAAA3oPR3d3d6enp8fHyBgYGDg4OGhoaNjY2RkZGSkpKTk5OUlJSVlZWWlpaXl5eYmJiZmZmampqcnJydnZ2enp6goKChoaGioqKjo6OkpKSlpaWmpqanp6eoqKipqamqqqqrq6usrKytra2urq6wsLCxsbGysrK0tLS1tbW2tra3t7e4uLi5ubm6urq8vLy9vb2+vr6/v7/AwMDBwcHDw8PExMTHx8fIyMjJycnLy8vNzc3Ozs7Pz8/S0tLT09PU1NTV1dXW1tbX19fZ2dna2trb29vc3Nzd3d3e3t7f39/h4eHi4uLj4+Pk5OTl5eXm5ubn5+fo6Ojq6urr6+vs7Ozt7e3u7u7v7+/w8PDx8fH09PT19fX29vb39/f4+Pj5+fn6+vr7+/v8/Pz9/f3+/v7/xx////8KXFhiAAAAAWJLR0RnW9PpswAAAvtJREFUeNrt3GtXElEUBuDpZlAqylVHCyMwyi4SpkaWAl4qk8wwUhJlmOn9//+gLzbKbc6AAm5991p82WvPOedZZw6zYM3aGupCQ4tYkZDSsKDrocNVvz8jHQKYY1ZiT/6OAJllRPSpsnzIqIG9SjYmHpKfAzI4CIuHjJeBtyHfZwCatiI1/m+BYV2Dw35NniOEEEIIIYQQQgghhBBCCCGEEEIIIYQQQgghhBBCCCGEEEIIIYQQUp/6Wx+DgbRbxOAhEb/fXJ98akiH1AIAHtSWlqRDSvdDGcOHnYR0SPV7zVsaQyHeO0jTJapEV5C9bUz9fIjsvHRIefhRxHqpjxzA3ftajXOudHGJOtHV+1rV04/wHenDc2QQkFbLJISQwUDaP90IIYQQQgghpAvIxRO9gFxG4lZ9XBFIx6sihJD+QVRjEEIIIYQQcoMgahkhhBDSe0iLX3ydQdSLIKR9ghCJkIYEIYQQIhPS8d+AhPQboppFw9HMxBrs/lqCIbObpgezP67YjnQ8iwagHDzrryUZUgsUz/prCYZY05vn+msJhiwM6XrR7q/V9OJU4xQuEpcxRsezNPbXEn3Yzz9Hulg3IYT0C3LxxI2CNCQIIYQQQgghhBBCCCGEEEIIIYQQQgghhBBCCCGEEEIIIYQQQlpA7P5a0iF2fy3hkLP+WsIhVbu/lvRby+6vJR1i99eSG6ffu1XHxlRNcfWq3I0iIK4tJK2nXVyV0lOqEmvjGWAtvnCu+jMzkQWMiOlYdRSd3MAH/UnVPWR/ApFfSkcpiOBvRc3XtAeYW1ZUJbZMD5C8azhWLX4xvZVR692Se0huHm9ySogxkhs3lFVewPM4WlFUlUMoJEYUox1+jAFIbLuHrKaQWlMu8TicDp+4gdw7/qS4t2qBohk4UUF2nieBfLyDM/ItgXhBucT113i14QbixW7M+SRNb6EQ0u8kHavyZQxj2/kgNUCsYDRoqXfEF/Mdu4G8D43uOtakh3R9H1DsyKZvOmneDjt+D/0DTzolrPMHmggAAAAASUVORK5CYII=",
+ "deprecated": true,
+ "image": "tb-image:dGltZXNlcmllc19iYXJfY2hhcnRfc3lzdGVtX3dpZGdldF9pbWFnZS5wbmc=:IlRpbWVzZXJpZXMgQmFyIENoYXJ0IiBzeXN0ZW0gd2lkZ2V0IGltYWdl;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAABOFBMVEUAAAA3oPR3d3d6enp8fHyBgYGDg4OGhoaNjY2RkZGSkpKTk5OUlJSVlZWWlpaXl5eYmJiZmZmampqcnJydnZ2enp6goKChoaGioqKjo6OkpKSlpaWmpqanp6eoqKipqamqqqqrq6usrKytra2urq6wsLCxsbGysrK0tLS1tbW2tra3t7e4uLi5ubm6urq8vLy9vb2+vr6/v7/AwMDBwcHDw8PExMTHx8fIyMjJycnLy8vNzc3Ozs7Pz8/S0tLT09PU1NTV1dXW1tbX19fZ2dna2trb29vc3Nzd3d3e3t7f39/h4eHi4uLj4+Pk5OTl5eXm5ubn5+fo6Ojq6urr6+vs7Ozt7e3u7u7v7+/w8PDx8fH09PT19fX29vb39/f4+Pj5+fn6+vr7+/v8/Pz9/f3+/v7/xx////8KXFhiAAAAAWJLR0RnW9PpswAAAvtJREFUeNrt3GtXElEUBuDpZlAqylVHCyMwyi4SpkaWAl4qk8wwUhJlmOn9//+gLzbKbc6AAm5991p82WvPOedZZw6zYM3aGupCQ4tYkZDSsKDrocNVvz8jHQKYY1ZiT/6OAJllRPSpsnzIqIG9SjYmHpKfAzI4CIuHjJeBtyHfZwCatiI1/m+BYV2Dw35NniOEEEIIIYQQQgghhBBCCCGEEEIIIYQQQgghhBBCCCGEEEIIIYQQUp/6Wx+DgbRbxOAhEb/fXJ98akiH1AIAHtSWlqRDSvdDGcOHnYR0SPV7zVsaQyHeO0jTJapEV5C9bUz9fIjsvHRIefhRxHqpjxzA3ftajXOudHGJOtHV+1rV04/wHenDc2QQkFbLJISQwUDaP90IIYQQQgghpAvIxRO9gFxG4lZ9XBFIx6sihJD+QVRjEEIIIYQQcoMgahkhhBDSe0iLX3ydQdSLIKR9ghCJkIYEIYQQIhPS8d+AhPQboppFw9HMxBrs/lqCIbObpgezP67YjnQ8iwagHDzrryUZUgsUz/prCYZY05vn+msJhiwM6XrR7q/V9OJU4xQuEpcxRsezNPbXEn3Yzz9Hulg3IYT0C3LxxI2CNCQIIYQQQgghhBBCCCGEEEIIIYQQQgghhBBCCCGEEEIIIYQQQlpA7P5a0iF2fy3hkLP+WsIhVbu/lvRby+6vJR1i99eSG6ffu1XHxlRNcfWq3I0iIK4tJK2nXVyV0lOqEmvjGWAtvnCu+jMzkQWMiOlYdRSd3MAH/UnVPWR/ApFfSkcpiOBvRc3XtAeYW1ZUJbZMD5C8azhWLX4xvZVR692Se0huHm9ySogxkhs3lFVewPM4WlFUlUMoJEYUox1+jAFIbLuHrKaQWlMu8TicDp+4gdw7/qS4t2qBohk4UUF2nieBfLyDM/ItgXhBucT113i14QbixW7M+SRNb6EQ0u8kHavyZQxj2/kgNUCsYDRoqXfEF/Mdu4G8D43uOtakh3R9H1DsyKZvOmneDjt+D/0DTzolrPMHmggAAAAASUVORK5CYII=",
"description": "Displays changes to time-series data over time—for example, daily water consumption for the last month.",
"descriptor": {
"type": "timeseries",
@@ -21,6 +21,5 @@
"basicModeDirective": "tb-flot-basic-config",
"defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":false,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":false,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.12775350966079668,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000},\"aggregation\":{\"limit\":200,\"type\":\"AVG\"}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"stack\":true,\"fontSize\":10,\"fontColor\":\"#545454\",\"showTooltip\":true,\"tooltipIndividual\":false,\"tooltipCumulative\":false,\"hideZeros\":false,\"grid\":{\"verticalLines\":true,\"horizontalLines\":true,\"outlineWidth\":1,\"color\":\"#545454\",\"backgroundColor\":null,\"tickColor\":\"#DDDDDD\"},\"xaxis\":{\"title\":null,\"showLabels\":true,\"color\":\"#545454\"},\"yaxis\":{\"min\":null,\"max\":null,\"title\":null,\"showLabels\":true,\"color\":\"#545454\",\"tickSize\":null,\"tickDecimals\":0,\"ticksFormatter\":\"\"},\"defaultBarWidth\":600,\"barAlignment\":\"left\",\"comparisonEnabled\":false,\"xaxisSecond\":{\"axisPosition\":\"top\",\"title\":null,\"showLabels\":true},\"showLegend\":true,\"legendConfig\":{\"direction\":\"column\",\"position\":\"bottom\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":true,\"showTotal\":false,\"showLatest\":false},\"customLegendEnabled\":false},\"title\":\"Timeseries Bar Chart\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"mobileHeight\":null,\"widgetStyle\":{},\"useDashboardTimewindow\":true,\"showLegend\":true,\"actions\":{},\"configMode\":\"basic\",\"showTitleIcon\":false,\"titleIcon\":\"thermostat\",\"iconColor\":\"#1F6BDD\"}"
},
- "externalId": null,
"tags": null
}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/timeseries_line_chart.json b/application/src/main/data/json/system/widget_types/timeseries_line_chart.json
index e83b213ae0..87f7330657 100644
--- a/application/src/main/data/json/system/widget_types/timeseries_line_chart.json
+++ b/application/src/main/data/json/system/widget_types/timeseries_line_chart.json
@@ -1,8 +1,8 @@
{
"fqn": "charts.basic_timeseries",
"name": "Timeseries Line Chart",
- "deprecated": false,
- "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAIAAADGnbT+AAAABmJLR0QA/wD/AP+gvaeTAAAXk0lEQVR42u2deXwb1bXH+Y+lfY/utK98WkogZSk7LcujBF4pAT6lLaWvlBZeCrTw4AGFvrbQkPYRwlIWfyCr7WA7XrN4wzZx7DjxIu+2vEteZHmTJdmOd8faR9K838y1FUWWZVmaGQM585mPPmNZR/fOvV+de+455849iw/7OOuss/gojpaWFhI8cwQFVlQqVbp4JCUlzc3NaTSaveKhVqsJLBKMHCx2eDyeuLg4r9ebl5c3NjZGGosEpQEL+qm+vh4XKSkp0F4ZGRkWi4XAIsFowdqzZw/HcbiAurLb7Z2dndnZ2QQWCUYFVnd3d1FRkU914XV2djY5OZnAIsGowIqPj/cNfOXl5bDiY2Nj+/v7/anC0UIHHeEdwZUQxkRY8WS8k6AENhb5sUiQwCJBAosancAisEiQwCJBAosancAisEiQwCJBAosancAisEiQwCJBAosancAisEiQwCJBAosECSwCiwQJLBIksEiQwCKwSJDAIkECiwQJLAKLBAksEiSwSJDAIrBIkMAiQQKLBAksAosECSwSJLBIkMAisEiQwCJBAuuzK5jV7SKwCCyJBd+pd35nz7x6xE1gEViSCb7XIFCF84lCO4FFYEkj+IFaoOqSuPn1cfMX75nvnvQQWARWtIKvFg6CqnWx8+83Op8ptuP6hWN2AovAikowsd3FqIppcDaOuIv7uUtj5y+JnR+a9RBYBFaEgvs6BKow9r1V6wBV7PzdYRve3KJyEFgEViSC6VrXxSJVL+YN+6jC+ZHOBQV2Wfz8uNW75lXVTni2q50/zbLWGN0E1qdAEP4q0AOqXq92ZKi6/cHC+auPBKX1dp1zTarq9vBweWytctyaamETVZy3pFim7V6FwMKOX2yPQmwup9Pp0tLScnJy2J5NBFaII7uHA1Xora3Vwgi4FKz9ncIQeXWC5aTTq1hVwU1OD/fMUfv3PjzF0w1JlieL7HcftOIaF0qA5Xa7ExISfG/t2LED79SJB4EV4ijs4+BWQD+9orIzjJaChfMnWUJfxrY45a6qYc6T1O56pMB2ady8j6cfpllfOOZI1bgaxMpgSnGVSNtbRf2ygzU9Pf3mm29iYybs+wUthe2Z8KbRaMSOmATWcgd6iFH1t3K7j6GgYCWIs8Ub91nsnPRVbWpu0Yx7Pmh03i/iy851cfP3HLS+WuU40s8trc/OJsHTtj52ric8H1vkYLlcLrPZDC21fft2QIZ9VvGmyWTKzc0lsIIeRwc4phX+Umb377OgYOH80X5BSaRpXBJW1eXhXy53XL131scTBtxNH9t2qJ2Vw1zQavjOxw8LPrb7DlkdbjnBws6XBoMBF9hVdXx8fOfOnbjGRpilpaUE1tKjwuD+brzQkc+V2AM6bDmwdoju+NvTrW6PZFVl4UicN6dY4YyFF63O5A7Nk+8Eed9PnIHstmqHjGBhp8Jdu3YdOHAAJjx2kysuLsbWvbt378ZemP5U0X6FOJLKdevjTqJLHs0cAUZhnukV3awjPyjRS1KNA6qudXtOrgMZhYPhV8P/fLe4/5LYk5jMJpTp5N2vEANi0GvSWL4DHqDL9wpKAhoiqCZYTmPhfLvOAcG7D1g93miranV578wQLKo/lTpClBj6hOAWlTAg3rDPsqKbjfxYMgo2jbqvFOdTyFloWL63lutIjFPf3yeIlw5xUVZ1c4XA6J0ZllqzOxqw6s3un4omPywzL4G1JoLNY27mE3rssB390bh6sHD+X6UAxC9ybNFUtXLYjfELqRPZ3dyKJYYGC6/HBrlrE4X7golGYCkniN9xy5h7W42DUYXYXwiqVuxmmMyYuOF7GszuyKoKz+dNycI3/KPSEU6J4VR1T4sTpGI60jnhIbBkF+ydEpxDd2Sccg49nG+rN4XbW8udfy1ziGrPFllVnz0qWEX3HrL6+I4eLJxPiRk+Pz5gtXEEljyCjKd/3zd9KhKyzwJT3ee5jhKsMgN3+V5B5cCrudqq5uo4CF7xoQUe//BLDKeqNSb3hnSLtIkYBJZwwAeNJKr/2G/1j6yBpzRtWDytqpuZ1nm+xL6qqo7Me68RjaF36hyrLTGcqsJiWy+6fIsHuGhatc7sZhH3Mxos/bQHmcQYAnw8wZLFuPDGkYHQtlQ0YBUtJgAitBdmVWHq/bZAyJJArkQEJYZZ1deqhWH6+iTLqCWSePngrOepIjtrRrTemQWW082PznvbTgjxsnsOWf2DIU8ese9rdzGeJOytEBGVVyocYd5jkhhtBPTHBzn5wIJu/kWugO9v8m2nnG1el3CGbNVZh/f1GgdTeBjoETxFVFResMb82JcbLLTFpM0LIwnauEDPJXe4/ppvQOfhZ/TLXBuGuasSTuWQsBNx/scL7QltrgCrXG6wPupdSAA8seiZDHGPUKvMK4vpW8QlhikIcK9LspyWi9H7DF/1Rb7jXn74XX6+GaD5V5Xz8Cka1/WiCO4IjYkoaqO46E1esKC64VeUFawdTc6NB63wPbK8qNAnxiAYT3ekWx4rtMe3LhtckxssnL/OE3TDPxcTAJe7R/QcS1tAnylT1Q/bhGxYhNih13nj+7zq7NPO2gtnau/jRxJ4x3DZEHfXolWK1KDM7lPaVF6wgD8zC+QDyzzvZfFgdkIbIyKLjJEHc23wJm/KHEHqyHv1Tnj/cns4mKVhWk4KgHWgU2gcuMfmHN4Q9xgjLlG8KcW6XMKCHFV9tkQYqV/K+YivPI9XncOP7uPHMviex/m6i/wh6z16TVLu83/Oyo1tnAr4BhnBwsDkM2KqZUuy/psY3IBNUAJoTGvAx3KC7QbdaMfLjSOh0ldYOGVXk3O5e2wdcyPlC5oYzg4lfwPwPjyRqZ4v+4oAkOGN0zy009pDha+XHb7fWv4lH2Heys+fbLzTpHmta6BGbXbICxZSY9m46wtiSA4WZlXQ2Ehqy+91rZXiWU5wuvnXaPHxtqcbR5ZlImkxARBuyaX3iDeZ++OPxxwKK9cW45i1ej3qX1DwcIF+wXJH5hYML2anAvfnik826yrN2q3zDbd7Kz/ng8xd9dWZpgd554gsYCEHbUO60Chv1DpYKAqRV8nB+suCF9u+hiNaUMHOgXphBBEberLlUfYjDnqyDHQopKX3+HcxsIjE4hqToqO22mw/qb4LNR+tvPmKuBOYLxtPemDVsA7FeVfKBOwKf5Em01xP37GRjs2W+ptx457K83mPTRawEtuE3yKcubBpYOWwZEUk0UoIFrwm+N1cFj+tbXt/qvm3zaaZTwxYHH7E6Jjp5l+5q74iXjykHrEF/fwuMUv4tjSLurk1aKQ5q4dT2BycaP096uysubh12PSQOMO4cnFFBiY90LKhS2wbNuj6imUZCi0u741ifgimXWzAZn/uOq6XECwsXX8k5bC5/FqmGGz117cZBj4JYOl7s1AfV/WFYL1zoJGr/gb+nG26v8k8v/TzcB1BJ6Fx3i/p890azHm2WmuLyq7wPGO4813U1lP5hc6BBvxZbuBYqg/0FhRE+E4+WcBiE5n7Mq2+Yt6sFZTWbUlTbq80YA2NaisL72VI2WuvstddLfRlzbfRkWsL1gGVxl57JSoz2B3P3tEONnPV38Q7c+q7m0yzS0XeqRca5/bkKV/bPF8SGGlWBqxefQGvOhdjmb43x/cmVnj/6bjDf066NmDBRckyTDK0tq6BamPnWzp9Yb3RCS8A3sQqvGjB4qZ4/YselWAtWisuMHR9AJug2TQ517hR/Kl90b9RlAerSfV3QX3WXeNvV2mGNK5qYaKOIbLZOLVcAiBSo3B/Bb0c81/DalbSM6IZbGcDt0n7RvQlSg9WjKpn84Hddccecldd4JspQJc01Lx8R0IH1L7LEylYXk7wy9UKv35Pxbl5BY+W6Uf8TE7HifbnxOLOMWtfWxOwwLdDJdx1r/7jgH+1G/odtZcJP4b6H2DOFZgAKJqhD+TYEKi4TpzrvF3nUGwCK04Dxx11l6N6Uy0Ph3aRKAuWtZs3x/KdD3lqvuHvQLPVXTve+hSGqgVvh+qc+iN31jan8B7rqsGaOsqrr2Hf01V+z8bExv85GsT+MHa+Iyrzs1EuNJnCYGFahKIxpVrGqh1ko6St/rrWYXNAAuCV8XPChEv0LyAAFV6JLoyz0d+j2mydb9ggKNTG25rMFkkaJwqwnKP8eLYQSKq/xB+mE6XfUpc+NNi9t214yFdM56AaHh1nxaJLrfqrfM9j/HSpGLZf6bD1CjEEJth45XBfFkt3LB4I/sPS9+ZiQBRsmsaNWapGxcDCbEgs95wAO8//bB0esdbdgLo5ar/bbujz/9cT2WZfOLxkgFsRqT5dJgZcfNWM6qqBnlS12RnxPeJHKM42LmobHpaqcVYP1vghvvdpvvHy0+JHdd/muzeN6JM2JHRihlzUH7xdDqmaYvLjmotuOyWovlaIRrnGg5fHTfN9/8tXfl74ZM3XhE96nQiZregzxIwGg6/AlurydoNeGbAmWzYJNrvqgdAfazGesNbfJMznay9tH+o9FaEr07EEQKxADCEO7YJpAbhcdHl/zjc49OvSQzjMlrtHUcef7an6knawRcLGWT1Yi34/vvrL/hFv/PcRMWEoRJejQvEtwoTxgfQ218Brp1QdAlL4Kug/X3rGgjl1ofiBc6dqf8Y7T+DtjnHPxaJhuzR7ZIn+GGb9h9l+d79KbrDQK6gnHIN5qrKVTTHjFHN0uWq+BZPZVyIidI8V2kMitRfuJdZoMInwJzyTtap3HbVXLLxZu97QtT2c4YyVqNMf8YrRwD7dIWkbZ/Vg9T7LG2NEmE4zwrHgjoVUkXobukIbDy4GyEDP5Me89kHeFxCA5ht4hR/P4tXXLbzTvpG3dPhmhYgrC4vpjjvCM6VnzKofiVPF8/t0+2UFC64EwVXd8XKYgvA7zKl/LHL/TaYqIIiEk4pgrddsmsbkmvksBPO/7kaMg75IEQRhTQ707LPXfo99APAZunYEdZv5n4WqfE/Vl/F5fLnkjSON8Q59hRmN/0NXQlQI4Qt8Elm2M45FA8s5xpt28k03nja8Qp+NpfvPCptH3cwLHILdwEcIqbRj7S+yqSIs6xXnO5GBhTmggEjV11tM4+ELQgMJMTUhuHZB10BtUEFM1jDD5aoWpkSYUYpIcctU1QVHlBhUOZshC1lMVJcbkedV68Rp4G/CbxalwTrcx7Ek8SpjWBVij/WBHzXwi+bqeN1TfP13+OH3eE9gdiVSGCCFVS6rbQJD105R4SNstwndKS1YsJph3+DLMQatlkjEeRDtEdn6yjFVeoCZD/3HNAqbaSIYF15VuV59nqXh1gW8qr4OvEB8ANNsLJ5v+GGY4+YagIWnXLBJsv+zN0NXCKlIF4u6ZzK89bcAC4+lY0NtuYGLoAkQvXJXf401ZatxVEKwYOiIxs1lDNnVjqHgcqL1CYEA1fmoJPNKQMuyia1Y4Q09faURVLWrv2qm6efsSwAovrPVaFycBj6JNy2qi4CvTDMbCcDC4zfR5bemWle15u5BMbcaidJhgsXyLf2fRLXaJtAOtTlr1jGzt8PQJQlYMJXY9FMcoSJ2gLngixGneP8K/6RX9S9syjLd/J9w00TZzd39lbNNP1nAq/ILY20vjHS8wlCDjSWfLyZasJAzjwdaosuxNmFVFcJiI5b0jaUNK5abVNbDHDwrPvYpdBMgXG9puIUNEJGpgYATowzTgj4zJVJ3JdetenzRg3DeZMt/aQY7JOxmuNamm355akavOrdXny+r9zhasFjWx10HLBEs5nw4P9xHVW9MnQgz1L9iEzSZT0ITMA8Qpk7RtB0whftHiAQMVEsSYDFrXp1o/QNST2WawAJWIAtw4buSO94VFVhY9MOS+LBqKoIKIe0TyZ9IAfVfXrf0QMY+m0WuVl0t3wQucTgQfr4TrY8HtV7Dabvxtv9mSVefkJzVsCMEQwqUGBVYsJDE0Kk14gptEp+vj0TQEIX+PFv4DMK00jYBxgIk0bI5fASJXJohLXQecr07DD2fLrCUEYwcLCyWxWI3TO4OdkXuHCrsc7E1wVg6F7RE+AwF62rvbLVR+iaA15tlHHDV/xZgcq3YdkjcgyCmWp9tPtYArD+XCjE7hHGirBDWH7OHeQb1u94nrvN5/iOjTE0AB8+s+j5mchk73w5TsKevjDmflnouCKyowOqbEfLNcX4cXjJaiAohSQGpCtB8Sx/OVCj6XZHWnFLRI18TwJMkprucwzyoLBISUtDFvNv+IBJY0oD1e1HNPF1sl6RCbHnkH47Ygy5LRFqzAm3X13uQTfEQuoaLMoQgclRYPA4TTAJLSrCwipKlGBwblCbGhJVhLGMEz87zlZUvZuj+IDnax2yuIkNhqI2loyDKdlyVFtwjarY4a4SkDOSonAl8KArWw3mrjtmtWCEkLDCLbSFM5F0IE2GhgZJth6DvnPpeMdn1vKAjHRIBWH7BcstQCawIwTomPo4BTnCVgZOwQogAsg1eak1CnbLFVdS3pCyEiZRsu0WTS1xr2vo7/+QTZASwgONy8WACK3Kw2DSN7XQlbYVeLrezdG9ucRU126d0TdquWvU+CwMLQethE3vzRNsfhVTgpp+dOXwoB5Zo96yw6DviJwqzRyE+J9ryt6VJ/PzW1Qoi/46ZXEgGR74U0ogRHkY8JHQUj8A6DSybzZaZmZmamqrVavGnRqNhexdiM7AAsGC2v9fglKlC/xCfVsDOD/xSv9eq7bBOiz3FAHkHWGnNFv+cUXxEC1Z+fr5er8cWmDExMezP0dHRoBoL1k9kD+cMp0Jwr98gLt3ckGHxL2UN2w7LE3wmF1JNfMMigbWKoRBbNSUmJvLibqvYpAk7geGdALAiq0r4FXpdfL7qrtOTcNa87fp1GTC5TJqtZxofEoDFNlmdmJjgxV3m7HY7tpXLzs5WGCysN0dOX8Mnr+2Qcxf0yQsEViiwsJXc/v37MRoygJhphT3lkpOTFQaLsUW99RkBS6VSbdu2LV08oLTKy8uxjS828O3v7/enCkdkW+PReaadp+1XeNoiZI6DGltqvCugsUjwTPRjEVgkSGCRIIFFggQWgUWCBBYJElgkSGBR25EggUWCBBYJEljUdiRIYJEggUWCBBY1OgkSWCRIYJEggUWNToIEFgkSWCRIYFGjkyCBRYIEFgkSWNToJEhgkSCBRYIEFjU6CRJYJEhgkSCBRY1OggQWCRJYJEhgUaOTIIFFggQWCRJY1OgkSGCRIIFFggQWNToJElgkSGCRIIFFjU5gEVgkqBRYOp0uLS0tJycH+1MQWCQoGVg7duzAZmB14kFgkaA0YEFLYXsmXBiNxry8PAKLBKUBy+VyxcXF4cJkMuXm5hJYJCjZULhz5068YiPM0tJSAosEJQOruLgYGxfu3r0be2EG7FdIBx3hHkE9CxgQQzgdeGUPKvHTWKLS90PHGXIQWHR8AsCqqKiA+YVXxepXVlaGEvEqd0HYqri3t7egoMD3Z3V19ZEjR+Qr0Wq1ZmZmpqamYp7k8/WkpKR4PB6ZSrTZbIcOHYL3G3eKP5ubm9G2WVlZISwfJcCanJxEK+ACNz81NaUAVdPT04mJibjA68zMjKxlDQ4O4gcTExPD/iwqKqqvr5e1RLgJ+/r6gJGv0MOHD2/ZsiUg4CHhgZ/KwMAASty+fbvdbt+zZw9+P1VVVQGecKXB6urqYg6I48eP41oBsNDEmJyirPj4ePma2/9Ai7MLdPbBgwfx+0YHyFqixWJJSkpijkOghvuV9U7n5uZaW1uzs7P9+TYYDGsJlkajYUMSXrVarQLd7HA4kpOToUjw6nQ6lQRr69atKL2jo0PW0RChs4SEhImJCWgRXOAe5QYLAZXCwkKoRvZnd3d3gBt8DcAaHh5mQR5UBT8vBboZ4fCSkhJcHD16lJkFioHFLkZGRvx/3JJbdfv378doyNQV9BYsns2bN/t6XfIDGEFB4mLXrl14haKSz6Q7a1UNAVsHowNeca2MxkLgEl2LV1wrCVZDQwN6GlYI2JKpLGjibdu2pYsH7Ff2pqwaS6/XoyVBM9gFTy+99BKGAplmY/8Pl7O7ukBGoYYAAAAASUVORK5CYII=",
+ "deprecated": true,
+ "image": "tb-image:Z2F0ZXdheV9nZW5lcmFsX2NoYXJ0X3N0YXRpc3RpY3Nfc3lzdGVtX3dpZGdldF9pbWFnZS5wbmc=:IkdhdGV3YXkgZ2VuZXJhbCBjaGFydCBzdGF0aXN0aWNzIiBzeXN0ZW0gd2lkZ2V0IGltYWdl;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAIAAADGnbT+AAAABmJLR0QA/wD/AP+gvaeTAAAXk0lEQVR42u2deXwb1bXH+Y+lfY/utK98WkogZSk7LcujBF4pAT6lLaWvlBZeCrTw4AGFvrbQkPYRwlIWfyCr7WA7XrN4wzZx7DjxIu+2vEteZHmTJdmOd8faR9K838y1FUWWZVmaGQM585mPPmNZR/fOvV+de+455849iw/7OOuss/gojpaWFhI8cwQFVlQqVbp4JCUlzc3NaTSaveKhVqsJLBKMHCx2eDyeuLg4r9ebl5c3NjZGGosEpQEL+qm+vh4XKSkp0F4ZGRkWi4XAIsFowdqzZw/HcbiAurLb7Z2dndnZ2QQWCUYFVnd3d1FRkU914XV2djY5OZnAIsGowIqPj/cNfOXl5bDiY2Nj+/v7/anC0UIHHeEdwZUQxkRY8WS8k6AENhb5sUiQwCJBAosancAisEiQwCJBAosancAisEiQwCJBAosancAisEiQwCJBAosancAisEiQwCJBAosECSwCiwQJLBIksEiQwCKwSJDAIkECiwQJLAKLBAksEiSwSJDAIrBIkMAiQQKLBAksAosECSwSJLBIkMAisEiQwCJBAuuzK5jV7SKwCCyJBd+pd35nz7x6xE1gEViSCb7XIFCF84lCO4FFYEkj+IFaoOqSuPn1cfMX75nvnvQQWARWtIKvFg6CqnWx8+83Op8ptuP6hWN2AovAikowsd3FqIppcDaOuIv7uUtj5y+JnR+a9RBYBFaEgvs6BKow9r1V6wBV7PzdYRve3KJyEFgEViSC6VrXxSJVL+YN+6jC+ZHOBQV2Wfz8uNW75lXVTni2q50/zbLWGN0E1qdAEP4q0AOqXq92ZKi6/cHC+auPBKX1dp1zTarq9vBweWytctyaamETVZy3pFim7V6FwMKOX2yPQmwup9Pp0tLScnJy2J5NBFaII7uHA1Xora3Vwgi4FKz9ncIQeXWC5aTTq1hVwU1OD/fMUfv3PjzF0w1JlieL7HcftOIaF0qA5Xa7ExISfG/t2LED79SJB4EV4ijs4+BWQD+9orIzjJaChfMnWUJfxrY45a6qYc6T1O56pMB2ady8j6cfpllfOOZI1bgaxMpgSnGVSNtbRf2ygzU9Pf3mm29iYybs+wUthe2Z8KbRaMSOmATWcgd6iFH1t3K7j6GgYCWIs8Ub91nsnPRVbWpu0Yx7Pmh03i/iy851cfP3HLS+WuU40s8trc/OJsHTtj52ric8H1vkYLlcLrPZDC21fft2QIZ9VvGmyWTKzc0lsIIeRwc4phX+Umb377OgYOH80X5BSaRpXBJW1eXhXy53XL131scTBtxNH9t2qJ2Vw1zQavjOxw8LPrb7DlkdbjnBws6XBoMBF9hVdXx8fOfOnbjGRpilpaUE1tKjwuD+brzQkc+V2AM6bDmwdoju+NvTrW6PZFVl4UicN6dY4YyFF63O5A7Nk+8Eed9PnIHstmqHjGBhp8Jdu3YdOHAAJjx2kysuLsbWvbt378ZemP5U0X6FOJLKdevjTqJLHs0cAUZhnukV3awjPyjRS1KNA6qudXtOrgMZhYPhV8P/fLe4/5LYk5jMJpTp5N2vEANi0GvSWL4DHqDL9wpKAhoiqCZYTmPhfLvOAcG7D1g93miranV578wQLKo/lTpClBj6hOAWlTAg3rDPsqKbjfxYMgo2jbqvFOdTyFloWL63lutIjFPf3yeIlw5xUVZ1c4XA6J0ZllqzOxqw6s3un4omPywzL4G1JoLNY27mE3rssB390bh6sHD+X6UAxC9ybNFUtXLYjfELqRPZ3dyKJYYGC6/HBrlrE4X7golGYCkniN9xy5h7W42DUYXYXwiqVuxmmMyYuOF7GszuyKoKz+dNycI3/KPSEU6J4VR1T4sTpGI60jnhIbBkF+ydEpxDd2Sccg49nG+rN4XbW8udfy1ziGrPFllVnz0qWEX3HrL6+I4eLJxPiRk+Pz5gtXEEljyCjKd/3zd9KhKyzwJT3ee5jhKsMgN3+V5B5cCrudqq5uo4CF7xoQUe//BLDKeqNSb3hnSLtIkYBJZwwAeNJKr/2G/1j6yBpzRtWDytqpuZ1nm+xL6qqo7Me68RjaF36hyrLTGcqsJiWy+6fIsHuGhatc7sZhH3Mxos/bQHmcQYAnw8wZLFuPDGkYHQtlQ0YBUtJgAitBdmVWHq/bZAyJJArkQEJYZZ1deqhWH6+iTLqCWSePngrOepIjtrRrTemQWW082PznvbTgjxsnsOWf2DIU8ese9rdzGeJOytEBGVVyocYd5jkhhtBPTHBzn5wIJu/kWugO9v8m2nnG1el3CGbNVZh/f1GgdTeBjoETxFVFResMb82JcbLLTFpM0LIwnauEDPJXe4/ppvQOfhZ/TLXBuGuasSTuWQsBNx/scL7QltrgCrXG6wPupdSAA8seiZDHGPUKvMK4vpW8QlhikIcK9LspyWi9H7DF/1Rb7jXn74XX6+GaD5V5Xz8Cka1/WiCO4IjYkoaqO46E1esKC64VeUFawdTc6NB63wPbK8qNAnxiAYT3ekWx4rtMe3LhtckxssnL/OE3TDPxcTAJe7R/QcS1tAnylT1Q/bhGxYhNih13nj+7zq7NPO2gtnau/jRxJ4x3DZEHfXolWK1KDM7lPaVF6wgD8zC+QDyzzvZfFgdkIbIyKLjJEHc23wJm/KHEHqyHv1Tnj/cns4mKVhWk4KgHWgU2gcuMfmHN4Q9xgjLlG8KcW6XMKCHFV9tkQYqV/K+YivPI9XncOP7uPHMviex/m6i/wh6z16TVLu83/Oyo1tnAr4BhnBwsDkM2KqZUuy/psY3IBNUAJoTGvAx3KC7QbdaMfLjSOh0ldYOGVXk3O5e2wdcyPlC5oYzg4lfwPwPjyRqZ4v+4oAkOGN0zy009pDha+XHb7fWv4lH2Heys+fbLzTpHmta6BGbXbICxZSY9m46wtiSA4WZlXQ2Ehqy+91rZXiWU5wuvnXaPHxtqcbR5ZlImkxARBuyaX3iDeZ++OPxxwKK9cW45i1ej3qX1DwcIF+wXJH5hYML2anAvfnik826yrN2q3zDbd7Kz/ng8xd9dWZpgd554gsYCEHbUO60Chv1DpYKAqRV8nB+suCF9u+hiNaUMHOgXphBBEberLlUfYjDnqyDHQopKX3+HcxsIjE4hqToqO22mw/qb4LNR+tvPmKuBOYLxtPemDVsA7FeVfKBOwKf5Em01xP37GRjs2W+ptx457K83mPTRawEtuE3yKcubBpYOWwZEUk0UoIFrwm+N1cFj+tbXt/qvm3zaaZTwxYHH7E6Jjp5l+5q74iXjykHrEF/fwuMUv4tjSLurk1aKQ5q4dT2BycaP096uysubh12PSQOMO4cnFFBiY90LKhS2wbNuj6imUZCi0u741ifgimXWzAZn/uOq6XECwsXX8k5bC5/FqmGGz117cZBj4JYOl7s1AfV/WFYL1zoJGr/gb+nG26v8k8v/TzcB1BJ6Fx3i/p890azHm2WmuLyq7wPGO4813U1lP5hc6BBvxZbuBYqg/0FhRE+E4+WcBiE5n7Mq2+Yt6sFZTWbUlTbq80YA2NaisL72VI2WuvstddLfRlzbfRkWsL1gGVxl57JSoz2B3P3tEONnPV38Q7c+q7m0yzS0XeqRca5/bkKV/bPF8SGGlWBqxefQGvOhdjmb43x/cmVnj/6bjDf066NmDBRckyTDK0tq6BamPnWzp9Yb3RCS8A3sQqvGjB4qZ4/YselWAtWisuMHR9AJug2TQ517hR/Kl90b9RlAerSfV3QX3WXeNvV2mGNK5qYaKOIbLZOLVcAiBSo3B/Bb0c81/DalbSM6IZbGcDt0n7RvQlSg9WjKpn84Hddccecldd4JspQJc01Lx8R0IH1L7LEylYXk7wy9UKv35Pxbl5BY+W6Uf8TE7HifbnxOLOMWtfWxOwwLdDJdx1r/7jgH+1G/odtZcJP4b6H2DOFZgAKJqhD+TYEKi4TpzrvF3nUGwCK04Dxx11l6N6Uy0Ph3aRKAuWtZs3x/KdD3lqvuHvQLPVXTve+hSGqgVvh+qc+iN31jan8B7rqsGaOsqrr2Hf01V+z8bExv85GsT+MHa+Iyrzs1EuNJnCYGFahKIxpVrGqh1ko6St/rrWYXNAAuCV8XPChEv0LyAAFV6JLoyz0d+j2mydb9ggKNTG25rMFkkaJwqwnKP8eLYQSKq/xB+mE6XfUpc+NNi9t214yFdM56AaHh1nxaJLrfqrfM9j/HSpGLZf6bD1CjEEJth45XBfFkt3LB4I/sPS9+ZiQBRsmsaNWapGxcDCbEgs95wAO8//bB0esdbdgLo5ar/bbujz/9cT2WZfOLxkgFsRqT5dJgZcfNWM6qqBnlS12RnxPeJHKM42LmobHpaqcVYP1vghvvdpvvHy0+JHdd/muzeN6JM2JHRihlzUH7xdDqmaYvLjmotuOyWovlaIRrnGg5fHTfN9/8tXfl74ZM3XhE96nQiZregzxIwGg6/AlurydoNeGbAmWzYJNrvqgdAfazGesNbfJMznay9tH+o9FaEr07EEQKxADCEO7YJpAbhcdHl/zjc49OvSQzjMlrtHUcef7an6knawRcLGWT1Yi34/vvrL/hFv/PcRMWEoRJejQvEtwoTxgfQ218Brp1QdAlL4Kug/X3rGgjl1ofiBc6dqf8Y7T+DtjnHPxaJhuzR7ZIn+GGb9h9l+d79KbrDQK6gnHIN5qrKVTTHjFHN0uWq+BZPZVyIidI8V2kMitRfuJdZoMInwJzyTtap3HbVXLLxZu97QtT2c4YyVqNMf8YrRwD7dIWkbZ/Vg9T7LG2NEmE4zwrHgjoVUkXobukIbDy4GyEDP5Me89kHeFxCA5ht4hR/P4tXXLbzTvpG3dPhmhYgrC4vpjjvCM6VnzKofiVPF8/t0+2UFC64EwVXd8XKYgvA7zKl/LHL/TaYqIIiEk4pgrddsmsbkmvksBPO/7kaMg75IEQRhTQ707LPXfo99APAZunYEdZv5n4WqfE/Vl/F5fLnkjSON8Q59hRmN/0NXQlQI4Qt8Elm2M45FA8s5xpt28k03nja8Qp+NpfvPCptH3cwLHILdwEcIqbRj7S+yqSIs6xXnO5GBhTmggEjV11tM4+ELQgMJMTUhuHZB10BtUEFM1jDD5aoWpkSYUYpIcctU1QVHlBhUOZshC1lMVJcbkedV68Rp4G/CbxalwTrcx7Ek8SpjWBVij/WBHzXwi+bqeN1TfP13+OH3eE9gdiVSGCCFVS6rbQJD105R4SNstwndKS1YsJph3+DLMQatlkjEeRDtEdn6yjFVeoCZD/3HNAqbaSIYF15VuV59nqXh1gW8qr4OvEB8ANNsLJ5v+GGY4+YagIWnXLBJsv+zN0NXCKlIF4u6ZzK89bcAC4+lY0NtuYGLoAkQvXJXf401ZatxVEKwYOiIxs1lDNnVjqHgcqL1CYEA1fmoJPNKQMuyia1Y4Q09faURVLWrv2qm6efsSwAovrPVaFycBj6JNy2qi4CvTDMbCcDC4zfR5bemWle15u5BMbcaidJhgsXyLf2fRLXaJtAOtTlr1jGzt8PQJQlYMJXY9FMcoSJ2gLngixGneP8K/6RX9S9syjLd/J9w00TZzd39lbNNP1nAq/ILY20vjHS8wlCDjSWfLyZasJAzjwdaosuxNmFVFcJiI5b0jaUNK5abVNbDHDwrPvYpdBMgXG9puIUNEJGpgYATowzTgj4zJVJ3JdetenzRg3DeZMt/aQY7JOxmuNamm355akavOrdXny+r9zhasFjWx10HLBEs5nw4P9xHVW9MnQgz1L9iEzSZT0ITMA8Qpk7RtB0whftHiAQMVEsSYDFrXp1o/QNST2WawAJWIAtw4buSO94VFVhY9MOS+LBqKoIKIe0TyZ9IAfVfXrf0QMY+m0WuVl0t3wQucTgQfr4TrY8HtV7Dabvxtv9mSVefkJzVsCMEQwqUGBVYsJDE0Kk14gptEp+vj0TQEIX+PFv4DMK00jYBxgIk0bI5fASJXJohLXQecr07DD2fLrCUEYwcLCyWxWI3TO4OdkXuHCrsc7E1wVg6F7RE+AwF62rvbLVR+iaA15tlHHDV/xZgcq3YdkjcgyCmWp9tPtYArD+XCjE7hHGirBDWH7OHeQb1u94nrvN5/iOjTE0AB8+s+j5mchk73w5TsKevjDmflnouCKyowOqbEfLNcX4cXjJaiAohSQGpCtB8Sx/OVCj6XZHWnFLRI18TwJMkprucwzyoLBISUtDFvNv+IBJY0oD1e1HNPF1sl6RCbHnkH47Ygy5LRFqzAm3X13uQTfEQuoaLMoQgclRYPA4TTAJLSrCwipKlGBwblCbGhJVhLGMEz87zlZUvZuj+IDnax2yuIkNhqI2loyDKdlyVFtwjarY4a4SkDOSonAl8KArWw3mrjtmtWCEkLDCLbSFM5F0IE2GhgZJth6DvnPpeMdn1vKAjHRIBWH7BcstQCawIwTomPo4BTnCVgZOwQogAsg1eak1CnbLFVdS3pCyEiZRsu0WTS1xr2vo7/+QTZASwgONy8WACK3Kw2DSN7XQlbYVeLrezdG9ucRU126d0TdquWvU+CwMLQethE3vzRNsfhVTgpp+dOXwoB5Zo96yw6DviJwqzRyE+J9ryt6VJ/PzW1Qoi/46ZXEgGR74U0ogRHkY8JHQUj8A6DSybzZaZmZmamqrVavGnRqNhexdiM7AAsGC2v9fglKlC/xCfVsDOD/xSv9eq7bBOiz3FAHkHWGnNFv+cUXxEC1Z+fr5er8cWmDExMezP0dHRoBoL1k9kD+cMp0Jwr98gLt3ckGHxL2UN2w7LE3wmF1JNfMMigbWKoRBbNSUmJvLibqvYpAk7geGdALAiq0r4FXpdfL7qrtOTcNa87fp1GTC5TJqtZxofEoDFNlmdmJjgxV3m7HY7tpXLzs5WGCysN0dOX8Mnr+2Qcxf0yQsEViiwsJXc/v37MRoygJhphT3lkpOTFQaLsUW99RkBS6VSbdu2LV08oLTKy8uxjS828O3v7/enCkdkW+PReaadp+1XeNoiZI6DGltqvCugsUjwTPRjEVgkSGCRIIFFggQWgUWCBBYJElgkSGBR25EggUWCBBYJEljUdiRIYJEggUWCBBY1OgkSWCRIYJEggUWNToIEFgkSWCRIYFGjkyCBRYIEFgkSWNToJEhgkSCBRYIEFjU6CRJYJEhgkSCBRY1OggQWCRJYJEhgUaOTIIFFggQWCRJY1OgkSGCRIIFFggQWNToJElgkSGCRIIFFjU5gEVgkqBRYOp0uLS0tJycH+1MQWCQoGVg7duzAZmB14kFgkaA0YEFLYXsmXBiNxry8PAKLBKUBy+VyxcXF4cJkMuXm5hJYJCjZULhz5068YiPM0tJSAosEJQOruLgYGxfu3r0be2EG7FdIBx3hHkE9CxgQQzgdeGUPKvHTWKLS90PHGXIQWHR8AsCqqKiA+YVXxepXVlaGEvEqd0HYqri3t7egoMD3Z3V19ZEjR+Qr0Wq1ZmZmpqamYp7k8/WkpKR4PB6ZSrTZbIcOHYL3G3eKP5ubm9G2WVlZISwfJcCanJxEK+ACNz81NaUAVdPT04mJibjA68zMjKxlDQ4O4gcTExPD/iwqKqqvr5e1RLgJ+/r6gJGv0MOHD2/ZsiUg4CHhgZ/KwMAASty+fbvdbt+zZw9+P1VVVQGecKXB6urqYg6I48eP41oBsNDEmJyirPj4ePma2/9Ai7MLdPbBgwfx+0YHyFqixWJJSkpijkOghvuV9U7n5uZaW1uzs7P9+TYYDGsJlkajYUMSXrVarQLd7HA4kpOToUjw6nQ6lQRr69atKL2jo0PW0RChs4SEhImJCWgRXOAe5QYLAZXCwkKoRvZnd3d3gBt8DcAaHh5mQR5UBT8vBboZ4fCSkhJcHD16lJkFioHFLkZGRvx/3JJbdfv378doyNQV9BYsns2bN/t6XfIDGEFB4mLXrl14haKSz6Q7a1UNAVsHowNeca2MxkLgEl2LV1wrCVZDQwN6GlYI2JKpLGjibdu2pYsH7Ff2pqwaS6/XoyVBM9gFTy+99BKGAplmY/8Pl7O7ukBGoYYAAAAASUVORK5CYII=",
"description": "Displays changes to time-series data over time—for example, temperature or humidity readings.",
"descriptor": {
"type": "timeseries",
@@ -22,6 +22,5 @@
"basicModeDirective": "tb-flot-basic-config",
"defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":true,\"fillLines\":true,\"showPoints\":false},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":true,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.12775350966079668,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"stack\":false,\"fontSize\":10,\"fontColor\":\"#545454\",\"showTooltip\":true,\"tooltipIndividual\":false,\"tooltipCumulative\":false,\"hideZeros\":false,\"grid\":{\"verticalLines\":true,\"horizontalLines\":true,\"outlineWidth\":1,\"color\":\"#545454\",\"backgroundColor\":null,\"tickColor\":\"#DDDDDD\"},\"xaxis\":{\"title\":null,\"showLabels\":true,\"color\":\"#545454\"},\"yaxis\":{\"min\":null,\"max\":null,\"title\":null,\"showLabels\":true,\"color\":\"#545454\",\"tickSize\":null,\"tickDecimals\":0,\"ticksFormatter\":\"\"},\"shadowSize\":4,\"smoothLines\":false,\"comparisonEnabled\":false,\"xaxisSecond\":{\"axisPosition\":\"top\",\"title\":null,\"showLabels\":true},\"showLegend\":true,\"legendConfig\":{\"direction\":\"column\",\"position\":\"bottom\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":true,\"showTotal\":false,\"showLatest\":false},\"customLegendEnabled\":false},\"title\":\"Timeseries Line Chart\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"thermostat\",\"iconColor\":\"#1F6BDD\"}"
},
- "externalId": null,
"tags": null
}
\ No newline at end of file
diff --git a/application/src/main/data/upgrade/3.6.3/schema_update.sql b/application/src/main/data/upgrade/3.6.3/schema_update.sql
new file mode 100644
index 0000000000..e2d454353e
--- /dev/null
+++ b/application/src/main/data/upgrade/3.6.3/schema_update.sql
@@ -0,0 +1,108 @@
+--
+-- Copyright © 2016-2024 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.
+--
+
+
+-- create new attribute_kv table schema
+DO
+$$
+ BEGIN
+ -- in case of running the upgrade script a second time:
+ IF EXISTS(SELECT 1 FROM information_schema.columns WHERE table_name = 'attribute_kv' and column_name='entity_type') THEN
+ DROP VIEW IF EXISTS device_info_view;
+ DROP VIEW IF EXISTS device_info_active_attribute_view;
+ ALTER INDEX IF EXISTS idx_attribute_kv_by_key_and_last_update_ts RENAME TO idx_attribute_kv_by_key_and_last_update_ts_old;
+ IF EXISTS(SELECT 1 FROM pg_constraint WHERE conname = 'attribute_kv_pkey') THEN
+ ALTER TABLE attribute_kv RENAME CONSTRAINT attribute_kv_pkey TO attribute_kv_pkey_old;
+ END IF;
+ ALTER TABLE attribute_kv RENAME TO attribute_kv_old;
+ CREATE TABLE IF NOT EXISTS attribute_kv
+ (
+ entity_id uuid,
+ attribute_type int,
+ attribute_key int,
+ bool_v boolean,
+ str_v varchar(10000000),
+ long_v bigint,
+ dbl_v double precision,
+ json_v json,
+ last_update_ts bigint,
+ CONSTRAINT attribute_kv_pkey PRIMARY KEY (entity_id, attribute_type, attribute_key)
+ );
+ END IF;
+ END;
+$$;
+
+-- rename ts_kv_dictionary table to key_dictionary or create table if not exists
+DO
+$$
+ BEGIN
+ IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'ts_kv_dictionary') THEN
+ ALTER TABLE ts_kv_dictionary RENAME CONSTRAINT ts_key_id_pkey TO key_dictionary_id_pkey;
+ ALTER TABLE ts_kv_dictionary RENAME TO key_dictionary;
+ ELSE CREATE TABLE IF NOT EXISTS key_dictionary(
+ key varchar(255) NOT NULL,
+ key_id serial UNIQUE,
+ CONSTRAINT key_dictionary_id_pkey PRIMARY KEY (key)
+ );
+ END IF;
+ END;
+$$;
+
+-- insert keys into key_dictionary
+DO
+$$
+ BEGIN
+ IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'attribute_kv_old') THEN
+ INSERT INTO key_dictionary(key) SELECT DISTINCT attribute_key FROM attribute_kv_old ON CONFLICT DO NOTHING;
+ END IF;
+ END;
+$$;
+
+-- migrate attributes from attribute_kv_old to attribute_kv
+DO
+$$
+DECLARE
+ row_num_old integer;
+ row_num integer;
+BEGIN
+ IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'attribute_kv_old') THEN
+ INSERT INTO attribute_kv(entity_id, attribute_type, attribute_key, bool_v, str_v, long_v, dbl_v, json_v, last_update_ts)
+ SELECT a.entity_id, CASE
+ WHEN a.attribute_type = 'CLIENT_SCOPE' THEN 1
+ WHEN a.attribute_type = 'SERVER_SCOPE' THEN 2
+ WHEN a.attribute_type = 'SHARED_SCOPE' THEN 3
+ ELSE 0
+ END,
+ k.key_id, a.bool_v, a.str_v, a.long_v, a.dbl_v, a.json_v, a.last_update_ts
+ FROM attribute_kv_old a INNER JOIN key_dictionary k ON (a.attribute_key = k.key);
+ SELECT COUNT(*) INTO row_num_old FROM attribute_kv_old;
+ SELECT COUNT(*) INTO row_num FROM attribute_kv;
+ RAISE NOTICE 'Migrated % of % rows', row_num, row_num_old;
+
+ IF row_num != 0 THEN
+ DROP TABLE IF EXISTS attribute_kv_old;
+ ELSE
+ RAISE EXCEPTION 'Table attribute_kv is empty';
+ END IF;
+
+ CREATE INDEX IF NOT EXISTS idx_attribute_kv_by_key_and_last_update_ts ON attribute_kv(entity_id, attribute_key, last_update_ts desc);
+ END IF;
+EXCEPTION
+ WHEN others THEN
+ ROLLBACK;
+ RAISE EXCEPTION 'Error during COPY: %', SQLERRM;
+END
+$$;
\ No newline at end of file
diff --git a/application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java b/application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java
index bead4d4049..226d4233f9 100644
--- a/application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java
+++ b/application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java
@@ -33,8 +33,7 @@ import java.util.Arrays;
"org.thingsboard.server.dao",
"org.thingsboard.server.common.stats",
"org.thingsboard.server.common.transport.config.ssl",
- "org.thingsboard.server.cache",
- "org.thingsboard.server.springfox"
+ "org.thingsboard.server.cache"
})
public class ThingsboardInstallApplication {
diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
index ca9576b335..6a10791091 100644
--- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
+++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
@@ -93,7 +93,6 @@ import org.thingsboard.server.dao.widget.WidgetsBundleService;
import org.thingsboard.server.queue.discovery.DiscoveryService;
import org.thingsboard.server.queue.discovery.PartitionService;
import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
import org.thingsboard.server.service.component.ComponentDiscoveryService;
import org.thingsboard.server.service.edge.rpc.EdgeRpcService;
@@ -116,8 +115,9 @@ import org.thingsboard.server.service.telemetry.AlarmSubscriptionService;
import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
import org.thingsboard.server.service.transport.TbCoreToTransportService;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.concurrent.ConcurrentHashMap;
@@ -184,10 +184,6 @@ public class ActorSystemContext {
@Getter
private DiscoveryService discoveryService;
- @Autowired
- @Getter
- private DataDecodingEncodingService encodingService;
-
@Autowired
@Getter
private DeviceService deviceService;
diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
index f1c0260124..d6b5da4ddf 100644
--- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
@@ -28,6 +28,7 @@ import org.thingsboard.common.util.LinkedHashMapRemoveEldest;
import org.thingsboard.server.actors.ActorSystemContext;
import org.thingsboard.server.actors.TbActorCtx;
import org.thingsboard.server.actors.shared.AbstractContextAwareMsgProcessor;
+import org.thingsboard.server.common.data.AttributeScope;
import org.thingsboard.server.common.data.DataConstants;
import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.EdgeUtils;
@@ -66,6 +67,8 @@ import org.thingsboard.server.common.msg.rule.engine.DeviceCredentialsUpdateNoti
import org.thingsboard.server.common.msg.rule.engine.DeviceEdgeUpdateMsg;
import org.thingsboard.server.common.msg.rule.engine.DeviceNameOrTypeUpdateMsg;
import org.thingsboard.server.common.msg.timeout.DeviceActorServerSideRpcTimeoutMsg;
+import org.thingsboard.server.common.util.KvProtoUtil;
+import org.thingsboard.server.gen.transport.TransportProtos;
import org.thingsboard.server.gen.transport.TransportProtos.AttributeUpdateNotificationMsg;
import org.thingsboard.server.gen.transport.TransportProtos.ClaimDeviceMsg;
import org.thingsboard.server.gen.transport.TransportProtos.DeviceSessionsCacheEntry;
@@ -94,7 +97,7 @@ import org.thingsboard.server.service.rpc.RpcSubmitStrategy;
import org.thingsboard.server.service.state.DefaultDeviceStateService;
import org.thingsboard.server.service.transport.msg.TransportToDeviceActorMsgWrapper;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -504,13 +507,13 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
private void handleGetAttributesRequest(SessionInfoProto sessionInfo, GetAttributeRequestMsg request) {
int requestId = request.getRequestId();
if (request.getOnlyShared()) {
- Futures.addCallback(findAllAttributesByScope(DataConstants.SHARED_SCOPE), new FutureCallback<>() {
+ Futures.addCallback(findAllAttributesByScope(AttributeScope.SHARED_SCOPE), new FutureCallback<>() {
@Override
public void onSuccess(@Nullable List result) {
GetAttributeResponseMsg responseMsg = GetAttributeResponseMsg.newBuilder()
.setRequestId(requestId)
.setSharedStateMsg(true)
- .addAllSharedAttributeList(toTsKvProtos(result))
+ .addAllSharedAttributeList(KvProtoUtil.attrToTsKvProtos(result))
.setIsMultipleAttributesRequest(request.getSharedAttributeNamesCount() > 1)
.build();
sendToTransport(responseMsg, sessionInfo);
@@ -531,8 +534,8 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
public void onSuccess(@Nullable List> result) {
GetAttributeResponseMsg responseMsg = GetAttributeResponseMsg.newBuilder()
.setRequestId(requestId)
- .addAllClientAttributeList(toTsKvProtos(result.get(0)))
- .addAllSharedAttributeList(toTsKvProtos(result.get(1)))
+ .addAllClientAttributeList(KvProtoUtil.attrToTsKvProtos(result.get(0)))
+ .addAllSharedAttributeList(KvProtoUtil.attrToTsKvProtos(result.get(1)))
.setIsMultipleAttributesRequest(
request.getSharedAttributeNamesCount() + request.getClientAttributeNamesCount() > 1)
.build();
@@ -554,26 +557,26 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
ListenableFuture> clientAttributesFuture;
ListenableFuture> sharedAttributesFuture;
if (CollectionUtils.isEmpty(request.getClientAttributeNamesList()) && CollectionUtils.isEmpty(request.getSharedAttributeNamesList())) {
- clientAttributesFuture = findAllAttributesByScope(DataConstants.CLIENT_SCOPE);
- sharedAttributesFuture = findAllAttributesByScope(DataConstants.SHARED_SCOPE);
+ clientAttributesFuture = findAllAttributesByScope(AttributeScope.CLIENT_SCOPE);
+ sharedAttributesFuture = findAllAttributesByScope(AttributeScope.SHARED_SCOPE);
} else if (!CollectionUtils.isEmpty(request.getClientAttributeNamesList()) && !CollectionUtils.isEmpty(request.getSharedAttributeNamesList())) {
- clientAttributesFuture = findAttributesByScope(toSet(request.getClientAttributeNamesList()), DataConstants.CLIENT_SCOPE);
- sharedAttributesFuture = findAttributesByScope(toSet(request.getSharedAttributeNamesList()), DataConstants.SHARED_SCOPE);
+ clientAttributesFuture = findAttributesByScope(toSet(request.getClientAttributeNamesList()), AttributeScope.CLIENT_SCOPE);
+ sharedAttributesFuture = findAttributesByScope(toSet(request.getSharedAttributeNamesList()), AttributeScope.SHARED_SCOPE);
} else if (CollectionUtils.isEmpty(request.getClientAttributeNamesList()) && !CollectionUtils.isEmpty(request.getSharedAttributeNamesList())) {
clientAttributesFuture = Futures.immediateFuture(Collections.emptyList());
- sharedAttributesFuture = findAttributesByScope(toSet(request.getSharedAttributeNamesList()), DataConstants.SHARED_SCOPE);
+ sharedAttributesFuture = findAttributesByScope(toSet(request.getSharedAttributeNamesList()), AttributeScope.SHARED_SCOPE);
} else {
sharedAttributesFuture = Futures.immediateFuture(Collections.emptyList());
- clientAttributesFuture = findAttributesByScope(toSet(request.getClientAttributeNamesList()), DataConstants.CLIENT_SCOPE);
+ clientAttributesFuture = findAttributesByScope(toSet(request.getClientAttributeNamesList()), AttributeScope.CLIENT_SCOPE);
}
return Futures.allAsList(Arrays.asList(clientAttributesFuture, sharedAttributesFuture));
}
- private ListenableFuture> findAllAttributesByScope(String scope) {
+ private ListenableFuture> findAllAttributesByScope(AttributeScope scope) {
return systemContext.getAttributesService().findAll(tenantId, deviceId, scope);
}
- private ListenableFuture> findAttributesByScope(Set attributesSet, String scope) {
+ private ListenableFuture> findAttributesByScope(Set attributesSet, AttributeScope scope) {
return systemContext.getAttributesService().find(tenantId, deviceId, scope, attributesSet);
}
@@ -602,7 +605,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
if (DataConstants.SHARED_SCOPE.equals(msg.getScope())) {
List attributes = new ArrayList<>(msg.getValues());
if (attributes.size() > 0) {
- List sharedUpdated = msg.getValues().stream().map(this::toTsKvProto)
+ List sharedUpdated = msg.getValues().stream().map(t -> KvProtoUtil.toTsKvProto(t.getLastUpdateTs(), t))
.collect(Collectors.toList());
if (!sharedUpdated.isEmpty()) {
notification.addAllSharedUpdated(sharedUpdated);
@@ -922,28 +925,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
EdgeEvent edgeEvent = EdgeUtils.constructEdgeEvent(tenantId, edgeId, EdgeEventType.DEVICE, EdgeEventActionType.RPC_CALL, deviceId, body);
- return Futures.transform(systemContext.getEdgeEventService().saveAsync(edgeEvent), unused -> {
- systemContext.getClusterService().onEdgeEventUpdate(tenantId, edgeId);
- return null;
- }, systemContext.getDbCallbackExecutor());
- }
-
- private List toTsKvProtos(@Nullable List result) {
- List clientAttributes;
- if (result == null || result.isEmpty()) {
- clientAttributes = Collections.emptyList();
- } else {
- clientAttributes = new ArrayList<>(result.size());
- for (AttributeKvEntry attrEntry : result) {
- clientAttributes.add(toTsKvProto(attrEntry));
- }
- }
- return clientAttributes;
- }
-
- private TsKvProto toTsKvProto(AttributeKvEntry attrEntry) {
- return TsKvProto.newBuilder().setTs(attrEntry.getLastUpdateTs())
- .setKv(toKeyValueProto(attrEntry)).build();
+ return systemContext.getEdgeEventService().saveAsync(edgeEvent);
}
private KeyValueProto toKeyValueProto(KvEntry kvEntry) {
diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
index a5828f8d80..79dddfdbe4 100644
--- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
+++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
@@ -54,7 +54,6 @@ import org.thingsboard.server.common.data.asset.AssetProfile;
import org.thingsboard.server.common.data.id.AssetId;
import org.thingsboard.server.common.data.id.CustomerId;
import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.data.id.EdgeId;
import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.id.RuleChainId;
import org.thingsboard.server.common.data.id.RuleNodeId;
@@ -476,11 +475,6 @@ class DefaultTbContext implements TbContext {
return entityActionMsg(originator, tbMsgMetaData, msgData, actionMsgType, profile);
}
- @Override
- public void onEdgeEventUpdate(TenantId tenantId, EdgeId edgeId) {
- mainCtx.getClusterService().onEdgeEventUpdate(tenantId, edgeId);
- }
-
public TbMsg entityActionMsg(E entity, I id, RuleNodeId ruleNodeId, TbMsgType actionMsgType) {
return entityActionMsg(entity, id, ruleNodeId, actionMsgType, null);
}
diff --git a/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java b/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java
index dab5d05fc3..e6dda31675 100644
--- a/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java
+++ b/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java
@@ -36,8 +36,8 @@ import org.thingsboard.server.queue.discovery.TbApplicationEventListener;
import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
import org.thingsboard.server.queue.util.AfterStartUp;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
diff --git a/application/src/main/java/org/thingsboard/server/config/CustomOAuth2AuthorizationRequestResolver.java b/application/src/main/java/org/thingsboard/server/config/CustomOAuth2AuthorizationRequestResolver.java
index 368f55a154..1784c6fa1b 100644
--- a/application/src/main/java/org/thingsboard/server/config/CustomOAuth2AuthorizationRequestResolver.java
+++ b/application/src/main/java/org/thingsboard/server/config/CustomOAuth2AuthorizationRequestResolver.java
@@ -15,6 +15,7 @@
*/
package org.thingsboard.server.config;
+import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.keygen.Base64StringKeyGenerator;
@@ -43,7 +44,6 @@ import org.thingsboard.server.service.security.auth.oauth2.TbOAuth2ParameterName
import org.thingsboard.server.service.security.model.token.OAuth2AppTokenFactory;
import org.thingsboard.server.utils.MiscUtils;
-import javax.servlet.http.HttpServletRequest;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -115,7 +115,6 @@ public class CustomOAuth2AuthorizationRequestResolver implements OAuth2Authoriza
return request.getParameter("appToken");
}
- @SuppressWarnings("deprecation")
private OAuth2AuthorizationRequest resolve(HttpServletRequest request, String registrationId, String redirectUriAction, String appPackage, String appToken) {
if (registrationId == null) {
return null;
@@ -156,8 +155,6 @@ public class CustomOAuth2AuthorizationRequestResolver implements OAuth2Authoriza
addPkceParameters(attributes, additionalParameters);
}
builder.additionalParameters(additionalParameters);
- } else if (AuthorizationGrantType.IMPLICIT.equals(clientRegistration.getAuthorizationGrantType())) {
- builder = OAuth2AuthorizationRequest.implicit();
} else {
throw new IllegalArgumentException("Invalid Authorization Grant Type (" +
clientRegistration.getAuthorizationGrantType().getValue() +
diff --git a/application/src/main/java/org/thingsboard/server/config/RateLimitProcessingFilter.java b/application/src/main/java/org/thingsboard/server/config/RateLimitProcessingFilter.java
index 0b859e7b06..73209c1ed6 100644
--- a/application/src/main/java/org/thingsboard/server/config/RateLimitProcessingFilter.java
+++ b/application/src/main/java/org/thingsboard/server/config/RateLimitProcessingFilter.java
@@ -30,10 +30,10 @@ import org.thingsboard.server.cache.limits.RateLimitService;
import org.thingsboard.server.exception.ThingsboardErrorResponseHandler;
import org.thingsboard.server.service.security.model.SecurityUser;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
@Slf4j
diff --git a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
index a38512496d..21255bf1f7 100644
--- a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
+++ b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
@@ -15,71 +15,49 @@
*/
package org.thingsboard.server.config;
-import com.fasterxml.classmate.TypeResolver;
+import io.swagger.v3.core.converter.AnnotatedType;
+import io.swagger.v3.core.converter.ModelConverters;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.examples.Example;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.media.Content;
+import io.swagger.v3.oas.models.media.MediaType;
+import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.oas.models.parameters.RequestBody;
+import io.swagger.v3.oas.models.responses.ApiResponse;
+import io.swagger.v3.oas.models.responses.ApiResponses;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.servers.Server;
+import io.swagger.v3.oas.models.tags.Tag;
import lombok.extern.slf4j.Slf4j;
+import org.springdoc.core.customizers.OpenApiCustomizer;
+import org.springdoc.core.models.GroupedOpenApi;
+import org.springdoc.core.properties.SwaggerUiConfigProperties;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
import org.springframework.context.annotation.Profile;
-import org.springframework.core.annotation.Order;
-import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.thingsboard.server.common.data.StringUtils;
import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
-import org.thingsboard.server.common.data.security.Authority;
import org.thingsboard.server.exception.ThingsboardCredentialsExpiredResponse;
import org.thingsboard.server.exception.ThingsboardErrorResponse;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.security.auth.rest.LoginRequest;
import org.thingsboard.server.service.security.auth.rest.LoginResponse;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.ExampleBuilder;
-import springfox.documentation.builders.OperationBuilder;
-import springfox.documentation.builders.RepresentationBuilder;
-import springfox.documentation.builders.RequestParameterBuilder;
-import springfox.documentation.builders.ResponseBuilder;
-import springfox.documentation.schema.Example;
-import springfox.documentation.service.ApiDescription;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.ApiListing;
-import springfox.documentation.service.AuthorizationScope;
-import springfox.documentation.service.Contact;
-import springfox.documentation.service.HttpLoginPasswordScheme;
-import springfox.documentation.service.ParameterType;
-import springfox.documentation.service.Response;
-import springfox.documentation.service.SecurityReference;
-import springfox.documentation.service.SecurityScheme;
-import springfox.documentation.service.Tag;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.ApiListingBuilderPlugin;
-import springfox.documentation.spi.service.ApiListingScannerPlugin;
-import springfox.documentation.spi.service.contexts.ApiListingContext;
-import springfox.documentation.spi.service.contexts.DocumentationContext;
-import springfox.documentation.spi.service.contexts.OperationContext;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator;
-import springfox.documentation.swagger.common.SwaggerPluginSupport;
-import springfox.documentation.swagger.web.DocExpansion;
-import springfox.documentation.swagger.web.ModelRendering;
-import springfox.documentation.swagger.web.OperationsSorter;
-import springfox.documentation.swagger.web.UiConfiguration;
-import springfox.documentation.swagger.web.UiConfigurationBuilder;
-
-import java.util.ArrayList;
-import java.util.Collection;
+
import java.util.Collections;
import java.util.List;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
+import java.util.Map;
-import static com.google.common.collect.Lists.newArrayList;
-import static java.util.function.Predicate.not;
-import static springfox.documentation.builders.PathSelectors.any;
-import static springfox.documentation.builders.PathSelectors.regex;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
@Slf4j
@Configuration
@@ -87,12 +65,10 @@ import static springfox.documentation.builders.PathSelectors.regex;
@Profile("!test")
public class SwaggerConfiguration {
- @Value("${swagger.enabled:true}")
- private boolean enabled;
- @Value("${swagger.api_path_regex}")
- private String apiPathRegex;
- @Value("${swagger.security_path_regex}")
- private String securityPathRegex;
+ public static final String LOGIN_ENDPOINT = "/api/auth/login";
+
+ @Value("${swagger.api_path:/api/**}")
+ private String apiPath;
@Value("${swagger.non_security_path_regex}")
private String nonSecurityPathRegex;
@Value("${swagger.title}")
@@ -115,288 +91,217 @@ public class SwaggerConfiguration {
private String appVersion;
@Bean
- public Docket thingsboardApi() {
- TypeResolver typeResolver = new TypeResolver();
- return new Docket(DocumentationType.OAS_30)
- .enable(enabled)
- .groupName("thingsboard")
- .apiInfo(apiInfo())
- .additionalModels(
- typeResolver.resolve(ThingsboardErrorResponse.class),
- typeResolver.resolve(ThingsboardCredentialsExpiredResponse.class),
- typeResolver.resolve(LoginRequest.class),
- typeResolver.resolve(LoginResponse.class)
- )
- .select()
- .paths(apiPaths())
- .paths(any())
- .build()
- .globalResponses(HttpMethod.GET,
- defaultErrorResponses(false)
- )
- .globalResponses(HttpMethod.POST,
- defaultErrorResponses(true)
- )
- .globalResponses(HttpMethod.DELETE,
- defaultErrorResponses(false)
- )
- .securitySchemes(newArrayList(httpLogin()))
- .securityContexts(newArrayList(securityContext()))
- .ignoredParameterTypes(AuthenticationPrincipal.class)
- .enableUrlTemplating(true);
- }
+ public OpenAPI thingsboardApi() {
+ Contact contact = new Contact()
+ .name(contactName)
+ .url(contactUrl)
+ .email(contactEmail);
- @Bean
- @Order(SwaggerPluginSupport.SWAGGER_PLUGIN_ORDER)
- ApiListingScannerPlugin loginEndpointListingScanner(final CachingOperationNameGenerator operationNames) {
- return new ApiListingScannerPlugin() {
- @Override
- public List apply(DocumentationContext context) {
- return List.of(loginEndpointApiDescription(operationNames));
- }
-
- @Override
- public boolean supports(DocumentationType delimiter) {
- return DocumentationType.SWAGGER_2.equals(delimiter) || DocumentationType.OAS_30.equals(delimiter);
- }
- };
- }
+ License license = new License()
+ .name(licenseTitle)
+ .url(licenseUrl);
- @Bean
- @Order(SwaggerPluginSupport.SWAGGER_PLUGIN_ORDER)
- ApiListingBuilderPlugin loginEndpointListingBuilder() {
- return new ApiListingBuilderPlugin() {
- @Override
- public void apply(ApiListingContext apiListingContext) {
- if (apiListingContext.getResourceGroup().getGroupName().equals("default")) {
- ApiListing apiListing = apiListingContext.apiListingBuilder().build();
- if (apiListing.getResourcePath().equals("/api/auth/login")) {
- apiListingContext.apiListingBuilder().tags(Set.of(new Tag("login-endpoint", "Login Endpoint")));
- apiListingContext.apiListingBuilder().description("Login Endpoint");
- }
- }
- }
+ String apiVersion = version;
+ if (StringUtils.isEmpty(apiVersion)) {
+ apiVersion = appVersion;
+ }
- @Override
- public boolean supports(DocumentationType delimiter) {
- return DocumentationType.SWAGGER_2.equals(delimiter) || DocumentationType.OAS_30.equals(delimiter);
- }
- };
+ Info info = new Info()
+ .title(title)
+ .description(description)
+ .contact(contact)
+ .license(license)
+ .version(apiVersion);
+
+ SecurityScheme securityScheme = new SecurityScheme()
+ .type(SecurityScheme.Type.HTTP)
+ .scheme("bearer")
+ .bearerFormat("JWT")
+ .in(SecurityScheme.In.HEADER)
+ .description("Enter Username / Password");
+
+ var openApi = new OpenAPI()
+ .addServersItem(new Server().url("/").description("Default Server URL"))
+ .components(new Components().addSecuritySchemes("HTTP login form", securityScheme))
+ .info(info);
+ addLoginOperation(openApi);
+ return openApi;
}
- @Bean
- UiConfiguration uiConfig() {
- return UiConfigurationBuilder.builder()
- .deepLinking(true)
- .displayOperationId(false)
- .defaultModelsExpandDepth(1)
- .defaultModelExpandDepth(1)
- .defaultModelRendering(ModelRendering.EXAMPLE)
- .displayRequestDuration(false)
- .docExpansion(DocExpansion.LIST)
- .filter(false)
- .maxDisplayedTags(null)
- .operationsSorter(OperationsSorter.ALPHA)
- .showExtensions(false)
- .showCommonExtensions(false)
- .supportedSubmitMethods(UiConfiguration.Constants.DEFAULT_SUBMIT_METHODS)
- .validatorUrl(null)
- .persistAuthorization(true)
- .syntaxHighlightActivate(true)
- .syntaxHighlightTheme("agate")
- .build();
+ public void addLoginOperation(OpenAPI openAPI) {
+ openAPI.getComponents()
+ .addSchemas("LoginRequest", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(LoginRequest.class)).schema)
+ .addSchemas("LoginResponse", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(LoginResponse.class)).schema)
+ .addSchemas("ThingsboardErrorResponse", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(ThingsboardErrorResponse.class)).schema)
+ .addSchemas("ThingsboardCredentialsExpiredResponse", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(ThingsboardCredentialsExpiredResponse.class)).schema);
+
+ var operation = new Operation();
+ operation.summary("Login method to get user JWT token data");
+ operation.description("Login method used to authenticate user and get JWT token data.\n\nValue of the response **token** " +
+ "field can be used as **X-Authorization** header value:\n\n`X-Authorization: Bearer $JWT_TOKEN_VALUE`.");
+ var requestBody = new RequestBody().content(new Content().addMediaType(APPLICATION_JSON_VALUE,
+ new MediaType().schema(new Schema().$ref("#/components/schemas/LoginRequest"))));
+ operation.requestBody(requestBody);
+ operation.responses(getResponses());
+ operation.addTagsItem("login-endpoint");
+ var pathItem = new PathItem().post(operation);
+ openAPI.path(LOGIN_ENDPOINT, pathItem);
}
- private SecurityScheme httpLogin() {
- return HttpLoginPasswordScheme
- .X_AUTHORIZATION_BUILDER
- .loginEndpoint("/api/auth/login")
- .name("HTTP login form")
- .description("Enter Username / Password")
- .build();
- }
+ private ApiResponses getResponses() {
+ ApiResponses apiResponses = new ApiResponses();
+
+ apiResponses.addApiResponse("200", new ApiResponse().description("OK")
+ .content(new Content().addMediaType(APPLICATION_JSON_VALUE,
+ new MediaType().schema(new Schema().$ref("#/components/schemas/LoginResponse")))));
+
+ ApiResponse unauthorizedResponse = new ApiResponse().description("Unauthorized");
+ Content content = new Content();
+ MediaType mediaType = new MediaType().schema(new Schema().$ref("#/components/schemas/ThingsboardErrorResponse"));
+
+ Map examples = Map.of(
+ "bad-credentials", errorExample("Bad credentials",
+ ThingsboardErrorResponse.of("Invalid username or password", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
+ "token-expired", errorExample("JWT token expired",
+ ThingsboardErrorResponse.of("Token has expired", ThingsboardErrorCode.JWT_TOKEN_EXPIRED, HttpStatus.UNAUTHORIZED)),
+ "account-disabled", errorExample("Disabled account",
+ ThingsboardErrorResponse.of("User account is not active", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
+ "account-locked", errorExample("Locked account",
+ ThingsboardErrorResponse.of("User account is locked due to security policy", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
+ "authentication-failed", errorExample("General authentication error",
+ ThingsboardErrorResponse.of("Authentication failed", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED))
+ );
- private SecurityContext securityContext() {
- return SecurityContext.builder()
- .securityReferences(defaultAuth())
- .operationSelector(securityPathOperationSelector())
- .build();
+ mediaType.setExamples(examples);
+ content.addMediaType(APPLICATION_JSON_VALUE, mediaType);
+ unauthorizedResponse.setContent(content);
+ apiResponses.addApiResponse("401", unauthorizedResponse);
+
+ ApiResponse expiredCredentialsResponse = new ApiResponse().description("Unauthorized (**Expired credentials**)");
+ Content expiredContent = new Content();
+ MediaType expiredMediaType = new MediaType().schema(new Schema().$ref("#/components/schemas/ThingsboardCredentialsExpiredResponse"));
+ expiredMediaType.addExamples("credentials-expired", errorExample("Expired credentials",
+ ThingsboardCredentialsExpiredResponse.of("User password expired!", StringUtils.randomAlphanumeric(30))));
+ expiredContent.addMediaType(APPLICATION_JSON_VALUE, expiredMediaType);
+ expiredCredentialsResponse.setContent(expiredContent);
+ apiResponses.addApiResponse("401 ", expiredCredentialsResponse);
+
+ return apiResponses;
}
- private Predicate apiPaths() {
- return regex(apiPathRegex);
+ private Example errorExample(String summary, ThingsboardErrorResponse example) {
+ return new Example()
+ .summary(summary)
+ .value(example);
}
- private Predicate securityPathOperationSelector() {
- return new SecurityPathOperationSelector(securityPathRegex, nonSecurityPathRegex);
+ @Bean
+ public GroupedOpenApi groupedApi() {
+ return GroupedOpenApi.builder()
+ .group("thingsboard")
+ .pathsToMatch(apiPath)
+ .addOpenApiCustomizer(customOpenApiCustomizer())
+ .build();
}
- List defaultAuth() {
- AuthorizationScope[] authorizationScopes = new AuthorizationScope[3];
- authorizationScopes[0] = new AuthorizationScope(Authority.SYS_ADMIN.name(), "System administrator");
- authorizationScopes[1] = new AuthorizationScope(Authority.TENANT_ADMIN.name(), "Tenant administrator");
- authorizationScopes[2] = new AuthorizationScope(Authority.CUSTOMER_USER.name(), "Customer");
- return newArrayList(
- new SecurityReference("HTTP login form", authorizationScopes));
+ @Bean
+ @Primary
+ public SwaggerUiConfigProperties swaggerUiConfig(SwaggerUiConfigProperties uiProperties) {
+ uiProperties.setDeepLinking(true);
+ uiProperties.setDisplayOperationId(false);
+ uiProperties.setDefaultModelsExpandDepth(1);
+ uiProperties.setDefaultModelExpandDepth(1);
+ uiProperties.setDefaultModelRendering("example");
+ uiProperties.setDisplayRequestDuration(false);
+ uiProperties.setDocExpansion("list");
+ uiProperties.setFilter("false");
+ uiProperties.setMaxDisplayedTags(null);
+ uiProperties.setOperationsSorter("alpha");
+ uiProperties.setTagsSorter("alpha");
+ uiProperties.setShowExtensions(false);
+ uiProperties.setShowCommonExtensions(false);
+ uiProperties.setSupportedSubmitMethods(List.of("get", "put", "post", "delete", "options", "head", "patch", "trace"));
+ uiProperties.setValidatorUrl(null);
+ uiProperties.setPersistAuthorization(true);
+
+ var syntaxHighLight = new SwaggerUiConfigProperties.SyntaxHighlight();
+ syntaxHighLight.setActivated(true);
+ syntaxHighLight.setTheme("agate");
+
+ uiProperties.setSyntaxHighlight(syntaxHighLight);
+ return uiProperties;
}
- private ApiInfo apiInfo() {
- String apiVersion = version;
- if (StringUtils.isEmpty(apiVersion)) {
- apiVersion = appVersion;
- }
- return new ApiInfoBuilder()
- .title(title)
- .description(description)
- .contact(new Contact(contactName, contactUrl, contactEmail))
- .license(licenseTitle)
- .licenseUrl(licenseUrl)
- .version(apiVersion)
- .build();
+ public OpenApiCustomizer customOpenApiCustomizer() {
+ var loginForm = new SecurityRequirement().addList("HTTP login form");
+ return openAPI -> openAPI.getPaths().entrySet().stream().peek(entry -> {
+ securityCustomization(loginForm, entry);
+ if (!entry.getKey().equals(LOGIN_ENDPOINT)) {
+ defaultErrorResponsesCustomization(entry.getValue());
+ }
+ }).map(this::tagsCustomization).forEach(openAPI::addTagsItem);
}
- private ApiDescription loginEndpointApiDescription(final CachingOperationNameGenerator operationNames) {
- return new ApiDescription(null, "/api/auth/login", "Login method to get user JWT token data", "Login endpoint", Collections.singletonList(
- new OperationBuilder(operationNames)
- .summary("Login method to get user JWT token data")
- .tags(Set.of("login-endpoint"))
- .authorizations(new ArrayList<>())
- .position(0)
- .codegenMethodNameStem("loginPost")
- .method(HttpMethod.POST)
- .notes("Login method used to authenticate user and get JWT token data.\n\nValue of the response **token** " +
- "field can be used as **X-Authorization** header value:\n\n`X-Authorization: Bearer $JWT_TOKEN_VALUE`.")
- .requestParameters(
- List.of(
- new RequestParameterBuilder()
- .in(ParameterType.BODY)
- .required(true)
- .description("Login request")
- .content(c ->
- c.requestBody(true)
- .representation(MediaType.APPLICATION_JSON)
- .apply(classRepresentation(LoginRequest.class, false))
- )
- .build()
- )
- )
- .responses(loginResponses())
- .build()
- ), false);
+ private Tag tagsCustomization(Map.Entry entry) {
+ var operations = entry.getValue().readOperationsMap().values();
+ var tagItem = operations.stream().findAny().get().getTags().get(0);
+ return tagFromTagItem(tagItem);
}
- private Collection loginResponses() {
- List responses = new ArrayList<>();
- responses.add(
- new ResponseBuilder()
- .code("200")
- .description("OK")
- .representation(MediaType.APPLICATION_JSON)
- .apply(classRepresentation(LoginResponse.class, true)).
- build()
- );
- responses.addAll(loginErrorResponses());
- return responses;
+ private void defaultErrorResponsesCustomization(PathItem pathItem) {
+ pathItem.readOperationsMap().forEach(((httpMethod, operation) -> {
+ operation.setResponses(getResponses(operation.getResponses(), httpMethod.equals(PathItem.HttpMethod.POST)));
+ }));
}
- /** Helper methods **/
-
- private List defaultErrorResponses(boolean isPost) {
- return List.of(
- errorResponse("400", "Bad Request",
- ThingsboardErrorResponse.of(isPost ? "Invalid request body" : "Invalid UUID string: 123", ThingsboardErrorCode.BAD_REQUEST_PARAMS, HttpStatus.BAD_REQUEST)),
- errorResponse("401", "Unauthorized",
- ThingsboardErrorResponse.of("Authentication failed", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
- errorResponse("403", "Forbidden",
- ThingsboardErrorResponse.of("You don't have permission to perform this operation!",
- ThingsboardErrorCode.PERMISSION_DENIED, HttpStatus.FORBIDDEN)),
- errorResponse("404", "Not Found",
- ThingsboardErrorResponse.of("Requested item wasn't found!", ThingsboardErrorCode.ITEM_NOT_FOUND, HttpStatus.NOT_FOUND)),
- errorResponse("429", "Too Many Requests",
- ThingsboardErrorResponse.of("Too many requests for current tenant!",
- ThingsboardErrorCode.TOO_MANY_REQUESTS, HttpStatus.TOO_MANY_REQUESTS))
- );
+ private void securityCustomization(SecurityRequirement loginForm, Map.Entry entry) {
+ if (!(entry.getKey().matches(nonSecurityPathRegex) || entry.getKey().equals(LOGIN_ENDPOINT))) {
+ entry.getValue()
+ .readOperationsMap()
+ .values()
+ .forEach(operation -> operation.addSecurityItem(loginForm));
+ }
}
- private List loginErrorResponses() {
- return List.of(
- errorResponse("401", "Unauthorized",
- List.of(
- errorExample("bad-credentials", "Bad credentials",
- ThingsboardErrorResponse.of("Invalid username or password", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
- errorExample("token-expired", "JWT token expired",
- ThingsboardErrorResponse.of("Token has expired", ThingsboardErrorCode.JWT_TOKEN_EXPIRED, HttpStatus.UNAUTHORIZED)),
- errorExample("account-disabled", "Disabled account",
- ThingsboardErrorResponse.of("User account is not active", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
- errorExample("account-locked", "Locked account",
- ThingsboardErrorResponse.of("User account is locked due to security policy", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
- errorExample("authentication-failed", "General authentication error",
- ThingsboardErrorResponse.of("Authentication failed", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED))
- )
- ),
- errorResponse("401 ", "Unauthorized (**Expired credentials**)",
- List.of(
- errorExample("credentials-expired", "Expired credentials",
- ThingsboardCredentialsExpiredResponse.of("User password expired!", StringUtils.randomAlphanumeric(30)))
- ), ThingsboardCredentialsExpiredResponse.class
- )
- );
- }
+ private Tag tagFromTagItem(String tagItem) {
+ String[] words = tagItem.split("-");
+ StringBuilder sb = new StringBuilder();
- private Response errorResponse(String code, String description, ThingsboardErrorResponse example) {
- return errorResponse(code, description, List.of(errorExample("error-code-" + code, description, example)));
- }
+ for (String word : words) {
+ sb.append(word.substring(0, 1).toUpperCase());
+ sb.append(word.substring(1).toLowerCase());
+ sb.append(" ");
+ }
- private Response errorResponse(String code, String description, List examples) {
- return errorResponse(code, description, examples, ThingsboardErrorResponse.class);
+ return new Tag().name(tagItem).description(sb.toString().trim());
}
- private Response errorResponse(String code, String description, List examples,
- Class errorResponseClass) {
- return new ResponseBuilder()
- .code(code)
- .description(description)
- .examples(examples)
- .representation(MediaType.APPLICATION_JSON)
- .apply(classRepresentation(errorResponseClass, true))
- .build();
- }
+ private ApiResponses getResponses(ApiResponses apiResponses, boolean isPost) {
+ if (apiResponses == null) {
+ apiResponses = new ApiResponses();
+ }
- private Example errorExample(String id, String summary, ThingsboardErrorResponse example) {
- return new ExampleBuilder()
- .mediaType(MediaType.APPLICATION_JSON_VALUE)
- .summary(summary)
- .id(id)
- .value(example).build();
- }
+ apiResponses.addApiResponse("400", new ApiResponse().description("Bad Request")
+ .content(getErrorContent(ThingsboardErrorResponse.of(isPost ? "Invalid request body" : "Invalid UUID string: 123", ThingsboardErrorCode.BAD_REQUEST_PARAMS, HttpStatus.BAD_REQUEST))));
- private Consumer classRepresentation(Class clazz, boolean isResponse) {
- return r -> r.model(
- m ->
- m.referenceModel(ref ->
- ref.key(k ->
- k.qualifiedModelName(q ->
- q.namespace(clazz.getPackageName())
- .name(clazz.getSimpleName())).isResponse(isResponse)))
- );
- }
+ apiResponses.addApiResponse("401", new ApiResponse().description("Unauthorized")
+ .content(getErrorContent(ThingsboardErrorResponse.of("Authentication failed", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED))));
- private static class SecurityPathOperationSelector implements Predicate {
+ apiResponses.addApiResponse("403", new ApiResponse().description("Forbidden")
+ .content(getErrorContent(ThingsboardErrorResponse.of("You don't have permission to perform this operation!", ThingsboardErrorCode.PERMISSION_DENIED, HttpStatus.FORBIDDEN))));
- private final Predicate securityPathSelector;
+ apiResponses.addApiResponse("404", new ApiResponse().description("Not Found")
+ .content(getErrorContent(ThingsboardErrorResponse.of("Requested item wasn't found!", ThingsboardErrorCode.ITEM_NOT_FOUND, HttpStatus.NOT_FOUND))));
- SecurityPathOperationSelector(String securityPathRegex, String nonSecurityPathRegex) {
- this.securityPathSelector = regex(securityPathRegex).and(
- not(
- regex(nonSecurityPathRegex)
- ));
- }
+ apiResponses.addApiResponse("429", new ApiResponse().description("Too Many Requests")
+ .content(getErrorContent(ThingsboardErrorResponse.of("Too many requests for current tenant!", ThingsboardErrorCode.TOO_MANY_REQUESTS, HttpStatus.TOO_MANY_REQUESTS))));
- @Override
- public boolean test(OperationContext operationContext) {
- return this.securityPathSelector.test(operationContext.requestMappingPattern());
- }
+ return apiResponses;
}
+ private Content getErrorContent(ThingsboardErrorResponse errorResponse) {
+ return new Content().addMediaType(org.springframework.http.MediaType.APPLICATION_JSON_VALUE,
+ new MediaType().schema(new Schema().example(errorResponse)));
+ }
}
diff --git a/application/src/main/java/org/thingsboard/server/config/TbRuleEngineSecurityConfiguration.java b/application/src/main/java/org/thingsboard/server/config/TbRuleEngineSecurityConfiguration.java
index 6772608311..e1ab755036 100644
--- a/application/src/main/java/org/thingsboard/server/config/TbRuleEngineSecurityConfiguration.java
+++ b/application/src/main/java/org/thingsboard/server/config/TbRuleEngineSecurityConfiguration.java
@@ -20,24 +20,28 @@ import org.springframework.boot.autoconfigure.security.SecurityProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
import org.springframework.security.web.SecurityFilterChain;
@Configuration
@EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
+@EnableMethodSecurity
@Order(SecurityProperties.BASIC_AUTH_ORDER)
@ConditionalOnExpression("'${service.type:null}'=='tb-rule-engine'")
public class TbRuleEngineSecurityConfiguration {
@Bean
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
- http.headers().cacheControl().and().frameOptions().disable()
- .and().cors().and().csrf().disable()
+ http.headers(headers -> headers
+ .cacheControl(config -> {})
+ .frameOptions(config -> {}).disable())
+ .cors(cors -> {})
+ .csrf(AbstractHttpConfigurer::disable)
.authorizeRequests()
- .antMatchers("/actuator/prometheus").permitAll()
+ .requestMatchers("/actuator/prometheus").permitAll()
.anyRequest().authenticated();
return http.build();
}
diff --git a/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java b/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java
index 816b5a1c3f..c27ca35313 100644
--- a/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java
+++ b/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java
@@ -28,9 +28,11 @@ import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.DefaultAuthenticationEventPublisher;
import org.springframework.security.config.annotation.ObjectPostProcessor;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.annotation.web.configurers.RequestCacheConfigurer;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestResolver;
import org.springframework.security.web.SecurityFilterChain;
@@ -61,7 +63,7 @@ import java.util.List;
@Configuration
@EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
+@EnableMethodSecurity
@Order(SecurityProperties.BASIC_AUTH_ORDER)
@TbCoreComponent
public class ThingsboardSecurityConfiguration {
@@ -81,8 +83,8 @@ public class ThingsboardSecurityConfiguration {
public static final String MAIL_OAUTH2_PROCESSING_ENTRY_POINT = "/api/admin/mail/oauth2/code";
public static final String DEVICE_CONNECTIVITY_CERTIFICATE_DOWNLOAD_ENTRY_POINT = "/api/device-connectivity/mqtts/certificate/download";
-
- @Autowired private ThingsboardErrorResponseHandler restAccessDeniedHandler;
+ @Autowired
+ private ThingsboardErrorResponseHandler restAccessDeniedHandler;
@Autowired(required = false)
@Qualifier("oauth2AuthenticationSuccessHandler")
@@ -103,27 +105,33 @@ public class ThingsboardSecurityConfiguration {
@Qualifier("defaultAuthenticationFailureHandler")
private AuthenticationFailureHandler failureHandler;
- @Autowired private RestAuthenticationProvider restAuthenticationProvider;
- @Autowired private JwtAuthenticationProvider jwtAuthenticationProvider;
- @Autowired private RefreshTokenAuthenticationProvider refreshTokenAuthenticationProvider;
+ @Autowired
+ private RestAuthenticationProvider restAuthenticationProvider;
+ @Autowired
+ private JwtAuthenticationProvider jwtAuthenticationProvider;
+ @Autowired
+ private RefreshTokenAuthenticationProvider refreshTokenAuthenticationProvider;
- @Autowired(required = false) OAuth2Configuration oauth2Configuration;
+ @Autowired(required = false)
+ OAuth2Configuration oauth2Configuration;
@Autowired
@Qualifier("jwtHeaderTokenExtractor")
private TokenExtractor jwtHeaderTokenExtractor;
- @Autowired private AuthenticationManager authenticationManager;
+ @Autowired
+ private AuthenticationManager authenticationManager;
- @Autowired private RateLimitProcessingFilter rateLimitProcessingFilter;
+ @Autowired
+ private RateLimitProcessingFilter rateLimitProcessingFilter;
@Bean
protected FilterRegistrationBean buildEtagFilter() throws Exception {
ShallowEtagHeaderFilter etagFilter = new ShallowEtagHeaderFilter();
etagFilter.setWriteWeakETag(true);
FilterRegistrationBean filterRegistrationBean
- = new FilterRegistrationBean<>( etagFilter);
- filterRegistrationBean.addUrlPatterns("*.js","*.css","*.ico","/assets/*","/static/*");
+ = new FilterRegistrationBean<>(etagFilter);
+ filterRegistrationBean.addUrlPatterns("*.js", "*.css", "*.ico", "/assets/*", "/static/*");
filterRegistrationBean.setName("etagFilter");
return filterRegistrationBean;
}
@@ -180,60 +188,54 @@ public class ThingsboardSecurityConfiguration {
@Order(0)
SecurityFilterChain resources(HttpSecurity http) throws Exception {
http
- .requestMatchers((matchers) -> matchers.antMatchers("/*.js","/*.css","/*.ico","/assets/**","/static/**"))
- .headers().defaultsDisabled()
- .addHeaderWriter(new StaticHeadersWriter(HttpHeaders.CACHE_CONTROL, "max-age=0, public"))
- .and()
+ .securityMatchers(matchers -> matchers
+ .requestMatchers("/*.js", "/*.css", "/*.ico", "/assets/**", "/static/**"))
+ .headers(header -> header
+ .defaultsDisabled()
+ .addHeaderWriter(new StaticHeadersWriter(HttpHeaders.CACHE_CONTROL, "max-age=0, public")))
.authorizeHttpRequests((authorize) -> authorize.anyRequest().permitAll())
- .requestCache().disable()
- .securityContext().disable()
- .sessionManagement().disable();
+ .requestCache(RequestCacheConfigurer::disable)
+ .securityContext(AbstractHttpConfigurer::disable)
+ .sessionManagement(AbstractHttpConfigurer::disable);
return http.build();
}
@Bean
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
- http.headers().cacheControl().and().frameOptions().disable()
- .and()
- .cors()
- .and()
- .csrf().disable()
- .exceptionHandling()
- .and()
- .sessionManagement()
- .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
- .and()
- .authorizeRequests()
- .antMatchers(WEBJARS_ENTRY_POINT).permitAll() // Webjars
- .antMatchers(DEVICE_API_ENTRY_POINT).permitAll() // Device HTTP Transport API
- .antMatchers(FORM_BASED_LOGIN_ENTRY_POINT).permitAll() // Login end-point
- .antMatchers(PUBLIC_LOGIN_ENTRY_POINT).permitAll() // Public login end-point
- .antMatchers(TOKEN_REFRESH_ENTRY_POINT).permitAll() // Token refresh end-point
- .antMatchers(MAIL_OAUTH2_PROCESSING_ENTRY_POINT).permitAll() // Mail oauth2 code processing url
- .antMatchers(DEVICE_CONNECTIVITY_CERTIFICATE_DOWNLOAD_ENTRY_POINT).permitAll() // Mail oauth2 code processing url
- .antMatchers(NON_TOKEN_BASED_AUTH_ENTRY_POINTS).permitAll() // static resources, user activation and password reset end-points
- .and()
- .authorizeRequests()
- .antMatchers(WS_ENTRY_POINT).permitAll() // WebSocket API End-points
- .antMatchers(TOKEN_BASED_AUTH_ENTRY_POINT).authenticated() // Protected API End-points
- .and()
- .exceptionHandling().accessDeniedHandler(restAccessDeniedHandler)
- .and()
+ http.headers(headers -> headers
+ .cacheControl(config -> {})
+ .frameOptions(config -> {}).disable())
+ .cors(cors -> {})
+ .csrf(AbstractHttpConfigurer::disable)
+ .exceptionHandling(config -> {})
+ .sessionManagement(config -> config.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+ .authorizeRequests(config -> config
+ .requestMatchers(WEBJARS_ENTRY_POINT).permitAll() // Webjars
+ .requestMatchers(DEVICE_API_ENTRY_POINT).permitAll() // Device HTTP Transport API
+ .requestMatchers(FORM_BASED_LOGIN_ENTRY_POINT).permitAll() // Login end-point
+ .requestMatchers(PUBLIC_LOGIN_ENTRY_POINT).permitAll() // Public login end-point
+ .requestMatchers(TOKEN_REFRESH_ENTRY_POINT).permitAll() // Token refresh end-point
+ .requestMatchers(MAIL_OAUTH2_PROCESSING_ENTRY_POINT).permitAll() // Mail oauth2 code processing url
+ .requestMatchers(DEVICE_CONNECTIVITY_CERTIFICATE_DOWNLOAD_ENTRY_POINT).permitAll() // Device connectivity certificate (public)
+ .requestMatchers(NON_TOKEN_BASED_AUTH_ENTRY_POINTS).permitAll()) // static resources, user activation and password reset end-points
+ .authorizeRequests(config -> config
+ .requestMatchers(WS_ENTRY_POINT).permitAll() // Protected WebSocket API End-points
+ .requestMatchers(TOKEN_BASED_AUTH_ENTRY_POINT).authenticated()) // Protected API End-points
+ .exceptionHandling(config -> config.accessDeniedHandler(restAccessDeniedHandler))
.addFilterBefore(buildRestLoginProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
.addFilterBefore(buildRestPublicLoginProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
.addFilterBefore(buildJwtTokenAuthenticationProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
.addFilterBefore(buildRefreshTokenProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
.addFilterAfter(rateLimitProcessingFilter, UsernamePasswordAuthenticationFilter.class);
if (oauth2Configuration != null) {
- http.oauth2Login()
- .authorizationEndpoint()
- .authorizationRequestRepository(httpCookieOAuth2AuthorizationRequestRepository)
- .authorizationRequestResolver(oAuth2AuthorizationRequestResolver)
- .and()
+ http.oauth2Login(login -> login
+ .authorizationEndpoint(config -> config
+ .authorizationRequestRepository(httpCookieOAuth2AuthorizationRequestRepository)
+ .authorizationRequestResolver(oAuth2AuthorizationRequestResolver))
.loginPage("/oauth2Login")
.loginProcessingUrl(oauth2Configuration.getLoginProcessingUrl())
.successHandler(oauth2AuthenticationSuccessHandler)
- .failureHandler(oauth2AuthenticationFailureHandler);
+ .failureHandler(oauth2AuthenticationFailureHandler));
}
return http.build();
}
diff --git a/application/src/main/java/org/thingsboard/server/config/WebConfig.java b/application/src/main/java/org/thingsboard/server/config/WebConfig.java
index 36645e99c4..81597952c0 100644
--- a/application/src/main/java/org/thingsboard/server/config/WebConfig.java
+++ b/application/src/main/java/org/thingsboard/server/config/WebConfig.java
@@ -19,8 +19,8 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.thingsboard.server.utils.MiscUtils;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
@Controller
diff --git a/application/src/main/java/org/thingsboard/server/config/annotations/ApiOperation.java b/application/src/main/java/org/thingsboard/server/config/annotations/ApiOperation.java
new file mode 100644
index 0000000000..c54fa44070
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/config/annotations/ApiOperation.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright © 2016-2024 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.config.annotations;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import org.springframework.core.annotation.AliasFor;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Operation
+public @interface ApiOperation {
+
+ @AliasFor(annotation = Operation.class, attribute = "summary")
+ String value();
+
+ @AliasFor(annotation = Operation.class, attribute = "description")
+ String notes() default "";
+
+ boolean hidden() default false;
+
+ RequestBody requestBody() default @RequestBody;
+
+ ApiResponse[] responses() default {};
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java b/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
index afd3b33734..93e8c0be90 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.controller;
import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.util.concurrent.FutureCallback;
+import jakarta.annotation.Nullable;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -45,7 +46,6 @@ import org.thingsboard.server.service.security.AccessValidator;
import org.thingsboard.server.service.security.model.SecurityUser;
import org.thingsboard.server.service.security.permission.Operation;
-import javax.annotation.Nullable;
import java.util.Optional;
import java.util.UUID;
diff --git a/application/src/main/java/org/thingsboard/server/controller/AdminController.java b/application/src/main/java/org/thingsboard/server/controller/AdminController.java
index ebb4bd3916..739f386dc9 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AdminController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AdminController.java
@@ -28,10 +28,15 @@ import com.google.api.client.json.gson.GsonFactory;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -68,6 +73,7 @@ import org.thingsboard.server.common.data.sync.vc.AutoCommitSettings;
import org.thingsboard.server.common.data.sync.vc.RepositorySettings;
import org.thingsboard.server.common.data.sync.vc.RepositorySettingsInfo;
import org.thingsboard.server.common.data.sync.vc.VcUtils;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.dao.audit.AuditLogService;
import org.thingsboard.server.dao.settings.AdminSettingsService;
import org.thingsboard.server.queue.util.TbCoreComponent;
@@ -83,9 +89,6 @@ import org.thingsboard.server.service.sync.vc.autocommit.TbAutoCommitSettingsSer
import org.thingsboard.server.service.system.SystemInfoService;
import org.thingsboard.server.service.update.UpdateService;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Optional;
@@ -123,7 +126,7 @@ public class AdminController extends BaseController {
@RequestMapping(value = "/settings/{key}", method = RequestMethod.GET)
@ResponseBody
public AdminSettings getAdminSettings(
- @ApiParam(value = "A string value of the key (e.g. 'general' or 'mail').")
+ @Parameter(description = "A string value of the key (e.g. 'general' or 'mail').")
@PathVariable("key") String key) throws ThingsboardException {
accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.READ);
AdminSettings adminSettings = checkNotNull(adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, key), "No Administration settings found for key: " + key);
@@ -142,7 +145,7 @@ public class AdminController extends BaseController {
@RequestMapping(value = "/settings", method = RequestMethod.POST)
@ResponseBody
public AdminSettings saveAdminSettings(
- @ApiParam(value = "A JSON value representing the Administration Settings.")
+ @Parameter(description = "A JSON value representing the Administration Settings.")
@RequestBody AdminSettings adminSettings) throws ThingsboardException {
accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.WRITE);
adminSettings.setTenantId(getTenantId());
@@ -173,7 +176,7 @@ public class AdminController extends BaseController {
@RequestMapping(value = "/securitySettings", method = RequestMethod.POST)
@ResponseBody
public SecuritySettings saveSecuritySettings(
- @ApiParam(value = "A JSON value representing the Security Settings.")
+ @Parameter(description = "A JSON value representing the Security Settings.")
@RequestBody SecuritySettings securitySettings) throws ThingsboardException {
accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.WRITE);
securitySettings = checkNotNull(systemSecurityService.saveSecuritySettings(securitySettings));
@@ -182,7 +185,7 @@ public class AdminController extends BaseController {
@ApiOperation(value = "Get the JWT Settings object (getJwtSettings)",
notes = "Get the JWT Settings object that contains JWT token policy, etc. " + SYSTEM_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('SYS_ADMIN')")
@RequestMapping(value = "/jwtSettings", method = RequestMethod.GET)
@ResponseBody
@@ -193,12 +196,12 @@ public class AdminController extends BaseController {
@ApiOperation(value = "Update JWT Settings (saveJwtSettings)",
notes = "Updates the JWT Settings object that contains JWT token policy, etc. The tokenSigningKey field is a Base64 encoded string." + SYSTEM_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('SYS_ADMIN')")
@RequestMapping(value = "/jwtSettings", method = RequestMethod.POST)
@ResponseBody
public JwtPair saveJwtSettings(
- @ApiParam(value = "A JSON value representing the JWT Settings.")
+ @Parameter(description = "A JSON value representing the JWT Settings.")
@RequestBody JwtSettings jwtSettings) throws ThingsboardException {
SecurityUser securityUser = getCurrentUser();
accessControlService.checkPermission(securityUser, Resource.ADMIN_SETTINGS, Operation.WRITE);
@@ -212,12 +215,12 @@ public class AdminController extends BaseController {
@PreAuthorize("hasAuthority('SYS_ADMIN')")
@RequestMapping(value = "/settings/testMail", method = RequestMethod.POST)
public void sendTestMail(
- @ApiParam(value = "A JSON value representing the Mail Settings.")
+ @Parameter(description = "A JSON value representing the Mail Settings.")
@RequestBody AdminSettings adminSettings) throws ThingsboardException {
accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.READ);
adminSettings = checkNotNull(adminSettings);
if (adminSettings.getKey().equals("mail")) {
- if (adminSettings.getJsonValue().has("enableOauth2") && adminSettings.getJsonValue().get("enableOauth2").asBoolean()){
+ if (adminSettings.getJsonValue().has("enableOauth2") && adminSettings.getJsonValue().get("enableOauth2").asBoolean()) {
AdminSettings mailSettings = checkNotNull(adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail"));
JsonNode refreshToken = mailSettings.getJsonValue().get("refreshToken");
if (refreshToken == null) {
@@ -225,8 +228,7 @@ public class AdminController extends BaseController {
}
ObjectNode settings = (ObjectNode) adminSettings.getJsonValue();
settings.put("refreshToken", refreshToken.asText());
- }
- else {
+ } else {
if (!adminSettings.getJsonValue().has("password")) {
AdminSettings mailSettings = checkNotNull(adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail"));
((ObjectNode) adminSettings.getJsonValue()).put("password", mailSettings.getJsonValue().get("password").asText());
@@ -243,7 +245,7 @@ public class AdminController extends BaseController {
@PreAuthorize("hasAuthority('SYS_ADMIN')")
@RequestMapping(value = "/settings/testSms", method = RequestMethod.POST)
public void sendTestSms(
- @ApiParam(value = "A JSON value representing the Test SMS request.")
+ @Parameter(description = "A JSON value representing the Test SMS request.")
@RequestBody TestSmsRequest testSmsRequest) throws ThingsboardException {
SecurityUser user = getCurrentUser();
accessControlService.checkPermission(user, Resource.ADMIN_SETTINGS, Operation.READ);
@@ -326,7 +328,7 @@ public class AdminController extends BaseController {
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/repositorySettings/checkAccess", method = RequestMethod.POST)
public DeferredResult checkRepositoryAccess(
- @ApiParam(value = "A JSON value representing the Repository Settings.")
+ @Parameter(description = "A JSON value representing the Repository Settings.")
@RequestBody RepositorySettings settings) throws Exception {
accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
settings = checkNotNull(settings);
@@ -409,12 +411,12 @@ public class AdminController extends BaseController {
@RequestMapping(value = "/mail/oauth2/loginProcessingUrl", method = RequestMethod.GET)
@ResponseBody
public String getMailProcessingUrl() throws ThingsboardException {
- accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.READ);
- return "\"/api/admin/mail/oauth2/code\"";
+ accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.READ);
+ return "\"/api/admin/mail/oauth2/code\"";
}
@ApiOperation(value = "Redirect user to mail provider login page. ", notes = "After user logged in and provided access" +
- "provider sends authorization code to specified redirect uri.)" )
+ "provider sends authorization code to specified redirect uri.)")
@PreAuthorize("hasAuthority('SYS_ADMIN')")
@RequestMapping(value = "/mail/oauth2/authorize", method = RequestMethod.GET, produces = "application/text")
public String getAuthorizationUrl(HttpServletRequest request, HttpServletResponse response) throws ThingsboardException {
@@ -431,7 +433,7 @@ public class AdminController extends BaseController {
String clientId = checkNotNull(jsonValue.get("clientId"), "No clientId was configured").asText();
String authUri = checkNotNull(jsonValue.get("authUri"), "No authorization uri was configured").asText();
String redirectUri = checkNotNull(jsonValue.get("redirectUri"), "No Redirect uri was configured").asText();
- List scope = JacksonUtil.convertValue(checkNotNull(jsonValue.get("scope"), "No scope was configured"), new TypeReference<>() {
+ List scope = JacksonUtil.convertValue(checkNotNull(jsonValue.get("scope"), "No scope was configured"), new TypeReference<>() {
});
return "\"" + new AuthorizationCodeRequestUrl(authUri, clientId)
@@ -449,7 +451,7 @@ public class AdminController extends BaseController {
Optional cookieState = CookieUtils.getCookie(request, STATE_COOKIE_NAME);
String baseUrl = this.systemSecurityService.getBaseUrl(TenantId.SYS_TENANT_ID, new CustomerId(EntityId.NULL_UUID), request);
- String prevUri = baseUrl + (prevUrlOpt.isPresent() ? prevUrlOpt.get().getValue(): "/settings/outgoing-mail");
+ String prevUri = baseUrl + (prevUrlOpt.isPresent() ? prevUrlOpt.get().getValue() : "/settings/outgoing-mail");
if (cookieState.isEmpty() || !cookieState.get().getValue().equals(state)) {
CookieUtils.deleteCookie(request, response, STATE_COOKIE_NAME);
@@ -476,8 +478,8 @@ public class AdminController extends BaseController {
log.warn("Unable to retrieve refresh token: {}", e.getMessage());
throw new ThingsboardException("Error while requesting access token: " + e.getMessage(), ThingsboardErrorCode.GENERAL);
}
- ((ObjectNode)jsonValue).put("refreshToken", tokenResponse.getRefreshToken());
- ((ObjectNode)jsonValue).put("tokenGenerated", true);
+ ((ObjectNode) jsonValue).put("refreshToken", tokenResponse.getRefreshToken());
+ ((ObjectNode) jsonValue).put("tokenGenerated", true);
adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, adminSettings);
response.sendRedirect(prevUri);
diff --git a/application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java b/application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java
index acc6ec2b68..cca82f5ee5 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java
@@ -15,8 +15,10 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -35,17 +37,16 @@ import org.thingsboard.server.common.data.id.AlarmCommentId;
import org.thingsboard.server.common.data.id.AlarmId;
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.entitiy.alarm.TbAlarmCommentService;
import org.thingsboard.server.service.security.permission.Operation;
import static org.thingsboard.server.controller.ControllerConstants.ALARM_COMMENT_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.ALARM_COMMENT_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.ALARM_ID_PARAM_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH;
@@ -69,12 +70,12 @@ public class AlarmCommentController extends BaseController {
"\n\n To create new Alarm comment entity it is enough to specify 'comment' json element with 'text' node, for example: {\"comment\": { \"text\": \"my comment\"}}. " +
"\n\n If comment type is not specified the default value 'OTHER' will be saved. If 'alarmId' or 'userId' specified in body it will be ignored." +
TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH
- , produces = MediaType.APPLICATION_JSON_VALUE)
+ , responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/alarm/{alarmId}/comment", method = RequestMethod.POST)
@ResponseBody
- public AlarmComment saveAlarmComment(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION)
- @PathVariable(ALARM_ID) String strAlarmId, @ApiParam(value = "A JSON value representing the comment.") @RequestBody AlarmComment alarmComment) throws ThingsboardException {
+ public AlarmComment saveAlarmComment(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION)
+ @PathVariable(ALARM_ID) String strAlarmId, @Parameter(description = "A JSON value representing the comment.") @RequestBody AlarmComment alarmComment) throws ThingsboardException {
checkParameter(ALARM_ID, strAlarmId);
AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
Alarm alarm = checkAlarmInfoId(alarmId, Operation.WRITE);
@@ -83,11 +84,11 @@ public class AlarmCommentController extends BaseController {
}
@ApiOperation(value = "Delete Alarm comment (deleteAlarmComment)",
- notes = "Deletes the Alarm comment. Referencing non-existing Alarm comment Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ notes = "Deletes the Alarm comment. Referencing non-existing Alarm comment Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/alarm/{alarmId}/comment/{commentId}", method = RequestMethod.DELETE)
@ResponseBody
- public void deleteAlarmComment(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId, @ApiParam(value = ALARM_COMMENT_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_COMMENT_ID) String strCommentId) throws ThingsboardException {
+ public void deleteAlarmComment(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId, @Parameter(description = ALARM_COMMENT_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_COMMENT_ID) String strCommentId) throws ThingsboardException {
checkParameter(ALARM_ID, strAlarmId);
AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
@@ -99,20 +100,20 @@ public class AlarmCommentController extends BaseController {
@ApiOperation(value = "Get Alarm comments (getAlarmComments)",
notes = "Returns a page of alarm comments for specified alarm. " +
- PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/alarm/{alarmId}/comment", method = RequestMethod.GET)
@ResponseBody
public PageData getAlarmComments(
- @ApiParam(value = ALARM_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = ALARM_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(ALARM_ID) String strAlarmId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ALARM_COMMENT_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "id"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder
) throws Exception {
checkParameter(ALARM_ID, strAlarmId);
diff --git a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
index facf56c476..d983f08ec2 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
@@ -15,8 +15,10 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
@@ -47,6 +49,7 @@ import org.thingsboard.server.common.data.id.UserId;
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.entitiy.alarm.TbAlarmService;
import org.thingsboard.server.service.security.permission.Operation;
@@ -61,7 +64,6 @@ import java.util.concurrent.ExecutionException;
import static org.thingsboard.server.controller.ControllerConstants.ALARM_ID_PARAM_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.ALARM_INFO_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.ALARM_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.ASSIGNEE_ID;
import static org.thingsboard.server.controller.ControllerConstants.ASSIGN_ID_PARAM_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.ENTITY_ID;
@@ -71,7 +73,6 @@ import static org.thingsboard.server.controller.ControllerConstants.ENTITY_TYPE_
import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH;
@@ -91,11 +92,8 @@ public class AlarmController extends BaseController {
private static final String ALARM_QUERY_SEARCH_STATUS_DESCRIPTION = "A string value representing one of the AlarmSearchStatus enumeration value";
private static final String ALARM_QUERY_SEARCH_STATUS_ARRAY_DESCRIPTION = "A list of string values separated by comma ',' representing one of the AlarmSearchStatus enumeration value";
- private static final String ALARM_QUERY_SEARCH_STATUS_ALLOWABLE_VALUES = "ANY, ACTIVE, CLEARED, ACK, UNACK";
private static final String ALARM_QUERY_STATUS_DESCRIPTION = "A string value representing one of the AlarmStatus enumeration value";
- private static final String ALARM_QUERY_STATUS_ALLOWABLE_VALUES = "ACTIVE_UNACK, ACTIVE_ACK, CLEARED_UNACK, CLEARED_ACK";
private static final String ALARM_QUERY_SEVERITY_ARRAY_DESCRIPTION = "A list of string values separated by comma ',' representing one of the AlarmSeverity enumeration value";
- private static final String ALARM_QUERY_SEVERITY_ALLOWABLE_VALUES = "CRITICAL, MAJOR, MINOR, WARNING, INDETERMINATE";
private static final String ALARM_QUERY_TYPE_ARRAY_DESCRIPTION = "A list of string values separated by comma ',' representing alarm types";
private static final String ALARM_QUERY_ASSIGNEE_DESCRIPTION = "A string value representing the assignee user id. For example, '784f394c-42b6-435a-983c-b7beff2784f9'";
@@ -106,11 +104,11 @@ public class AlarmController extends BaseController {
"filled in the AlarmInfo object field: 'originatorName' or will returns as null.";
@ApiOperation(value = "Get Alarm (getAlarmById)",
- notes = "Fetch the Alarm object based on the provided Alarm Id. " + ALARM_SECURITY_CHECK, produces = MediaType.APPLICATION_JSON_VALUE)
+ notes = "Fetch the Alarm object based on the provided Alarm Id. " + ALARM_SECURITY_CHECK, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/alarm/{alarmId}", method = RequestMethod.GET)
@ResponseBody
- public Alarm getAlarmById(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION)
+ public Alarm getAlarmById(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION)
@PathVariable(ALARM_ID) String strAlarmId) throws ThingsboardException {
checkParameter(ALARM_ID, strAlarmId);
AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
@@ -119,11 +117,11 @@ public class AlarmController extends BaseController {
@ApiOperation(value = "Get Alarm Info (getAlarmInfoById)",
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, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/alarm/info/{alarmId}", method = RequestMethod.GET)
@ResponseBody
- public AlarmInfo getAlarmInfoById(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION)
+ public AlarmInfo getAlarmInfoById(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION)
@PathVariable(ALARM_ID) String strAlarmId) throws ThingsboardException {
checkParameter(ALARM_ID, strAlarmId);
AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
@@ -141,11 +139,11 @@ public class AlarmController extends BaseController {
"If the user clears the alarm (see 'Clear Alarm(clearAlarm)'), than new alarm with the same type and same device may be created. " +
"Remove 'id', 'tenantId' and optionally 'customerId' from the request body example (below) to create new Alarm entity. " +
TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH
- , produces = MediaType.APPLICATION_JSON_VALUE)
+ , responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/alarm", method = RequestMethod.POST)
@ResponseBody
- public Alarm saveAlarm(@ApiParam(value = "A JSON value representing the alarm.") @RequestBody Alarm alarm) throws ThingsboardException {
+ public Alarm saveAlarm(@Parameter(description = "A JSON value representing the alarm.") @RequestBody Alarm alarm) throws ThingsboardException {
alarm.setTenantId(getTenantId());
checkNotNull(alarm.getOriginator());
checkEntity(alarm.getId(), alarm, Resource.ALARM);
@@ -157,11 +155,11 @@ public class AlarmController extends BaseController {
}
@ApiOperation(value = "Delete Alarm (deleteAlarm)",
- notes = "Deletes the Alarm. Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ notes = "Deletes the Alarm. Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/alarm/{alarmId}", method = RequestMethod.DELETE)
@ResponseBody
- public Boolean deleteAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws ThingsboardException {
+ public Boolean deleteAlarm(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws ThingsboardException {
checkParameter(ALARM_ID, strAlarmId);
AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
Alarm alarm = checkAlarmId(alarmId, Operation.DELETE);
@@ -171,11 +169,11 @@ public class AlarmController extends BaseController {
@ApiOperation(value = "Acknowledge Alarm (ackAlarm)",
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. " +
- "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, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/alarm/{alarmId}/ack", method = RequestMethod.POST)
@ResponseStatus(value = HttpStatus.OK)
- public AlarmInfo ackAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws Exception {
+ public AlarmInfo ackAlarm(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws Exception {
checkParameter(ALARM_ID, strAlarmId);
AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
@@ -186,11 +184,11 @@ public class AlarmController extends BaseController {
@ApiOperation(value = "Clear Alarm (clearAlarm)",
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. " +
- "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, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/alarm/{alarmId}/clear", method = RequestMethod.POST)
@ResponseStatus(value = HttpStatus.OK)
- public AlarmInfo clearAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws Exception {
+ public AlarmInfo clearAlarm(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws Exception {
checkParameter(ALARM_ID, strAlarmId);
AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
@@ -202,13 +200,13 @@ public class AlarmController extends BaseController {
notes = "Assign the Alarm. " +
"Once assigned, the 'assign_ts' field will be set to current timestamp and special rule chain event 'ALARM_ASSIGNED' " +
"(or ALARM_REASSIGNED in case of assigning already assigned alarm) 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, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/alarm/{alarmId}/assign/{assigneeId}", method = RequestMethod.POST)
@ResponseStatus(value = HttpStatus.OK)
- public Alarm assignAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION)
+ public Alarm assignAlarm(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION)
@PathVariable(ALARM_ID) String strAlarmId,
- @ApiParam(value = ASSIGN_ID_PARAM_DESCRIPTION)
+ @Parameter(description = ASSIGN_ID_PARAM_DESCRIPTION)
@PathVariable(ASSIGNEE_ID) String strAssigneeId
) throws Exception {
checkParameter(ALARM_ID, strAlarmId);
@@ -223,11 +221,11 @@ public class AlarmController extends BaseController {
@ApiOperation(value = "Unassign Alarm (unassignAlarm)",
notes = "Unassign the Alarm. " +
"Once unassigned, the 'assign_ts' field will be set to current timestamp and special rule chain event 'ALARM_UNASSIGNED' 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, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/alarm/{alarmId}/assign", method = RequestMethod.DELETE)
@ResponseStatus(value = HttpStatus.OK)
- public Alarm unassignAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION)
+ public Alarm unassignAlarm(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION)
@PathVariable(ALARM_ID) String strAlarmId
) throws Exception {
checkParameter(ALARM_ID, strAlarmId);
@@ -238,36 +236,36 @@ public class AlarmController extends BaseController {
@ApiOperation(value = "Get Alarms (getAlarms)",
notes = "Returns a page of alarms for the selected entity. Specifying both parameters 'searchStatus' and 'status' at the same time will cause an error. " +
- PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/alarm/{entityType}/{entityId}", method = RequestMethod.GET)
@ResponseBody
public PageData getAlarms(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE")
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE"))
@PathVariable(ENTITY_TYPE) String strEntityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(ENTITY_ID) String strEntityId,
- @ApiParam(value = ALARM_QUERY_SEARCH_STATUS_DESCRIPTION, allowableValues = ALARM_QUERY_SEARCH_STATUS_ALLOWABLE_VALUES)
+ @Parameter(description = ALARM_QUERY_SEARCH_STATUS_DESCRIPTION, schema = @Schema(allowableValues = {"ANY", "ACTIVE", "CLEARED", "ACK", "UNACK"}))
@RequestParam(required = false) String searchStatus,
- @ApiParam(value = ALARM_QUERY_STATUS_DESCRIPTION, allowableValues = ALARM_QUERY_STATUS_ALLOWABLE_VALUES)
+ @Parameter(description = ALARM_QUERY_STATUS_DESCRIPTION, schema = @Schema(allowableValues = {"ACTIVE_UNACK", "ACTIVE_ACK", "CLEARED_UNACK", "CLEARED_ACK"}))
@RequestParam(required = false) String status,
- @ApiParam(value = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
@RequestParam(required = false) String assigneeId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ALARM_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "startTs", "endTs", "type", "ackTs", "clearTs", "severity", "status"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = ALARM_QUERY_START_TIME_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_START_TIME_DESCRIPTION)
@RequestParam(required = false) Long startTime,
- @ApiParam(value = ALARM_QUERY_END_TIME_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_END_TIME_DESCRIPTION)
@RequestParam(required = false) Long endTime,
- @ApiParam(value = ALARM_QUERY_FETCH_ORIGINATOR_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_FETCH_ORIGINATOR_DESCRIPTION)
@RequestParam(required = false) Boolean fetchOriginator
) throws ThingsboardException, ExecutionException, InterruptedException {
checkParameter("EntityId", strEntityId);
@@ -294,32 +292,32 @@ public class AlarmController extends BaseController {
"If the user has the authority of 'Tenant Administrator', the server returns alarms that belongs to the tenant of current user. " +
"If the user has the authority of 'Customer User', the server returns alarms that belongs to the customer of current user. " +
"Specifying both parameters 'searchStatus' and 'status' at the same time will cause an error. " +
- PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/alarms", method = RequestMethod.GET)
@ResponseBody
public PageData getAllAlarms(
- @ApiParam(value = ALARM_QUERY_SEARCH_STATUS_DESCRIPTION, allowableValues = ALARM_QUERY_SEARCH_STATUS_ALLOWABLE_VALUES)
+ @Parameter(description = ALARM_QUERY_SEARCH_STATUS_DESCRIPTION, schema = @Schema(allowableValues = {"ANY", "ACTIVE", "CLEARED", "ACK", "UNACK"}))
@RequestParam(required = false) String searchStatus,
- @ApiParam(value = ALARM_QUERY_STATUS_DESCRIPTION, allowableValues = ALARM_QUERY_STATUS_ALLOWABLE_VALUES)
+ @Parameter(description = ALARM_QUERY_STATUS_DESCRIPTION, schema = @Schema(allowableValues = {"ACTIVE_UNACK", "ACTIVE_ACK", "CLEARED_UNACK", "CLEARED_ACK"}))
@RequestParam(required = false) String status,
- @ApiParam(value = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
@RequestParam(required = false) String assigneeId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ALARM_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "startTs", "endTs", "type", "ackTs", "clearTs", "severity", "status"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = ALARM_QUERY_START_TIME_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_START_TIME_DESCRIPTION)
@RequestParam(required = false) Long startTime,
- @ApiParam(value = ALARM_QUERY_END_TIME_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_END_TIME_DESCRIPTION)
@RequestParam(required = false) Long endTime,
- @ApiParam(value = ALARM_QUERY_FETCH_ORIGINATOR_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_FETCH_ORIGINATOR_DESCRIPTION)
@RequestParam(required = false) Boolean fetchOriginator
) throws ThingsboardException, ExecutionException, InterruptedException {
AlarmSearchStatus alarmSearchStatus = StringUtils.isEmpty(searchStatus) ? null : AlarmSearchStatus.valueOf(searchStatus);
@@ -343,36 +341,36 @@ public class AlarmController extends BaseController {
@ApiOperation(value = "Get Alarms (getAlarmsV2)",
notes = "Returns a page of alarms for the selected entity. " +
- PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/v2/alarm/{entityType}/{entityId}", method = RequestMethod.GET)
@ResponseBody
public PageData getAlarmsV2(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE")
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE"))
@PathVariable(ENTITY_TYPE) String strEntityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(ENTITY_ID) String strEntityId,
- @ApiParam(value = ALARM_QUERY_SEARCH_STATUS_ARRAY_DESCRIPTION, allowableValues = ALARM_QUERY_SEARCH_STATUS_ALLOWABLE_VALUES)
+ @Parameter(description = ALARM_QUERY_SEARCH_STATUS_ARRAY_DESCRIPTION, schema = @Schema(allowableValues = {"ANY", "ACTIVE", "CLEARED", "ACK", "UNACK"}))
@RequestParam(required = false) String[] statusList,
- @ApiParam(value = ALARM_QUERY_SEVERITY_ARRAY_DESCRIPTION, allowableValues = ALARM_QUERY_SEVERITY_ALLOWABLE_VALUES)
+ @Parameter(description = ALARM_QUERY_SEVERITY_ARRAY_DESCRIPTION, schema = @Schema(allowableValues = {"CRITICAL", "MAJOR", "MINOR", "WARNING", "INDETERMINATE"}))
@RequestParam(required = false) String[] severityList,
- @ApiParam(value = ALARM_QUERY_TYPE_ARRAY_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_TYPE_ARRAY_DESCRIPTION)
@RequestParam(required = false) String[] typeList,
- @ApiParam(value = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
@RequestParam(required = false) String assigneeId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ALARM_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "startTs", "endTs", "type", "ackTs", "clearTs", "severity", "status"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = ALARM_QUERY_START_TIME_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_START_TIME_DESCRIPTION)
@RequestParam(required = false) Long startTime,
- @ApiParam(value = ALARM_QUERY_END_TIME_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_END_TIME_DESCRIPTION)
@RequestParam(required = false) Long endTime
) throws ThingsboardException, ExecutionException, InterruptedException {
checkParameter("EntityId", strEntityId);
@@ -409,32 +407,32 @@ public class AlarmController extends BaseController {
notes = "Returns a page of alarms that belongs to the current user owner. " +
"If the user has the authority of 'Tenant Administrator', the server returns alarms that belongs to the tenant of current user. " +
"If the user has the authority of 'Customer User', the server returns alarms that belongs to the customer of current user. " +
- PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/v2/alarms", method = RequestMethod.GET)
@ResponseBody
public PageData getAllAlarmsV2(
- @ApiParam(value = ALARM_QUERY_SEARCH_STATUS_ARRAY_DESCRIPTION, allowableValues = ALARM_QUERY_SEARCH_STATUS_ALLOWABLE_VALUES)
+ @Parameter(description = ALARM_QUERY_SEARCH_STATUS_ARRAY_DESCRIPTION, schema = @Schema(allowableValues = {"ANY", "ACTIVE", "CLEARED", "ACK", "UNACK"}))
@RequestParam(required = false) String[] statusList,
- @ApiParam(value = ALARM_QUERY_SEVERITY_ARRAY_DESCRIPTION, allowableValues = ALARM_QUERY_SEVERITY_ALLOWABLE_VALUES)
+ @Parameter(description = ALARM_QUERY_SEVERITY_ARRAY_DESCRIPTION, schema = @Schema(allowableValues = {"CRITICAL", "MAJOR", "MINOR", "WARNING", "INDETERMINATE"}))
@RequestParam(required = false) String[] severityList,
- @ApiParam(value = ALARM_QUERY_TYPE_ARRAY_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_TYPE_ARRAY_DESCRIPTION)
@RequestParam(required = false) String[] typeList,
- @ApiParam(value = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
@RequestParam(required = false) String assigneeId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ALARM_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "startTs", "endTs", "type", "ackTs", "clearTs", "severity", "status"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = ALARM_QUERY_START_TIME_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_START_TIME_DESCRIPTION)
@RequestParam(required = false) Long startTime,
- @ApiParam(value = ALARM_QUERY_END_TIME_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_END_TIME_DESCRIPTION)
@RequestParam(required = false) Long endTime
) throws ThingsboardException, ExecutionException, InterruptedException {
List alarmStatusList = new ArrayList<>();
@@ -470,20 +468,20 @@ public class AlarmController extends BaseController {
@ApiOperation(value = "Get Highest Alarm Severity (getHighestAlarmSeverity)",
notes = "Search the alarms by originator ('entityType' and entityId') and optional 'status' or 'searchStatus' filters and returns the highest AlarmSeverity(CRITICAL, MAJOR, MINOR, WARNING or INDETERMINATE). " +
"Specifying both parameters 'searchStatus' and 'status' at the same time will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH
- , produces = MediaType.APPLICATION_JSON_VALUE)
+ , responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/alarm/highestSeverity/{entityType}/{entityId}", method = RequestMethod.GET)
@ResponseBody
public AlarmSeverity getHighestAlarmSeverity(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE")
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE"))
@PathVariable(ENTITY_TYPE) String strEntityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(ENTITY_ID) String strEntityId,
- @ApiParam(value = ALARM_QUERY_SEARCH_STATUS_DESCRIPTION, allowableValues = ALARM_QUERY_SEARCH_STATUS_ALLOWABLE_VALUES)
+ @Parameter(description = ALARM_QUERY_SEARCH_STATUS_DESCRIPTION, schema = @Schema(allowableValues = {"ANY", "ACTIVE", "CLEARED", "ACK", "UNACK"}))
@RequestParam(required = false) String searchStatus,
- @ApiParam(value = ALARM_QUERY_STATUS_DESCRIPTION, allowableValues = ALARM_QUERY_STATUS_ALLOWABLE_VALUES)
+ @Parameter(description = ALARM_QUERY_STATUS_DESCRIPTION, schema = @Schema(allowableValues = {"ACTIVE_UNACK", "ACTIVE_ACK", "CLEARED_UNACK", "CLEARED_ACK"}))
@RequestParam(required = false) String status,
- @ApiParam(value = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
@RequestParam(required = false) String assigneeId
) throws ThingsboardException {
checkParameter("EntityId", strEntityId);
@@ -501,17 +499,18 @@ public class AlarmController extends BaseController {
}
@ApiOperation(value = "Get Alarm Types (getAlarmTypes)",
- notes = "Returns a set of unique alarm types based on alarms that are either owned by the tenant or assigned to the customer which user is performing the request.", produces = MediaType.APPLICATION_JSON_VALUE)
+ notes = "Returns a set of unique alarm types based on alarms that are either owned by the tenant or assigned to the customer which user is performing the request.",
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/alarm/types", method = RequestMethod.GET)
@ResponseBody
- public PageData getAlarmTypes(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ public PageData getAlarmTypes(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException, ExecutionException, InterruptedException {
PageLink pageLink = createPageLink(pageSize, page, textSearch, "type", sortOrder);
return checkNotNull(alarmService.findAlarmTypesByTenantId(getTenantId(), pageLink));
diff --git a/application/src/main/java/org/thingsboard/server/controller/AssetController.java b/application/src/main/java/org/thingsboard/server/controller/AssetController.java
index 33a8cdca5b..6f51202c36 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AssetController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AssetController.java
@@ -16,8 +16,10 @@
package org.thingsboard.server.controller;
import com.google.common.util.concurrent.ListenableFuture;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
@@ -49,6 +51,7 @@ import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.page.TimePageLink;
import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportRequest;
import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportResult;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.dao.exception.IncorrectParameterException;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.queue.util.TbCoreComponent;
@@ -67,7 +70,6 @@ import static org.thingsboard.server.controller.ControllerConstants.ASSET_ID_PAR
import static org.thingsboard.server.controller.ControllerConstants.ASSET_INFO_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.ASSET_NAME_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.ASSET_PROFILE_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.ASSET_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.ASSET_TEXT_SEARCH_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.ASSET_TYPE_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID_PARAM_DESCRIPTION;
@@ -79,7 +81,6 @@ import static org.thingsboard.server.controller.ControllerConstants.EDGE_UNASSIG
import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -102,11 +103,11 @@ public class AssetController extends BaseController {
notes = "Fetch the Asset object based on the provided Asset Id. " +
"If the user has the authority of 'Tenant Administrator', the server checks that the asset is owned by the same tenant. " +
"If the user has the authority of 'Customer User', the server checks that the asset is assigned to the same customer." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH
- , produces = MediaType.APPLICATION_JSON_VALUE)
+ , responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/asset/{assetId}", method = RequestMethod.GET)
@ResponseBody
- public Asset getAssetById(@ApiParam(value = ASSET_ID_PARAM_DESCRIPTION)
+ public Asset getAssetById(@Parameter(description = ASSET_ID_PARAM_DESCRIPTION)
@PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
checkParameter(ASSET_ID, strAssetId);
AssetId assetId = new AssetId(toUUID(strAssetId));
@@ -117,11 +118,11 @@ public class AssetController extends BaseController {
notes = "Fetch the Asset Info object based on the provided Asset Id. " +
"If the user has the authority of 'Tenant Administrator', the server checks that the asset is owned by the same tenant. " +
"If the user has the authority of 'Customer User', the server checks that the asset is assigned to the same customer. "
- + ASSET_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ + ASSET_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/asset/info/{assetId}", method = RequestMethod.GET)
@ResponseBody
- public AssetInfo getAssetInfoById(@ApiParam(value = ASSET_ID_PARAM_DESCRIPTION)
+ public AssetInfo getAssetInfoById(@Parameter(description = ASSET_ID_PARAM_DESCRIPTION)
@PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
checkParameter(ASSET_ID, strAssetId);
AssetId assetId = new AssetId(toUUID(strAssetId));
@@ -134,11 +135,11 @@ public class AssetController extends BaseController {
"Specify existing Asset id to update the asset. " +
"Referencing non-existing Asset Id will cause 'Not Found' error. " +
"Remove 'id', 'tenantId' and optionally 'customerId' from the request body example (below) to create new Asset entity. "
- + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/asset", method = RequestMethod.POST)
@ResponseBody
- public Asset saveAsset(@ApiParam(value = "A JSON value representing the asset.") @RequestBody Asset asset) throws Exception {
+ public Asset saveAsset(@Parameter(description = "A JSON value representing the asset.") @RequestBody Asset asset) throws Exception {
asset.setTenantId(getTenantId());
checkEntity(asset.getId(), asset, Resource.ASSET);
return tbAssetService.save(asset, getCurrentUser());
@@ -149,7 +150,7 @@ public class AssetController extends BaseController {
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/asset/{assetId}", method = RequestMethod.DELETE)
@ResponseStatus(value = HttpStatus.OK)
- public void deleteAsset(@ApiParam(value = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws Exception {
+ public void deleteAsset(@Parameter(description = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws Exception {
checkParameter(ASSET_ID, strAssetId);
AssetId assetId = new AssetId(toUUID(strAssetId));
Asset asset = checkAssetId(assetId, Operation.DELETE);
@@ -157,12 +158,12 @@ public class AssetController extends BaseController {
}
@ApiOperation(value = "Assign asset to customer (assignAssetToCustomer)",
- notes = "Creates assignment of the asset to customer. Customer will be able to query asset afterwards." + TENANT_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ notes = "Creates assignment of the asset to customer. Customer will be able to query asset afterwards." + TENANT_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/customer/{customerId}/asset/{assetId}", method = RequestMethod.POST)
@ResponseBody
- public Asset assignAssetToCustomer(@ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION) @PathVariable("customerId") String strCustomerId,
- @ApiParam(value = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
+ public Asset assignAssetToCustomer(@Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION) @PathVariable("customerId") String strCustomerId,
+ @Parameter(description = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
checkParameter("customerId", strCustomerId);
checkParameter(ASSET_ID, strAssetId);
CustomerId customerId = new CustomerId(toUUID(strCustomerId));
@@ -173,11 +174,11 @@ public class AssetController extends BaseController {
}
@ApiOperation(value = "Unassign asset from customer (unassignAssetFromCustomer)",
- notes = "Clears assignment of the asset to customer. Customer will not be able to query asset afterwards." + TENANT_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ notes = "Clears assignment of the asset to customer. Customer will not be able to query asset afterwards." + TENANT_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/customer/asset/{assetId}", method = RequestMethod.DELETE)
@ResponseBody
- public Asset unassignAssetFromCustomer(@ApiParam(value = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
+ public Asset unassignAssetFromCustomer(@Parameter(description = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
checkParameter(ASSET_ID, strAssetId);
AssetId assetId = new AssetId(toUUID(strAssetId));
Asset asset = checkAssetId(assetId, Operation.UNASSIGN_FROM_CUSTOMER);
@@ -191,11 +192,11 @@ public class AssetController extends BaseController {
@ApiOperation(value = "Make asset publicly available (assignAssetToPublicCustomer)",
notes = "Asset will be available for non-authorized (not logged-in) users. " +
"This is useful to create dashboards that you plan to share/embed on a publicly available website. " +
- "However, users that are logged-in and belong to different tenant will not be able to access the asset." + TENANT_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ "However, users that are logged-in and belong to different tenant will not be able to access the asset." + TENANT_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/customer/public/asset/{assetId}", method = RequestMethod.POST)
@ResponseBody
- public Asset assignAssetToPublicCustomer(@ApiParam(value = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
+ public Asset assignAssetToPublicCustomer(@Parameter(description = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
checkParameter(ASSET_ID, strAssetId);
AssetId assetId = new AssetId(toUUID(strAssetId));
checkAssetId(assetId, Operation.ASSIGN_TO_CUSTOMER);
@@ -204,22 +205,22 @@ public class AssetController extends BaseController {
@ApiOperation(value = "Get Tenant Assets (getTenantAssets)",
notes = "Returns a page of assets owned by tenant. " +
- PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/tenant/assets", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getTenantAssets(
- @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION)
@RequestParam int page,
- @ApiParam(value = ASSET_TYPE_DESCRIPTION)
+ @Parameter(description = ASSET_TYPE_DESCRIPTION)
@RequestParam(required = false) String type,
- @ApiParam(value = ASSET_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ASSET_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ASSET_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -232,24 +233,24 @@ public class AssetController extends BaseController {
@ApiOperation(value = "Get Tenant Asset Infos (getTenantAssetInfos)",
notes = "Returns a page of assets info objects owned by tenant. " +
- PAGE_DATA_PARAMETERS + ASSET_INFO_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS + ASSET_INFO_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/tenant/assetInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getTenantAssetInfos(
- @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION)
@RequestParam int page,
- @ApiParam(value = ASSET_TYPE_DESCRIPTION)
+ @Parameter(description = ASSET_TYPE_DESCRIPTION)
@RequestParam(required = false) String type,
- @ApiParam(value = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
@RequestParam(required = false) String assetProfileId,
- @ApiParam(value = ASSET_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ASSET_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ASSET_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -265,12 +266,12 @@ public class AssetController extends BaseController {
@ApiOperation(value = "Get Tenant Asset (getTenantAsset)",
notes = "Requested asset must be owned by tenant that the user belongs to. " +
- "Asset name is an unique property of asset. So it can be used to identify the asset." + TENANT_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ "Asset name is an unique property of asset. So it can be used to identify the asset." + TENANT_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/tenant/assets", params = {"assetName"}, method = RequestMethod.GET)
@ResponseBody
public Asset getTenantAsset(
- @ApiParam(value = ASSET_NAME_DESCRIPTION)
+ @Parameter(description = ASSET_NAME_DESCRIPTION)
@RequestParam String assetName) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
return checkNotNull(assetService.findAssetByTenantIdAndName(tenantId, assetName));
@@ -278,24 +279,24 @@ public class AssetController extends BaseController {
@ApiOperation(value = "Get Customer Assets (getCustomerAssets)",
notes = "Returns a page of assets objects assigned to customer. " +
- PAGE_DATA_PARAMETERS, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/customer/{customerId}/assets", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getCustomerAssets(
- @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+ @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
@PathVariable("customerId") String strCustomerId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION)
@RequestParam int page,
- @ApiParam(value = ASSET_TYPE_DESCRIPTION)
+ @Parameter(description = ASSET_TYPE_DESCRIPTION)
@RequestParam(required = false) String type,
- @ApiParam(value = ASSET_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ASSET_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ASSET_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
checkParameter("customerId", strCustomerId);
TenantId tenantId = getCurrentUser().getTenantId();
@@ -311,26 +312,26 @@ public class AssetController extends BaseController {
@ApiOperation(value = "Get Customer Asset Infos (getCustomerAssetInfos)",
notes = "Returns a page of assets info objects assigned to customer. " +
- PAGE_DATA_PARAMETERS + ASSET_INFO_DESCRIPTION, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS + ASSET_INFO_DESCRIPTION, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/customer/{customerId}/assetInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getCustomerAssetInfos(
- @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+ @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
@PathVariable("customerId") String strCustomerId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION)
@RequestParam int page,
- @ApiParam(value = ASSET_TYPE_DESCRIPTION)
+ @Parameter(description = ASSET_TYPE_DESCRIPTION)
@RequestParam(required = false) String type,
- @ApiParam(value = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
@RequestParam(required = false) String assetProfileId,
- @ApiParam(value = ASSET_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ASSET_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ASSET_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
checkParameter("customerId", strCustomerId);
TenantId tenantId = getCurrentUser().getTenantId();
@@ -348,12 +349,12 @@ public class AssetController extends BaseController {
}
@ApiOperation(value = "Get Assets By Ids (getAssetsByIds)",
- notes = "Requested assets must be owned by tenant or assigned to customer which user is performing the request. ", produces = MediaType.APPLICATION_JSON_VALUE)
+ notes = "Requested assets must be owned by tenant or assigned to customer which user is performing the request. ", responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/assets", params = {"assetIds"}, method = RequestMethod.GET)
@ResponseBody
public List getAssetsByIds(
- @ApiParam(value = "A list of assets ids, separated by comma ','")
+ @Parameter(description = "A list of assets ids, separated by comma ','")
@RequestParam("assetIds") String[] strAssetIds) throws ThingsboardException, ExecutionException, InterruptedException {
checkArrayParameter("assetIds", strAssetIds);
SecurityUser user = getCurrentUser();
@@ -375,7 +376,7 @@ public class AssetController extends BaseController {
@ApiOperation(value = "Find related assets (findByQuery)",
notes = "Returns all assets that are related to the specific entity. " +
"The entity id, relation type, asset types, depth of the search, and other query parameters defined using complex 'AssetSearchQuery' object. " +
- "See 'Model' tab of the Parameters for more info.", produces = MediaType.APPLICATION_JSON_VALUE)
+ "See 'Model' tab of the Parameters for more info.", responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/assets", method = RequestMethod.POST)
@ResponseBody
@@ -398,7 +399,7 @@ public class AssetController extends BaseController {
@ApiOperation(value = "Get Asset Types (getAssetTypes)",
notes = "Deprecated. See 'getAssetProfileNames' API from Asset Profile Controller instead." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/asset/types", method = RequestMethod.GET)
@ResponseBody
@@ -416,12 +417,12 @@ public class AssetController extends BaseController {
"Second, remote edge service will receive a copy of assignment asset " +
EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION +
"Third, once asset will be delivered to edge service, it's going to be available for usage on remote edge instance.",
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/{edgeId}/asset/{assetId}", method = RequestMethod.POST)
@ResponseBody
- public Asset assignAssetToEdge(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION) @PathVariable(EDGE_ID) String strEdgeId,
- @ApiParam(value = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
+ public Asset assignAssetToEdge(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION) @PathVariable(EDGE_ID) String strEdgeId,
+ @Parameter(description = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
checkParameter(EDGE_ID, strEdgeId);
checkParameter(ASSET_ID, strAssetId);
@@ -440,12 +441,12 @@ public class AssetController extends BaseController {
"Second, remote edge service will receive an 'unassign' command to remove asset " +
EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION +
"Third, once 'unassign' command will be delivered to edge service, it's going to remove asset locally.",
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/{edgeId}/asset/{assetId}", method = RequestMethod.DELETE)
@ResponseBody
- public Asset unassignAssetFromEdge(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION) @PathVariable(EDGE_ID) String strEdgeId,
- @ApiParam(value = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
+ public Asset unassignAssetFromEdge(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION) @PathVariable(EDGE_ID) String strEdgeId,
+ @Parameter(description = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
checkParameter(EDGE_ID, strEdgeId);
checkParameter(ASSET_ID, strAssetId);
EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
@@ -459,28 +460,28 @@ public class AssetController extends BaseController {
@ApiOperation(value = "Get assets assigned to edge (getEdgeAssets)",
notes = "Returns a page of assets assigned to edge. " +
- PAGE_DATA_PARAMETERS, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/edge/{edgeId}/assets", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getEdgeAssets(
- @ApiParam(value = EDGE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = EDGE_ID_PARAM_DESCRIPTION)
@PathVariable(EDGE_ID) String strEdgeId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION)
@RequestParam int page,
- @ApiParam(value = ASSET_TYPE_DESCRIPTION)
+ @Parameter(description = ASSET_TYPE_DESCRIPTION)
@RequestParam(required = false) String type,
- @ApiParam(value = ASSET_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ASSET_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ASSET_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = "Timestamp. Assets with creation time before it won't be queried")
+ @Parameter(description = "Timestamp. Assets with creation time before it won't be queried")
@RequestParam(required = false) Long startTime,
- @ApiParam(value = "Timestamp. Assets with creation time after it won't be queried")
+ @Parameter(description = "Timestamp. Assets with creation time after it won't be queried")
@RequestParam(required = false) Long endTime) throws ThingsboardException {
checkParameter(EDGE_ID, strEdgeId);
TenantId tenantId = getCurrentUser().getTenantId();
@@ -509,7 +510,7 @@ public class AssetController extends BaseController {
}
@ApiOperation(value = "Import the bulk of assets (processAssetsBulkImport)",
- notes = "There's an ability to import the bulk of assets using the only .csv file.", produces = MediaType.APPLICATION_JSON_VALUE)
+ notes = "There's an ability to import the bulk of assets using the only .csv file.", responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@PostMapping("/asset/bulk_import")
public BulkImportResult processAssetsBulkImport(@RequestBody BulkImportRequest request) throws Exception {
diff --git a/application/src/main/java/org/thingsboard/server/controller/AssetProfileController.java b/application/src/main/java/org/thingsboard/server/controller/AssetProfileController.java
index b2e9cd816a..a6126011cc 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AssetProfileController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AssetProfileController.java
@@ -15,11 +15,14 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -38,6 +41,7 @@ import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.dao.resource.ImageService;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.entitiy.asset.profile.TbAssetProfileService;
import org.thingsboard.server.service.security.model.SecurityUser;
@@ -49,7 +53,6 @@ import java.util.List;
import static org.thingsboard.server.controller.ControllerConstants.ASSET_PROFILE_ID;
import static org.thingsboard.server.controller.ControllerConstants.ASSET_PROFILE_ID_PARAM_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.ASSET_PROFILE_INFO_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.ASSET_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.ASSET_PROFILE_TEXT_SEARCH_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.INLINE_IMAGES;
import static org.thingsboard.server.controller.ControllerConstants.INLINE_IMAGES_DESCRIPTION;
@@ -57,7 +60,6 @@ import static org.thingsboard.server.controller.ControllerConstants.NEW_LINE;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -77,14 +79,14 @@ public class AssetProfileController extends BaseController {
@ApiOperation(value = "Get Asset Profile (getAssetProfileById)",
notes = "Fetch the Asset Profile object based on the provided Asset Profile Id. " +
"The server checks that the asset profile is owned by the same tenant. " + TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/assetProfile/{assetProfileId}", method = RequestMethod.GET)
@ResponseBody
public AssetProfile getAssetProfileById(
- @ApiParam(value = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
@PathVariable(ASSET_PROFILE_ID) String strAssetProfileId,
- @ApiParam(value = INLINE_IMAGES_DESCRIPTION)
+ @Parameter(description = INLINE_IMAGES_DESCRIPTION)
@RequestParam(value = INLINE_IMAGES, required = false) boolean inlineImages) throws ThingsboardException {
checkParameter(ASSET_PROFILE_ID, strAssetProfileId);
AssetProfileId assetProfileId = new AssetProfileId(toUUID(strAssetProfileId));
@@ -98,12 +100,12 @@ public class AssetProfileController extends BaseController {
@ApiOperation(value = "Get Asset Profile Info (getAssetProfileInfoById)",
notes = "Fetch the Asset Profile Info object based on the provided Asset Profile Id. "
+ ASSET_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/assetProfileInfo/{assetProfileId}", method = RequestMethod.GET)
@ResponseBody
public AssetProfileInfo getAssetProfileInfoById(
- @ApiParam(value = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
@PathVariable(ASSET_PROFILE_ID) String strAssetProfileId) throws ThingsboardException {
checkParameter(ASSET_PROFILE_ID, strAssetProfileId);
AssetProfileId assetProfileId = new AssetProfileId(toUUID(strAssetProfileId));
@@ -113,7 +115,7 @@ public class AssetProfileController extends BaseController {
@ApiOperation(value = "Get Default Asset Profile (getDefaultAssetProfileInfo)",
notes = "Fetch the Default Asset Profile Info object. " +
ASSET_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/assetProfileInfo/default", method = RequestMethod.GET)
@ResponseBody
@@ -129,13 +131,12 @@ public class AssetProfileController extends BaseController {
"Asset profile name is unique in the scope of tenant. Only one 'default' asset profile may exist in scope of tenant. " +
"Remove 'id', 'tenantId' from the request body example (below) to create new Asset Profile entity. " +
TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json",
- consumes = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/assetProfile", method = RequestMethod.POST)
@ResponseBody
public AssetProfile saveAssetProfile(
- @ApiParam(value = "A JSON value representing the asset profile.")
+ @Parameter(description = "A JSON value representing the asset profile.")
@RequestBody AssetProfile assetProfile) throws Exception {
assetProfile.setTenantId(getTenantId());
checkEntity(assetProfile.getId(), assetProfile, Resource.ASSET_PROFILE);
@@ -145,12 +146,12 @@ public class AssetProfileController extends BaseController {
@ApiOperation(value = "Delete asset profile (deleteAssetProfile)",
notes = "Deletes the asset profile. Referencing non-existing asset profile Id will cause an error. " +
"Can't delete the asset profile if it is referenced by existing assets." + TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/assetProfile/{assetProfileId}", method = RequestMethod.DELETE)
@ResponseStatus(value = HttpStatus.OK)
public void deleteAssetProfile(
- @ApiParam(value = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
@PathVariable(ASSET_PROFILE_ID) String strAssetProfileId) throws ThingsboardException {
checkParameter(ASSET_PROFILE_ID, strAssetProfileId);
AssetProfileId assetProfileId = new AssetProfileId(toUUID(strAssetProfileId));
@@ -160,12 +161,12 @@ public class AssetProfileController extends BaseController {
@ApiOperation(value = "Make Asset Profile Default (setDefaultAssetProfile)",
notes = "Marks asset profile as default within a tenant scope." + TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/assetProfile/{assetProfileId}/default", method = RequestMethod.POST)
@ResponseBody
public AssetProfile setDefaultAssetProfile(
- @ApiParam(value = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
@PathVariable(ASSET_PROFILE_ID) String strAssetProfileId) throws ThingsboardException {
checkParameter(ASSET_PROFILE_ID, strAssetProfileId);
AssetProfileId assetProfileId = new AssetProfileId(toUUID(strAssetProfileId));
@@ -177,20 +178,20 @@ public class AssetProfileController extends BaseController {
@ApiOperation(value = "Get Asset Profiles (getAssetProfiles)",
notes = "Returns a page of asset profile objects owned by tenant. " +
PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/assetProfiles", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getAssetProfiles(
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = ASSET_PROFILE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ASSET_PROFILE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ASSET_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "description", "isDefault"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
return checkNotNull(assetProfileService.findAssetProfiles(getTenantId(), pageLink));
@@ -199,20 +200,20 @@ public class AssetProfileController extends BaseController {
@ApiOperation(value = "Get Asset Profile infos (getAssetProfileInfos)",
notes = "Returns a page of asset profile info objects owned by tenant. " +
PAGE_DATA_PARAMETERS + ASSET_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/assetProfileInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getAssetProfileInfos(
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = ASSET_PROFILE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ASSET_PROFILE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ASSET_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "description", "isDefault"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
return checkNotNull(assetProfileService.findAssetProfileInfos(getTenantId(), pageLink));
@@ -225,7 +226,7 @@ public class AssetProfileController extends BaseController {
@RequestMapping(value = "/assetProfile/names", method = RequestMethod.GET)
@ResponseBody
public List getAssetProfileNames(
- @ApiParam(value = "Flag indicating whether to retrieve exclusively the names of asset profiles that are referenced by tenant's assets.")
+ @Parameter(description = "Flag indicating whether to retrieve exclusively the names of asset profiles that are referenced by tenant's assets.")
@RequestParam(value = "activeOnly", required = false, defaultValue = "false") boolean activeOnly) throws ThingsboardException {
SecurityUser user = getCurrentUser();
TenantId tenantId = user.getTenantId();
diff --git a/application/src/main/java/org/thingsboard/server/controller/AuditLogController.java b/application/src/main/java/org/thingsboard/server/controller/AuditLogController.java
index f165d4d918..5e58b28ab0 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AuditLogController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AuditLogController.java
@@ -15,8 +15,10 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PathVariable;
@@ -35,6 +37,7 @@ import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.id.UserId;
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.queue.util.TbCoreComponent;
import java.util.Arrays;
@@ -42,7 +45,6 @@ import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
-import static org.thingsboard.server.controller.ControllerConstants.AUDIT_LOG_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.AUDIT_LOG_TEXT_SEARCH_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID_PARAM_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.ENTITY_ID_PARAM_DESCRIPTION;
@@ -50,7 +52,6 @@ import static org.thingsboard.server.controller.ControllerConstants.ENTITY_TYPE_
import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
import static org.thingsboard.server.controller.ControllerConstants.USER_ID_PARAM_DESCRIPTION;
@@ -74,28 +75,28 @@ public class AuditLogController extends BaseController {
notes = "Returns a page of audit logs related to the targeted customer entities (devices, assets, etc.), " +
"and users actions (login, logout, etc.) that belong to this customer. " +
PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/audit/logs/customer/{customerId}", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getAuditLogsByCustomerId(
- @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+ @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
@PathVariable("customerId") String strCustomerId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION)
@RequestParam int page,
- @ApiParam(value = AUDIT_LOG_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = AUDIT_LOG_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = AUDIT_LOG_SORT_PROPERTY_DESCRIPTION, allowableValues = AUDIT_LOG_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = AUDIT_LOG_SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "entityType", "entityName", "userName", "actionType", "actionStatus"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = AUDIT_LOG_QUERY_START_TIME_DESCRIPTION)
+ @Parameter(description = AUDIT_LOG_QUERY_START_TIME_DESCRIPTION)
@RequestParam(required = false) Long startTime,
- @ApiParam(value = AUDIT_LOG_QUERY_END_TIME_DESCRIPTION)
+ @Parameter(description = AUDIT_LOG_QUERY_END_TIME_DESCRIPTION)
@RequestParam(required = false) Long endTime,
- @ApiParam(value = AUDIT_LOG_QUERY_ACTION_TYPES_DESCRIPTION)
+ @Parameter(description = AUDIT_LOG_QUERY_ACTION_TYPES_DESCRIPTION)
@RequestParam(name = "actionTypes", required = false) String actionTypesStr) throws ThingsboardException {
checkParameter("CustomerId", strCustomerId);
TenantId tenantId = getCurrentUser().getTenantId();
@@ -108,28 +109,28 @@ public class AuditLogController extends BaseController {
notes = "Returns a page of audit logs related to the actions of targeted user. " +
"For example, RPC call to a particular device, or alarm acknowledgment for a specific device, etc. " +
PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/audit/logs/user/{userId}", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getAuditLogsByUserId(
- @ApiParam(value = USER_ID_PARAM_DESCRIPTION)
+ @Parameter(description = USER_ID_PARAM_DESCRIPTION)
@PathVariable("userId") String strUserId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION)
@RequestParam int page,
- @ApiParam(value = AUDIT_LOG_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = AUDIT_LOG_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = AUDIT_LOG_SORT_PROPERTY_DESCRIPTION, allowableValues = AUDIT_LOG_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = AUDIT_LOG_SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "entityType", "entityName", "userName", "actionType", "actionStatus"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = AUDIT_LOG_QUERY_START_TIME_DESCRIPTION)
+ @Parameter(description = AUDIT_LOG_QUERY_START_TIME_DESCRIPTION)
@RequestParam(required = false) Long startTime,
- @ApiParam(value = AUDIT_LOG_QUERY_END_TIME_DESCRIPTION)
+ @Parameter(description = AUDIT_LOG_QUERY_END_TIME_DESCRIPTION)
@RequestParam(required = false) Long endTime,
- @ApiParam(value = AUDIT_LOG_QUERY_ACTION_TYPES_DESCRIPTION)
+ @Parameter(description = AUDIT_LOG_QUERY_ACTION_TYPES_DESCRIPTION)
@RequestParam(name = "actionTypes", required = false) String actionTypesStr) throws ThingsboardException {
checkParameter("UserId", strUserId);
TenantId tenantId = getCurrentUser().getTenantId();
@@ -143,30 +144,30 @@ public class AuditLogController extends BaseController {
"Basically, this API call is used to get the full lifecycle of some specific entity. " +
"For example to see when a device was created, updated, assigned to some customer, or even deleted from the system. " +
PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/audit/logs/entity/{entityType}/{entityId}", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getAuditLogsByEntityId(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE")
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE"))
@PathVariable("entityType") String strEntityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
@PathVariable("entityId") String strEntityId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = AUDIT_LOG_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = AUDIT_LOG_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = AUDIT_LOG_SORT_PROPERTY_DESCRIPTION, allowableValues = AUDIT_LOG_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = AUDIT_LOG_SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "entityType", "entityName", "userName", "actionType", "actionStatus"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = AUDIT_LOG_QUERY_START_TIME_DESCRIPTION)
+ @Parameter(description = AUDIT_LOG_QUERY_START_TIME_DESCRIPTION)
@RequestParam(required = false) Long startTime,
- @ApiParam(value = AUDIT_LOG_QUERY_END_TIME_DESCRIPTION)
+ @Parameter(description = AUDIT_LOG_QUERY_END_TIME_DESCRIPTION)
@RequestParam(required = false) Long endTime,
- @ApiParam(value = AUDIT_LOG_QUERY_ACTION_TYPES_DESCRIPTION)
+ @Parameter(description = AUDIT_LOG_QUERY_ACTION_TYPES_DESCRIPTION)
@RequestParam(name = "actionTypes", required = false) String actionTypesStr) throws ThingsboardException {
checkParameter("EntityId", strEntityId);
checkParameter("EntityType", strEntityType);
@@ -179,26 +180,26 @@ public class AuditLogController extends BaseController {
@ApiOperation(value = "Get all audit logs (getAuditLogs)",
notes = "Returns a page of audit logs related to all entities in the scope of the current user's Tenant. " +
PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/audit/logs", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getAuditLogs(
- @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION)
@RequestParam int page,
- @ApiParam(value = AUDIT_LOG_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = AUDIT_LOG_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = AUDIT_LOG_SORT_PROPERTY_DESCRIPTION, allowableValues = AUDIT_LOG_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = AUDIT_LOG_SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "entityType", "entityName", "userName", "actionType", "actionStatus"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = AUDIT_LOG_QUERY_START_TIME_DESCRIPTION)
+ @Parameter(description = AUDIT_LOG_QUERY_START_TIME_DESCRIPTION)
@RequestParam(required = false) Long startTime,
- @ApiParam(value = AUDIT_LOG_QUERY_END_TIME_DESCRIPTION)
+ @Parameter(description = AUDIT_LOG_QUERY_END_TIME_DESCRIPTION)
@RequestParam(required = false) Long endTime,
- @ApiParam(value = AUDIT_LOG_QUERY_ACTION_TYPES_DESCRIPTION)
+ @Parameter(description = AUDIT_LOG_QUERY_ACTION_TYPES_DESCRIPTION)
@RequestParam(name = "actionTypes", required = false) String actionTypesStr) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
List actionTypes = parseActionTypesStr(actionTypesStr);
diff --git a/application/src/main/java/org/thingsboard/server/controller/AuthController.java b/application/src/main/java/org/thingsboard/server/controller/AuthController.java
index 92441bf1cb..2898689760 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AuthController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AuthController.java
@@ -16,8 +16,8 @@
package org.thingsboard.server.controller;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
@@ -48,6 +48,7 @@ import org.thingsboard.server.common.data.security.event.UserSessionInvalidation
import org.thingsboard.server.common.data.security.model.JwtPair;
import org.thingsboard.server.common.data.security.model.SecuritySettings;
import org.thingsboard.server.common.data.security.model.UserPasswordPolicy;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.cache.limits.RateLimitService;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.security.auth.rest.RestAuthenticationDetails;
@@ -60,7 +61,6 @@ import org.thingsboard.server.service.security.model.UserPrincipal;
import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
import org.thingsboard.server.service.security.system.SystemSecurityService;
-import javax.servlet.http.HttpServletRequest;
import java.net.URI;
import java.net.URISyntaxException;
@@ -106,7 +106,7 @@ public class AuthController extends BaseController {
@RequestMapping(value = "/auth/changePassword", method = RequestMethod.POST)
@ResponseStatus(value = HttpStatus.OK)
public ObjectNode changePassword(
- @ApiParam(value = "Change Password Request")
+ @Parameter(description = "Change Password Request")
@RequestBody ChangePasswordRequest changePasswordRequest) throws ThingsboardException {
String currentPassword = changePasswordRequest.getCurrentPassword();
String newPassword = changePasswordRequest.getNewPassword();
@@ -145,7 +145,7 @@ public class AuthController extends BaseController {
"If token is not valid, returns '409 Conflict'.")
@RequestMapping(value = "/noauth/activate", params = {"activateToken"}, method = RequestMethod.GET)
public ResponseEntity checkActivateToken(
- @ApiParam(value = "The activate token string.")
+ @Parameter(description = "The activate token string.")
@RequestParam(value = "activateToken") String activateToken) {
HttpHeaders headers = new HttpHeaders();
HttpStatus responseStatus;
@@ -172,7 +172,7 @@ public class AuthController extends BaseController {
@RequestMapping(value = "/noauth/resetPasswordByEmail", method = RequestMethod.POST)
@ResponseStatus(value = HttpStatus.OK)
public void requestResetPasswordByEmail(
- @ApiParam(value = "The JSON object representing the reset password email request.")
+ @Parameter(description = "The JSON object representing the reset password email request.")
@RequestBody ResetPasswordEmailRequest resetPasswordByEmailRequest,
HttpServletRequest request) throws ThingsboardException {
try {
@@ -195,7 +195,7 @@ public class AuthController extends BaseController {
"If token is not valid, returns '409 Conflict'.")
@RequestMapping(value = "/noauth/resetPassword", params = {"resetToken"}, method = RequestMethod.GET)
public ResponseEntity checkResetToken(
- @ApiParam(value = "The reset token string.")
+ @Parameter(description = "The reset token string.")
@RequestParam(value = "resetToken") String resetToken) {
HttpHeaders headers = new HttpHeaders();
HttpStatus responseStatus;
@@ -231,7 +231,7 @@ public class AuthController extends BaseController {
@ResponseStatus(value = HttpStatus.OK)
@ResponseBody
public JwtPair activateUser(
- @ApiParam(value = "Activate user request.")
+ @Parameter(description = "Activate user request.")
@RequestBody ActivateUserRequest activateRequest,
@RequestParam(required = false, defaultValue = "true") boolean sendActivationMail,
HttpServletRequest request) throws ThingsboardException {
@@ -267,7 +267,7 @@ public class AuthController extends BaseController {
@ResponseStatus(value = HttpStatus.OK)
@ResponseBody
public JwtPair resetPassword(
- @ApiParam(value = "Reset password request.")
+ @Parameter(description = "Reset password request.")
@RequestBody ResetPasswordRequest resetPasswordRequest,
HttpServletRequest request) throws ThingsboardException {
String resetToken = resetPasswordRequest.getResetToken();
diff --git a/application/src/main/java/org/thingsboard/server/controller/BaseController.java b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
index c40760dda3..9c437821c6 100644
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
@@ -17,6 +17,9 @@ package org.thingsboard.server.controller;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.util.concurrent.ListenableFuture;
+import jakarta.mail.MessagingException;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.ConstraintViolation;
import lombok.Getter;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger;
@@ -141,7 +144,7 @@ import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.action.EntityActionService;
import org.thingsboard.server.service.component.ComponentDiscoveryService;
-import org.thingsboard.server.service.entitiy.TbNotificationEntityService;
+import org.thingsboard.server.service.entitiy.TbLogEntityActionService;
import org.thingsboard.server.service.entitiy.user.TbUserSettingsService;
import org.thingsboard.server.service.ota.OtaPackageStateService;
import org.thingsboard.server.service.profile.TbAssetProfileCache;
@@ -156,9 +159,6 @@ import org.thingsboard.server.service.sync.vc.EntitiesVersionControlService;
import org.thingsboard.server.service.telemetry.AlarmSubscriptionService;
import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
-import javax.mail.MessagingException;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolation;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
@@ -299,7 +299,7 @@ public abstract class BaseController {
protected EdgeService edgeService;
@Autowired
- protected TbNotificationEntityService notificationEntityService;
+ protected TbLogEntityActionService logEntityActionService;
@Autowired
protected EntityActionService entityActionService;
@@ -386,7 +386,7 @@ public abstract class BaseController {
}
/**
- * Handles validation error for controller method arguments annotated with @{@link javax.validation.Valid}
+ * Handles validation error for controller method arguments annotated with @{@link jakarta.validation.Valid}
* */
@ExceptionHandler(MethodArgumentNotValidException.class)
public void handleValidationError(MethodArgumentNotValidException validationError, HttpServletResponse response) {
diff --git a/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java b/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java
index 53fc4f8c32..595d6feef1 100644
--- a/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java
@@ -15,8 +15,8 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,6 +29,7 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
import org.thingsboard.server.common.data.plugin.ComponentType;
import org.thingsboard.server.common.data.rule.RuleChainType;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.queue.util.TbCoreComponent;
import java.util.HashSet;
@@ -54,7 +55,7 @@ public class ComponentDescriptorController extends BaseController {
@RequestMapping(value = "/component/{componentDescriptorClazz:.+}", method = RequestMethod.GET)
@ResponseBody
public ComponentDescriptor getComponentDescriptorByClazz(
- @ApiParam(value = "Component Descriptor class name", required = true)
+ @Parameter(description = "Component Descriptor class name", required = true)
@PathVariable("componentDescriptorClazz") String strComponentDescriptorClazz) throws ThingsboardException {
checkParameter("strComponentDescriptorClazz", strComponentDescriptorClazz);
return checkComponentDescriptorByClazz(strComponentDescriptorClazz);
@@ -67,9 +68,9 @@ public class ComponentDescriptorController extends BaseController {
@RequestMapping(value = "/components/{componentType}", method = RequestMethod.GET)
@ResponseBody
public List getComponentDescriptorsByType(
- @ApiParam(value = "Type of the Rule Node", allowableValues = "ENRICHMENT,FILTER,TRANSFORMATION,ACTION,EXTERNAL", required = true)
+ @Parameter(description = "Type of the Rule Node", schema = @Schema(allowableValues = "ENRICHMENT,FILTER,TRANSFORMATION,ACTION,EXTERNAL", required = true))
@PathVariable("componentType") String strComponentType,
- @ApiParam(value = "Type of the Rule Chain", allowableValues = "CORE,EDGE")
+ @Parameter(description = "Type of the Rule Chain", schema = @Schema(allowableValues = "CORE,EDGE"))
@RequestParam(value = "ruleChainType", required = false) String strRuleChainType) throws ThingsboardException {
checkParameter("componentType", strComponentType);
return checkComponentDescriptorsByType(ComponentType.valueOf(strComponentType), getRuleChainType(strRuleChainType));
@@ -82,9 +83,9 @@ public class ComponentDescriptorController extends BaseController {
@RequestMapping(value = "/components", params = {"componentTypes"}, method = RequestMethod.GET)
@ResponseBody
public List getComponentDescriptorsByTypes(
- @ApiParam(value = "List of types of the Rule Nodes, (ENRICHMENT, FILTER, TRANSFORMATION, ACTION or EXTERNAL)", required = true)
+ @Parameter(description = "List of types of the Rule Nodes, (ENRICHMENT, FILTER, TRANSFORMATION, ACTION or EXTERNAL)", required = true)
@RequestParam("componentTypes") String[] strComponentTypes,
- @ApiParam(value = "Type of the Rule Chain", allowableValues = "CORE,EDGE")
+ @Parameter(description = "Type of the Rule Chain", schema = @Schema(allowableValues = "CORE,EDGE"))
@RequestParam(value = "ruleChainType", required = false) String strRuleChainType) throws ThingsboardException {
checkArrayParameter("componentTypes", strComponentTypes);
Set componentTypes = new HashSet<>();
diff --git a/application/src/main/java/org/thingsboard/server/controller/ControllerConstants.java b/application/src/main/java/org/thingsboard/server/controller/ControllerConstants.java
index f7e767f017..d9232cda78 100644
--- a/application/src/main/java/org/thingsboard/server/controller/ControllerConstants.java
+++ b/application/src/main/java/org/thingsboard/server/controller/ControllerConstants.java
@@ -95,34 +95,8 @@ public class ControllerConstants {
protected static final String EVENT_TEXT_SEARCH_DESCRIPTION = "The value is not used in searching.";
protected static final String AUDIT_LOG_TEXT_SEARCH_DESCRIPTION = "The case insensitive 'substring' filter based on one of the next properties: entityType, entityName, userName, actionType, actionStatus.";
protected static final String SORT_PROPERTY_DESCRIPTION = "Property of entity to sort by";
- protected static final String DASHBOARD_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, title";
- protected static final String CUSTOMER_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, title, email, country, city";
- protected static final String RPC_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, expirationTime, request, response";
- protected static final String DEVICE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, deviceProfileName, label, customerTitle";
- protected static final String ENTITY_VIEW_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, type";
- protected static final String ENTITY_VIEW_INFO_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, type, customerTitle";
- protected static final String USER_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, firstName, lastName, email";
- protected static final String TENANT_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, title, email, country, state, city, address, address2, zip, phone, email";
- protected static final String TENANT_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, description, isDefault";
- protected static final String TENANT_PROFILE_INFO_SORT_PROPERTY_ALLOWABLE_VALUES = "id, name";
- protected static final String TENANT_INFO_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, tenantProfileName, title, email, country, state, city, address, address2, zip, phone, email";
- protected static final String DEVICE_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, type, transportType, description, isDefault";
-
- protected static final String ASSET_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, description, isDefault";
- protected static final String ASSET_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, type, label, customerTitle";
- protected static final String ALARM_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, startTs, endTs, type, ackTs, clearTs, severity, status";
- protected static final String ALARM_COMMENT_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, id";
- protected static final String EVENT_SORT_PROPERTY_ALLOWABLE_VALUES = "ts, id";
- protected static final String EDGE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, type, label, customerTitle";
- protected static final String RULE_CHAIN_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, root";
- protected static final String WIDGET_BUNDLE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, title, tenantId";
- protected static final String WIDGET_TYPE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, deprecated, tenantId";
- protected static final String AUDIT_LOG_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, entityType, entityName, userName, actionType, actionStatus";
+
protected static final String SORT_ORDER_DESCRIPTION = "Sort order. ASC (ASCENDING) or DESC (DESCENDING)";
- protected static final String SORT_ORDER_ALLOWABLE_VALUES = "ASC, DESC";
- protected static final String RPC_STATUS_ALLOWABLE_VALUES = "QUEUED, SENT, DELIVERED, SUCCESSFUL, TIMEOUT, EXPIRED, FAILED";
- protected static final String RULE_CHAIN_TYPES_ALLOWABLE_VALUES = "CORE, EDGE";
- protected static final String TRANSPORT_TYPE_ALLOWABLE_VALUES = "DEFAULT, MQTT, COAP, LWM2M, SNMP";
protected static final String DEVICE_INFO_DESCRIPTION = "Device Info is an extension of the default Device object that contains information about the assigned customer name and device profile name. ";
protected static final String ASSET_INFO_DESCRIPTION = "Asset Info is an extension of the default Asset object that contains information about the assigned customer name. ";
protected static final String ALARM_INFO_DESCRIPTION = "Alarm Info is an extension of the default Alarm object that also contains name of the alarm originator.";
@@ -132,28 +106,21 @@ public class ControllerConstants {
protected static final String ASSET_PROFILE_INFO_DESCRIPTION = "Asset Profile Info is a lightweight object that includes main information about Asset Profile. ";
protected static final String QUEUE_SERVICE_TYPE_DESCRIPTION = "Service type (implemented only for the TB-RULE-ENGINE)";
- protected static final String QUEUE_SERVICE_TYPE_ALLOWABLE_VALUES = "TB-RULE-ENGINE, TB-CORE, TB-TRANSPORT, JS-EXECUTOR";
protected static final String QUEUE_QUEUE_TEXT_SEARCH_DESCRIPTION = "The case insensitive 'substring' filter based on the queue name.";
- protected static final String QUEUE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, topic";
protected static final String QUEUE_ID_PARAM_DESCRIPTION = "A string value representing the queue id. For example, '784f394c-42b6-435a-983c-b7beff2784f9'";
protected static final String QUEUE_NAME_PARAM_DESCRIPTION = "A string value representing the queue id. For example, 'Main'";
protected static final String OTA_PACKAGE_INFO_DESCRIPTION = "OTA Package Info is a lightweight object that includes main information about the OTA Package excluding the heavyweight data. ";
protected static final String OTA_PACKAGE_DESCRIPTION = "OTA Package is a heavyweight object that includes main information about the OTA Package and also data. ";
- protected static final String OTA_PACKAGE_CHECKSUM_ALGORITHM_ALLOWABLE_VALUES = "MD5, SHA256, SHA384, SHA512, CRC32, MURMUR3_32, MURMUR3_128";
protected static final String OTA_PACKAGE_TEXT_SEARCH_DESCRIPTION = "The case insensitive 'substring' filter based on the ota package title.";
- protected static final String OTA_PACKAGE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, type, title, version, tag, url, fileName, dataSize, checksum";
protected static final String RESOURCE_INFO_DESCRIPTION = "Resource Info is a lightweight object that includes main information about the Resource excluding the heavyweight data. ";
protected static final String RESOURCE_DESCRIPTION = "Resource is a heavyweight object that includes main information about the Resource and also data. ";
protected static final String RESOURCE_INCLUDE_SYSTEM_IMAGES_DESCRIPTION = "Use 'true' to include system images. Disabled by default. Ignored for requests by users with system administrator authority.";
protected static final String RESOURCE_TEXT_SEARCH_DESCRIPTION = "The case insensitive 'substring' filter based on the resource title.";
- protected static final String RESOURCE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, title, resourceType, tenantId";
- protected static final String RESOURCE_TYPE_PROPERTY_ALLOWABLE_VALUES = "LWM2M_MODEL, JKS, PKCS_12, JS_MODULE";
protected static final String RESOURCE_TYPE = "A string value representing the resource type.";
protected static final String LWM2M_OBJECT_DESCRIPTION = "LwM2M Object is a object that includes information about the LwM2M model which can be used in transport configuration for the LwM2M device profile. ";
- protected static final String LWM2M_OBJECT_SORT_PROPERTY_ALLOWABLE_VALUES = "id, name";
protected static final String DEVICE_NAME_DESCRIPTION = "A string value representing the Device name.";
protected static final String ASSET_NAME_DESCRIPTION = "A string value representing the Asset name.";
@@ -1632,8 +1599,6 @@ public class ControllerConstants {
protected static final String ATTRIBUTES_SCOPE_DESCRIPTION = "A string value representing the attributes scope. For example, 'SERVER_SCOPE'.";
protected static final String ATTRIBUTES_KEYS_DESCRIPTION = "A string value representing the comma-separated list of attributes keys. For example, 'active,inactivityAlarmTime'.";
- protected static final String ATTRIBUTES_SAVE_SCOPE_ALLOWED_VALUES = "SERVER_SCOPE, SHARED_SCOPE";
- protected static final String ATTRIBUTES_SCOPE_ALLOWED_VALUES = ATTRIBUTES_SAVE_SCOPE_ALLOWED_VALUES + ", CLIENT_SCOPE";
protected static final String ATTRIBUTES_JSON_REQUEST_DESCRIPTION = "A string value representing the json object. For example, '{\"key\":\"value\"}'. See API call description for more details.";
protected static final String TELEMETRY_KEYS_BASE_DESCRIPTION = "A string value representing the comma-separated list of telemetry keys.";
diff --git a/application/src/main/java/org/thingsboard/server/controller/CustomerController.java b/application/src/main/java/org/thingsboard/server/controller/CustomerController.java
index b21127da63..c24c345f76 100644
--- a/application/src/main/java/org/thingsboard/server/controller/CustomerController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/CustomerController.java
@@ -17,8 +17,8 @@ package org.thingsboard.server.controller;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,6 +37,7 @@ import org.thingsboard.server.common.data.id.CustomerId;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.entitiy.customer.TbCustomerService;
import org.thingsboard.server.service.security.permission.Operation;
@@ -44,13 +45,11 @@ import org.thingsboard.server.service.security.permission.Resource;
import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID;
import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_TEXT_SEARCH_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.HOME_DASHBOARD;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -76,7 +75,7 @@ public class CustomerController extends BaseController {
@RequestMapping(value = "/customer/{customerId}", method = RequestMethod.GET)
@ResponseBody
public Customer getCustomerById(
- @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+ @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
@PathVariable(CUSTOMER_ID) String strCustomerId) throws ThingsboardException {
checkParameter(CUSTOMER_ID, strCustomerId);
CustomerId customerId = new CustomerId(toUUID(strCustomerId));
@@ -95,7 +94,7 @@ public class CustomerController extends BaseController {
@RequestMapping(value = "/customer/{customerId}/shortInfo", method = RequestMethod.GET)
@ResponseBody
public JsonNode getShortCustomerInfoById(
- @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+ @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
@PathVariable(CUSTOMER_ID) String strCustomerId) throws ThingsboardException {
checkParameter(CUSTOMER_ID, strCustomerId);
CustomerId customerId = new CustomerId(toUUID(strCustomerId));
@@ -113,7 +112,7 @@ public class CustomerController extends BaseController {
@RequestMapping(value = "/customer/{customerId}/title", method = RequestMethod.GET, produces = "application/text")
@ResponseBody
public String getCustomerTitleById(
- @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+ @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
@PathVariable(CUSTOMER_ID) String strCustomerId) throws ThingsboardException {
checkParameter(CUSTOMER_ID, strCustomerId);
CustomerId customerId = new CustomerId(toUUID(strCustomerId));
@@ -131,7 +130,7 @@ public class CustomerController extends BaseController {
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/customer", method = RequestMethod.POST)
@ResponseBody
- public Customer saveCustomer(@ApiParam(value = "A JSON value representing the customer.") @RequestBody Customer customer) throws Exception {
+ public Customer saveCustomer(@Parameter(description = "A JSON value representing the customer.") @RequestBody Customer customer) throws Exception {
customer.setTenantId(getTenantId());
checkEntity(customer.getId(), customer, Resource.CUSTOMER);
return tbCustomerService.save(customer, getCurrentUser());
@@ -144,7 +143,7 @@ public class CustomerController extends BaseController {
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/customer/{customerId}", method = RequestMethod.DELETE)
@ResponseStatus(value = HttpStatus.OK)
- public void deleteCustomer(@ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+ public void deleteCustomer(@Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
@PathVariable(CUSTOMER_ID) String strCustomerId) throws ThingsboardException {
checkParameter(CUSTOMER_ID, strCustomerId);
CustomerId customerId = new CustomerId(toUUID(strCustomerId));
@@ -159,15 +158,15 @@ public class CustomerController extends BaseController {
@RequestMapping(value = "/customers", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getCustomers(
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = CUSTOMER_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = CUSTOMER_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = CUSTOMER_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title", "email", "country, city"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
TenantId tenantId = getCurrentUser().getTenantId();
@@ -180,7 +179,7 @@ public class CustomerController extends BaseController {
@RequestMapping(value = "/tenant/customers", params = {"customerTitle"}, method = RequestMethod.GET)
@ResponseBody
public Customer getTenantCustomer(
- @ApiParam(value = "A string value representing the Customer title.")
+ @Parameter(description = "A string value representing the Customer title.")
@RequestParam String customerTitle) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
return checkNotNull(customerService.findCustomerByTenantIdAndTitle(tenantId, customerTitle), "Customer with title [" + customerTitle + "] is not found");
diff --git a/application/src/main/java/org/thingsboard/server/controller/DashboardController.java b/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
index 6097ef10c8..0683bc21be 100644
--- a/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
@@ -17,11 +17,11 @@ package org.thingsboard.server.controller;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.Example;
-import io.swagger.annotations.ExampleProperty;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
@@ -52,6 +52,7 @@ import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.dao.resource.ImageService;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.entitiy.dashboard.TbDashboardService;
import org.thingsboard.server.service.security.model.SecurityUser;
@@ -67,7 +68,6 @@ import java.util.stream.Collectors;
import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID;
import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID_PARAM_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.DASHBOARD_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.DASHBOARD_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.DASHBOARD_TEXT_SEARCH_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION;
@@ -80,7 +80,6 @@ import static org.thingsboard.server.controller.ControllerConstants.INLINE_IMAGE
import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SYSTEM_AUTHORITY_PARAGRAPH;
@@ -115,7 +114,7 @@ public class DashboardController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/dashboard/serverTime", method = RequestMethod.GET)
@ResponseBody
- @ApiResponse(code = 200, message = "OK", examples = @Example(value = @ExampleProperty(value = "1636023857137", mediaType = "application/json")))
+ @ApiResponse(responseCode = "200", description = "OK", content = @Content(mediaType = "application/json", examples = @ExampleObject(value = "1636023857137")))
public long getServerTime() throws ThingsboardException {
return System.currentTimeMillis();
}
@@ -128,20 +127,20 @@ public class DashboardController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/dashboard/maxDatapointsLimit", method = RequestMethod.GET)
@ResponseBody
- @ApiResponse(code = 200, message = "OK", examples = @Example(value = @ExampleProperty(value = "5000", mediaType = "application/json")))
+ @ApiResponse(responseCode = "200", description = "OK", content = @Content(mediaType = "application/json", examples = @ExampleObject(value = "5000")))
public long getMaxDatapointsLimit() throws ThingsboardException {
return maxDatapointsLimit;
}
@ApiOperation(value = "Get Dashboard Info (getDashboardInfoById)",
notes = "Get the information about the dashboard based on 'dashboardId' parameter. " + DASHBOARD_INFO_DEFINITION,
- produces = MediaType.APPLICATION_JSON_VALUE
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE))
)
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/dashboard/info/{dashboardId}", method = RequestMethod.GET)
@ResponseBody
public DashboardInfo getDashboardInfoById(
- @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
@PathVariable(DASHBOARD_ID) String strDashboardId) throws ThingsboardException {
checkParameter(DASHBOARD_ID, strDashboardId);
DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
@@ -150,15 +149,15 @@ public class DashboardController extends BaseController {
@ApiOperation(value = "Get Dashboard (getDashboardById)",
notes = "Get the dashboard based on 'dashboardId' parameter. " + DASHBOARD_DEFINITION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE))
)
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/dashboard/{dashboardId}", method = RequestMethod.GET)
@ResponseBody
public Dashboard getDashboardById(
- @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
@PathVariable(DASHBOARD_ID) String strDashboardId,
- @ApiParam(value = INLINE_IMAGES_DESCRIPTION)
+ @Parameter(description = INLINE_IMAGES_DESCRIPTION)
@RequestParam(value = INLINE_IMAGES, required = false) boolean inlineImages) throws ThingsboardException {
checkParameter(DASHBOARD_ID, strDashboardId);
DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
@@ -176,13 +175,12 @@ public class DashboardController extends BaseController {
"Referencing non-existing dashboard Id will cause 'Not Found' error. " +
"Remove 'id', 'tenantId' and optionally 'customerId' from the request body example (below) to create new Dashboard entity. " +
TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE,
- consumes = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/dashboard", method = RequestMethod.POST)
@ResponseBody
public Dashboard saveDashboard(
- @ApiParam(value = "A JSON value representing the dashboard.")
+ @Parameter(description = "A JSON value representing the dashboard.")
@RequestBody Dashboard dashboard) throws Exception {
dashboard.setTenantId(getTenantId());
checkEntity(dashboard.getId(), dashboard, Resource.DASHBOARD);
@@ -195,7 +193,7 @@ public class DashboardController extends BaseController {
@RequestMapping(value = "/dashboard/{dashboardId}", method = RequestMethod.DELETE)
@ResponseStatus(value = HttpStatus.OK)
public void deleteDashboard(
- @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
@PathVariable(DASHBOARD_ID) String strDashboardId) throws ThingsboardException {
checkParameter(DASHBOARD_ID, strDashboardId);
DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
@@ -206,14 +204,14 @@ public class DashboardController extends BaseController {
@ApiOperation(value = "Assign the Dashboard (assignDashboardToCustomer)",
notes = "Assign the Dashboard to specified Customer or do nothing if the Dashboard is already assigned to that Customer. " +
"Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/customer/{customerId}/dashboard/{dashboardId}", method = RequestMethod.POST)
@ResponseBody
public Dashboard assignDashboardToCustomer(
- @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+ @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
@PathVariable(CUSTOMER_ID) String strCustomerId,
- @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
@PathVariable(DASHBOARD_ID) String strDashboardId) throws ThingsboardException {
checkParameter(CUSTOMER_ID, strCustomerId);
checkParameter(DASHBOARD_ID, strDashboardId);
@@ -229,14 +227,14 @@ public class DashboardController extends BaseController {
@ApiOperation(value = "Unassign the Dashboard (unassignDashboardFromCustomer)",
notes = "Unassign the Dashboard from specified Customer or do nothing if the Dashboard is already assigned to that Customer. " +
"Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/customer/{customerId}/dashboard/{dashboardId}", method = RequestMethod.DELETE)
@ResponseBody
public Dashboard unassignDashboardFromCustomer(
- @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+ @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
@PathVariable(CUSTOMER_ID) String strCustomerId,
- @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
@PathVariable(DASHBOARD_ID) String strDashboardId) throws ThingsboardException {
checkParameter("customerId", strCustomerId);
checkParameter(DASHBOARD_ID, strDashboardId);
@@ -250,16 +248,15 @@ public class DashboardController extends BaseController {
@ApiOperation(value = "Update the Dashboard Customers (updateDashboardCustomers)",
notes = "Updates the list of Customers that this Dashboard is assigned to. Removes previous assignments to customers that are not in the provided list. " +
"Returns the Dashboard object. " + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE,
- consumes = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/dashboard/{dashboardId}/customers", method = RequestMethod.POST)
@ResponseBody
public Dashboard updateDashboardCustomers(
- @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
@PathVariable(DASHBOARD_ID) String strDashboardId,
- @ApiParam(value = "JSON array with the list of customer ids, or empty to remove all customers")
+ @Parameter(description = "JSON array with the list of customer ids, or empty to remove all customers")
@RequestBody(required = false) String[] strCustomerIds) throws ThingsboardException {
checkParameter(DASHBOARD_ID, strDashboardId);
DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
@@ -271,15 +268,14 @@ public class DashboardController extends BaseController {
@ApiOperation(value = "Adds the Dashboard Customers (addDashboardCustomers)",
notes = "Adds the list of Customers to the existing list of assignments for the Dashboard. Keeps previous assignments to customers that are not in the provided list. " +
"Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE,
- consumes = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/dashboard/{dashboardId}/customers/add", method = RequestMethod.POST)
@ResponseBody
public Dashboard addDashboardCustomers(
- @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
@PathVariable(DASHBOARD_ID) String strDashboardId,
- @ApiParam(value = "JSON array with the list of customer ids")
+ @Parameter(description = "JSON array with the list of customer ids")
@RequestBody String[] strCustomerIds) throws ThingsboardException {
checkParameter(DASHBOARD_ID, strDashboardId);
DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
@@ -291,15 +287,14 @@ public class DashboardController extends BaseController {
@ApiOperation(value = "Remove the Dashboard Customers (removeDashboardCustomers)",
notes = "Removes the list of Customers from the existing list of assignments for the Dashboard. Keeps other assignments to customers that are not in the provided list. " +
"Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE,
- consumes = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/dashboard/{dashboardId}/customers/remove", method = RequestMethod.POST)
@ResponseBody
public Dashboard removeDashboardCustomers(
- @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
@PathVariable(DASHBOARD_ID) String strDashboardId,
- @ApiParam(value = "JSON array with the list of customer ids")
+ @Parameter(description = "JSON array with the list of customer ids")
@RequestBody String[] strCustomerIds) throws ThingsboardException {
checkParameter(DASHBOARD_ID, strDashboardId);
DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
@@ -315,12 +310,12 @@ public class DashboardController extends BaseController {
"Use [assign Asset to Public Customer](#!/asset-controller/assignAssetToPublicCustomerUsingPOST) and " +
"[assign Device to Public Customer](#!/device-controller/assignDeviceToPublicCustomerUsingPOST) for this purpose. " +
"Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/customer/public/dashboard/{dashboardId}", method = RequestMethod.POST)
@ResponseBody
public Dashboard assignDashboardToPublicCustomer(
- @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
@PathVariable(DASHBOARD_ID) String strDashboardId) throws ThingsboardException {
checkParameter(DASHBOARD_ID, strDashboardId);
DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
@@ -331,12 +326,12 @@ public class DashboardController extends BaseController {
@ApiOperation(value = "Unassign the Dashboard from Public Customer (unassignDashboardFromPublicCustomer)",
notes = "Unassigns the dashboard from a special, auto-generated 'Public' Customer. Once unassigned, unauthenticated users may no longer browse the dashboard. " +
"Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/customer/public/dashboard/{dashboardId}", method = RequestMethod.DELETE)
@ResponseBody
public Dashboard unassignDashboardFromPublicCustomer(
- @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
@PathVariable(DASHBOARD_ID) String strDashboardId) throws ThingsboardException {
checkParameter(DASHBOARD_ID, strDashboardId);
DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
@@ -347,22 +342,22 @@ public class DashboardController extends BaseController {
@ApiOperation(value = "Get Tenant Dashboards by System Administrator (getTenantDashboards)",
notes = "Returns a page of dashboard info objects owned by tenant. " + DASHBOARD_INFO_DEFINITION + " " + PAGE_DATA_PARAMETERS +
SYSTEM_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('SYS_ADMIN')")
@RequestMapping(value = "/tenant/{tenantId}/dashboards", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getTenantDashboards(
- @ApiParam(value = TENANT_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = TENANT_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(TENANT_ID) String strTenantId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = DASHBOARD_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = DASHBOARD_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DASHBOARD_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
TenantId tenantId = TenantId.fromUUID(toUUID(strTenantId));
checkTenantId(tenantId, Operation.READ);
@@ -373,22 +368,22 @@ public class DashboardController extends BaseController {
@ApiOperation(value = "Get Tenant Dashboards (getTenantDashboards)",
notes = "Returns a page of dashboard info objects owned by the tenant of a current user. "
+ DASHBOARD_INFO_DEFINITION + " " + PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/tenant/dashboards", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getTenantDashboards(
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = HIDDEN_FOR_MOBILE)
+ @Parameter(description = HIDDEN_FOR_MOBILE)
@RequestParam(required = false) Boolean mobile,
- @ApiParam(value = DASHBOARD_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = DASHBOARD_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DASHBOARD_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -402,24 +397,24 @@ public class DashboardController extends BaseController {
@ApiOperation(value = "Get Customer Dashboards (getCustomerDashboards)",
notes = "Returns a page of dashboard info objects owned by the specified customer. "
+ DASHBOARD_INFO_DEFINITION + " " + PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/customer/{customerId}/dashboards", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getCustomerDashboards(
- @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(CUSTOMER_ID) String strCustomerId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = HIDDEN_FOR_MOBILE)
+ @Parameter(description = HIDDEN_FOR_MOBILE)
@RequestParam(required = false) Boolean mobile,
- @ApiParam(value = DASHBOARD_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = DASHBOARD_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DASHBOARD_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
checkParameter(CUSTOMER_ID, strCustomerId);
TenantId tenantId = getCurrentUser().getTenantId();
@@ -438,7 +433,7 @@ public class DashboardController extends BaseController {
"If 'homeDashboardId' parameter is not set on the User level and the User has authority 'CUSTOMER_USER', check the same parameter for the corresponding Customer. " +
"If 'homeDashboardId' parameter is not set on the User and Customer levels then checks the same parameter for the Tenant that owns the user. "
+ DASHBOARD_DEFINITION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/dashboard/home", method = RequestMethod.GET)
@ResponseBody
@@ -471,7 +466,7 @@ public class DashboardController extends BaseController {
"If 'homeDashboardId' parameter is not set on the User level and the User has authority 'CUSTOMER_USER', check the same parameter for the corresponding Customer. " +
"If 'homeDashboardId' parameter is not set on the User and Customer levels then checks the same parameter for the Tenant that owns the user. " +
TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/dashboard/home/info", method = RequestMethod.GET)
@ResponseBody
@@ -502,7 +497,7 @@ public class DashboardController extends BaseController {
@ApiOperation(value = "Get Tenant Home Dashboard Info (getTenantHomeDashboardInfo)",
notes = "Returns the home dashboard info object that is configured as 'homeDashboardId' parameter in the 'additionalInfo' of the corresponding tenant. " +
TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/tenant/dashboard/home/info", method = RequestMethod.GET)
@ResponseBody
@@ -524,12 +519,12 @@ public class DashboardController extends BaseController {
@ApiOperation(value = "Update Tenant Home Dashboard Info (getTenantHomeDashboardInfo)",
notes = "Update the home dashboard assignment for the current tenant. " +
TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/tenant/dashboard/home/info", method = RequestMethod.POST)
@ResponseStatus(value = HttpStatus.OK)
public void setTenantHomeDashboardInfo(
- @ApiParam(value = "A JSON object that represents home dashboard id and other parameters", required = true)
+ @Parameter(description = "A JSON object that represents home dashboard id and other parameters", required = true)
@RequestBody HomeDashboardInfo homeDashboardInfo) throws ThingsboardException {
if (homeDashboardInfo.getDashboardId() != null) {
@@ -537,7 +532,7 @@ public class DashboardController extends BaseController {
}
Tenant tenant = tenantService.findTenantById(getTenantId());
JsonNode additionalInfo = tenant.getAdditionalInfo();
- if (additionalInfo == null || !(additionalInfo instanceof ObjectNode)) {
+ if (!(additionalInfo instanceof ObjectNode)) {
additionalInfo = JacksonUtil.newObjectNode();
}
if (homeDashboardInfo.getDashboardId() != null) {
@@ -563,8 +558,7 @@ public class DashboardController extends BaseController {
}
return new HomeDashboardInfo(dashboardId, hideDashboardToolbar);
}
- } catch (Exception e) {
- }
+ } catch (Exception ignored) {}
return null;
}
@@ -580,8 +574,7 @@ public class DashboardController extends BaseController {
}
return new HomeDashboard(dashboard, hideDashboardToolbar);
}
- } catch (Exception e) {
- }
+ } catch (Exception ignored) {}
return null;
}
@@ -592,7 +585,7 @@ public class DashboardController extends BaseController {
EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION +
"Third, once dashboard will be delivered to edge service, it's going to be available for usage on remote edge instance." +
TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/{edgeId}/dashboard/{dashboardId}", method = RequestMethod.POST)
@ResponseBody
@@ -616,7 +609,7 @@ public class DashboardController extends BaseController {
EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION +
"Third, once 'unassign' command will be delivered to edge service, it's going to remove dashboard locally." +
TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/{edgeId}/dashboard/{dashboardId}", method = RequestMethod.DELETE)
@ResponseBody
@@ -637,22 +630,22 @@ public class DashboardController extends BaseController {
@ApiOperation(value = "Get Edge Dashboards (getEdgeDashboards)",
notes = "Returns a page of dashboard info objects assigned to the specified edge. "
+ DASHBOARD_INFO_DEFINITION + " " + PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/edge/{edgeId}/dashboards", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getEdgeDashboards(
- @ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(EDGE_ID) String strEdgeId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = DASHBOARD_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = DASHBOARD_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DASHBOARD_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
checkParameter("edgeId", strEdgeId);
TenantId tenantId = getCurrentUser().getTenantId();
diff --git a/application/src/main/java/org/thingsboard/server/controller/DeviceConnectivityController.java b/application/src/main/java/org/thingsboard/server/controller/DeviceConnectivityController.java
index 22a1b95843..48e99e474a 100644
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceConnectivityController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceConnectivityController.java
@@ -16,10 +16,11 @@
package org.thingsboard.server.controller;
import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpHeaders;
@@ -36,12 +37,12 @@ import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
import org.thingsboard.server.common.data.exception.ThingsboardException;
import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.dao.device.DeviceConnectivityService;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.security.permission.Operation;
import org.thingsboard.server.service.security.system.SystemSecurityService;
-import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.net.URISyntaxException;
@@ -67,24 +68,38 @@ public class DeviceConnectivityController extends BaseController {
notes = "Fetch the list of commands to publish device telemetry based on device profile " +
"If the user has the authority of 'Tenant Administrator', the server checks that the device is owned by the same tenant. " +
"If the user has the authority of 'Customer User', the server checks that the device is assigned to the same customer. " +
- TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
- @ApiResponses(value = {
- @ApiResponse(code = 200, message = "OK",
- examples = @io.swagger.annotations.Example(
- value = {
- @io.swagger.annotations.ExampleProperty(
- mediaType = "application/json",
- value = "{\"http\":\"curl -v -X POST http://localhost:8080/api/v1/0ySs4FTOn5WU15XLmal8/telemetry --header Content-Type:application/json --data {temperature:25}\"," +
- "\"mqtt\":\"mosquitto_pub -d -q 1 -h localhost -t v1/devices/me/telemetry -i myClient1 -u myUsername1 -P myPassword -m {temperature:25}\"," +
- "\"coap\":\"coap-client -m POST coap://localhost:5683/api/v1/0ySs4FTOn5WU15XLmal8/telemetry -t json -e {temperature:25}\"}")}))})
+ TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
+ responses = {
+ @ApiResponse(
+ responseCode = "200",
+ description = "OK",
+ content = @Content(
+ mediaType = MediaType.APPLICATION_JSON_VALUE,
+ examples = {
+ @ExampleObject(
+ name = "http",
+ value = "curl -v -X POST http://localhost:8080/api/v1/0ySs4FTOn5WU15XLmal8/telemetry --header Content-Type:application/json --data {temperature:25}"
+ ),
+ @ExampleObject(
+ name = "mqtt",
+ value = "mosquitto_pub -d -q 1 -h localhost -t v1/devices/me/telemetry -i myClient1 -u myUsername1 -P myPassword -m {temperature:25}"
+ ),
+ @ExampleObject(
+ name = "coap",
+ value = "coap-client -m POST coap://localhost:5683/api/v1/0ySs4FTOn5WU15XLmal8/telemetry -t json -e {temperature:25}"
+ )
+ }
+ )
+ )
+ })
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/device-connectivity/{deviceId}", method = RequestMethod.GET)
@ResponseBody
- public JsonNode getDevicePublishTelemetryCommands(@ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+ public JsonNode getDevicePublishTelemetryCommands(@Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_ID) String strDeviceId, HttpServletRequest request) throws ThingsboardException, URISyntaxException {
checkParameter(DEVICE_ID, strDeviceId);
DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
- Device device = checkDeviceId(deviceId, Operation.READ_CREDENTIALS);
+ Device device = checkDeviceId(deviceId, org.thingsboard.server.service.security.permission.Operation.READ_CREDENTIALS);
String baseUrl = systemSecurityService.getBaseUrl(getTenantId(), getCurrentUser().getCustomerId(), request);
return deviceConnectivityService.findDevicePublishTelemetryCommands(baseUrl, device);
@@ -93,7 +108,7 @@ public class DeviceConnectivityController extends BaseController {
@ApiOperation(value = "Download server certificate using file path defined in device.connectivity properties (downloadServerCertificate)", notes = "Download server certificate.")
@RequestMapping(value = "/device-connectivity/{protocol}/certificate/download", method = RequestMethod.GET)
@ResponseBody
- public ResponseEntity downloadServerCertificate(@ApiParam(value = PROTOCOL_PARAM_DESCRIPTION)
+ public ResponseEntity downloadServerCertificate(@Parameter(description = PROTOCOL_PARAM_DESCRIPTION)
@PathVariable(PROTOCOL) String protocol) throws ThingsboardException, IOException {
checkParameter(PROTOCOL, protocol);
var pemCert =
@@ -110,7 +125,7 @@ public class DeviceConnectivityController extends BaseController {
@ApiOperation(value = "Download generated docker-compose.yml file for gateway (downloadGatewayDockerCompose)", notes = "Download generated docker-compose.yml for gateway.")
@RequestMapping(value = "/device-connectivity/gateway-launch/{deviceId}/docker-compose/download", method = RequestMethod.GET)
@ResponseBody
- public ResponseEntity downloadGatewayDockerCompose(@ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+ public ResponseEntity downloadGatewayDockerCompose(@Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_ID) String strDeviceId, HttpServletRequest request) throws ThingsboardException, URISyntaxException, IOException {
checkParameter(DEVICE_ID, strDeviceId);
DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
diff --git a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
index b93f0e0321..555769370c 100644
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
@@ -19,8 +19,11 @@ import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import jakarta.annotation.Nullable;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
@@ -62,6 +65,7 @@ import org.thingsboard.server.common.data.page.TimePageLink;
import org.thingsboard.server.common.data.security.DeviceCredentials;
import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportRequest;
import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportResult;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.dao.device.claim.ClaimResponse;
import org.thingsboard.server.dao.device.claim.ClaimResult;
import org.thingsboard.server.dao.device.claim.ReclaimResult;
@@ -74,8 +78,7 @@ import org.thingsboard.server.service.security.model.SecurityUser;
import org.thingsboard.server.service.security.permission.Operation;
import org.thingsboard.server.service.security.permission.Resource;
-import javax.annotation.Nullable;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@@ -91,7 +94,6 @@ import static org.thingsboard.server.controller.ControllerConstants.DEVICE_ID_PA
import static org.thingsboard.server.controller.ControllerConstants.DEVICE_INFO_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.DEVICE_NAME_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.DEVICE_PROFILE_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.DEVICE_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.DEVICE_TEXT_SEARCH_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.DEVICE_TYPE_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.DEVICE_UPDATE_CREDENTIALS_PARAM_ACCESS_TOKEN_DESCRIPTION_MARKDOWN;
@@ -111,7 +113,6 @@ import static org.thingsboard.server.controller.ControllerConstants.EDGE_UNASSIG
import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -142,7 +143,7 @@ public class DeviceController extends BaseController {
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/device/{deviceId}", method = RequestMethod.GET)
@ResponseBody
- public Device getDeviceById(@ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+ public Device getDeviceById(@Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
checkParameter(DEVICE_ID, strDeviceId);
DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
@@ -157,7 +158,7 @@ public class DeviceController extends BaseController {
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/device/info/{deviceId}", method = RequestMethod.GET)
@ResponseBody
- public DeviceInfo getDeviceInfoById(@ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+ public DeviceInfo getDeviceInfoById(@Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
checkParameter(DEVICE_ID, strDeviceId);
DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
@@ -176,17 +177,16 @@ public class DeviceController extends BaseController {
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/device", method = RequestMethod.POST)
@ResponseBody
- public Device saveDevice(@ApiParam(value = "A JSON value representing the device.") @RequestBody Device device,
- @ApiParam(value = "Optional value of the device credentials to be used during device creation. " +
+ public Device saveDevice(@Parameter(description = "A JSON value representing the device.") @RequestBody Device device,
+ @Parameter(description = "Optional value of the device credentials to be used during device creation. " +
"If omitted, access token will be auto-generated.") @RequestParam(name = "accessToken", required = false) String accessToken) throws Exception {
device.setTenantId(getCurrentUser().getTenantId());
- Device oldDevice = null;
if (device.getId() != null) {
- oldDevice = checkDeviceId(device.getId(), Operation.WRITE);
+ checkDeviceId(device.getId(), Operation.WRITE);
} else {
checkEntity(null, device, Resource.DEVICE);
}
- return tbDeviceService.save(device, oldDevice, accessToken, getCurrentUser());
+ return tbDeviceService.save(device, accessToken, getCurrentUser());
}
@ApiOperation(value = "Create Device (saveDevice) with credentials ",
@@ -210,7 +210,7 @@ public class DeviceController extends BaseController {
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/device-with-credentials", method = RequestMethod.POST)
@ResponseBody
- public Device saveDeviceWithCredentials(@ApiParam(value = "The JSON object with device and credentials. See method description above for example.")
+ public Device saveDeviceWithCredentials(@Parameter(description = "The JSON object with device and credentials. See method description above for example.")
@Valid @RequestBody SaveDeviceWithCredentialsRequest deviceAndCredentials) throws ThingsboardException {
Device device = deviceAndCredentials.getDevice();
DeviceCredentials credentials = deviceAndCredentials.getCredentials();
@@ -224,7 +224,7 @@ public class DeviceController extends BaseController {
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/device/{deviceId}", method = RequestMethod.DELETE)
@ResponseStatus(value = HttpStatus.OK)
- public void deleteDevice(@ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+ public void deleteDevice(@Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_ID) String strDeviceId) throws Exception {
checkParameter(DEVICE_ID, strDeviceId);
DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
@@ -237,9 +237,9 @@ public class DeviceController extends BaseController {
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/customer/{customerId}/device/{deviceId}", method = RequestMethod.POST)
@ResponseBody
- public Device assignDeviceToCustomer(@ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+ public Device assignDeviceToCustomer(@Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
@PathVariable("customerId") String strCustomerId,
- @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
checkParameter("customerId", strCustomerId);
checkParameter(DEVICE_ID, strDeviceId);
@@ -255,7 +255,7 @@ public class DeviceController extends BaseController {
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/customer/device/{deviceId}", method = RequestMethod.DELETE)
@ResponseBody
- public Device unassignDeviceFromCustomer(@ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+ public Device unassignDeviceFromCustomer(@Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
checkParameter(DEVICE_ID, strDeviceId);
DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
@@ -276,7 +276,7 @@ public class DeviceController extends BaseController {
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/customer/public/device/{deviceId}", method = RequestMethod.POST)
@ResponseBody
- public Device assignDeviceToPublicCustomer(@ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+ public Device assignDeviceToPublicCustomer(@Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
checkParameter(DEVICE_ID, strDeviceId);
DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
@@ -289,7 +289,7 @@ public class DeviceController extends BaseController {
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/device/{deviceId}/credentials", method = RequestMethod.GET)
@ResponseBody
- public DeviceCredentials getDeviceCredentialsByDeviceId(@ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+ public DeviceCredentials getDeviceCredentialsByDeviceId(@Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
checkParameter(DEVICE_ID, strDeviceId);
DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
@@ -322,7 +322,7 @@ public class DeviceController extends BaseController {
@RequestMapping(value = "/device/credentials", method = RequestMethod.POST)
@ResponseBody
public DeviceCredentials updateDeviceCredentials(
- @ApiParam(value = "A JSON value representing the device credentials.")
+ @Parameter(description = "A JSON value representing the device credentials.")
@RequestBody DeviceCredentials deviceCredentials) throws ThingsboardException {
checkNotNull(deviceCredentials);
Device device = checkDeviceId(deviceCredentials.getDeviceId(), Operation.WRITE_CREDENTIALS);
@@ -336,17 +336,17 @@ public class DeviceController extends BaseController {
@RequestMapping(value = "/tenant/devices", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getTenantDevices(
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = DEVICE_TYPE_DESCRIPTION)
+ @Parameter(description = DEVICE_TYPE_DESCRIPTION)
@RequestParam(required = false) String type,
- @ApiParam(value = DEVICE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = DEVICE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DEVICE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "deviceProfileName", "label", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -364,21 +364,21 @@ public class DeviceController extends BaseController {
@RequestMapping(value = "/tenant/deviceInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getTenantDeviceInfos(
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = DEVICE_TYPE_DESCRIPTION)
+ @Parameter(description = DEVICE_TYPE_DESCRIPTION)
@RequestParam(required = false) String type,
- @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
@RequestParam(required = false) String deviceProfileId,
- @ApiParam(value = DEVICE_ACTIVE_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_ACTIVE_PARAM_DESCRIPTION)
@RequestParam(required = false) Boolean active,
- @ApiParam(value = DEVICE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = DEVICE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DEVICE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "deviceProfileName", "label", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder
) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
@@ -401,7 +401,7 @@ public class DeviceController extends BaseController {
@RequestMapping(value = "/tenant/devices", params = {"deviceName"}, method = RequestMethod.GET)
@ResponseBody
public Device getTenantDevice(
- @ApiParam(value = DEVICE_NAME_DESCRIPTION)
+ @Parameter(description = DEVICE_NAME_DESCRIPTION)
@RequestParam String deviceName) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
return checkNotNull(deviceService.findDeviceByTenantIdAndName(tenantId, deviceName));
@@ -414,19 +414,19 @@ public class DeviceController extends BaseController {
@RequestMapping(value = "/customer/{customerId}/devices", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getCustomerDevices(
- @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(CUSTOMER_ID) String strCustomerId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = DEVICE_TYPE_DESCRIPTION)
+ @Parameter(description = DEVICE_TYPE_DESCRIPTION)
@RequestParam(required = false) String type,
- @ApiParam(value = DEVICE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = DEVICE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DEVICE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "deviceProfileName", "label", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
checkParameter("customerId", strCustomerId);
TenantId tenantId = getCurrentUser().getTenantId();
@@ -447,23 +447,23 @@ public class DeviceController extends BaseController {
@RequestMapping(value = "/customer/{customerId}/deviceInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getCustomerDeviceInfos(
- @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
@PathVariable("customerId") String strCustomerId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = DEVICE_TYPE_DESCRIPTION)
+ @Parameter(description = DEVICE_TYPE_DESCRIPTION)
@RequestParam(required = false) String type,
- @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
@RequestParam(required = false) String deviceProfileId,
- @ApiParam(value = DEVICE_ACTIVE_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_ACTIVE_PARAM_DESCRIPTION)
@RequestParam(required = false) Boolean active,
- @ApiParam(value = DEVICE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = DEVICE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DEVICE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "deviceProfileName", "label", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
checkParameter("customerId", strCustomerId);
TenantId tenantId = getCurrentUser().getTenantId();
@@ -488,7 +488,7 @@ public class DeviceController extends BaseController {
@RequestMapping(value = "/devices", params = {"deviceIds"}, method = RequestMethod.GET)
@ResponseBody
public List getDevicesByIds(
- @ApiParam(value = "A list of devices ids, separated by comma ','")
+ @Parameter(description = "A list of devices ids, separated by comma ','")
@RequestParam("deviceIds") String[] strDeviceIds) throws ThingsboardException, ExecutionException, InterruptedException {
checkArrayParameter("deviceIds", strDeviceIds);
SecurityUser user = getCurrentUser();
@@ -515,7 +515,7 @@ public class DeviceController extends BaseController {
@RequestMapping(value = "/devices", method = RequestMethod.POST)
@ResponseBody
public List findByQuery(
- @ApiParam(value = "The device search query JSON")
+ @Parameter(description = "The device search query JSON")
@RequestBody DeviceSearchQuery query) throws ThingsboardException, ExecutionException, InterruptedException {
checkNotNull(query);
checkNotNull(query.getParameters());
@@ -535,7 +535,7 @@ public class DeviceController extends BaseController {
@ApiOperation(value = "Get Device Types (getDeviceTypes)",
notes = "Deprecated. See 'getDeviceProfileNames' API from Device Profile Controller instead." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/device/types", method = RequestMethod.GET)
@ResponseBody
@@ -557,9 +557,9 @@ public class DeviceController extends BaseController {
@PreAuthorize("hasAuthority('CUSTOMER_USER')")
@RequestMapping(value = "/customer/device/{deviceName}/claim", method = RequestMethod.POST)
@ResponseBody
- public DeferredResult claimDevice(@ApiParam(value = "Unique name of the device which is going to be claimed")
+ public DeferredResult claimDevice(@Parameter(description = "Unique name of the device which is going to be claimed")
@PathVariable(DEVICE_NAME) String deviceName,
- @ApiParam(value = "Claiming request which can optionally contain secret key")
+ @Parameter(description = "Claiming request which can optionally contain secret key")
@RequestBody(required = false) ClaimRequest claimRequest) throws ThingsboardException {
checkParameter(DEVICE_NAME, deviceName);
final DeferredResult deferredResult = new DeferredResult<>();
@@ -606,7 +606,7 @@ public class DeviceController extends BaseController {
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/customer/device/{deviceName}/claim", method = RequestMethod.DELETE)
@ResponseStatus(value = HttpStatus.OK)
- public DeferredResult reClaimDevice(@ApiParam(value = "Unique name of the device which is going to be reclaimed")
+ public DeferredResult reClaimDevice(@Parameter(description = "Unique name of the device which is going to be reclaimed")
@PathVariable(DEVICE_NAME) String deviceName) throws ThingsboardException {
checkParameter(DEVICE_NAME, deviceName);
final DeferredResult deferredResult = new DeferredResult<>();
@@ -646,9 +646,9 @@ public class DeviceController extends BaseController {
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/tenant/{tenantId}/device/{deviceId}", method = RequestMethod.POST)
@ResponseBody
- public Device assignDeviceToTenant(@ApiParam(value = TENANT_ID_PARAM_DESCRIPTION)
+ public Device assignDeviceToTenant(@Parameter(description = TENANT_ID_PARAM_DESCRIPTION)
@PathVariable(TENANT_ID) String strTenantId,
- @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
checkParameter(TENANT_ID, strTenantId);
checkParameter(DEVICE_ID, strDeviceId);
@@ -669,13 +669,13 @@ public class DeviceController extends BaseController {
"Second, remote edge service will receive a copy of assignment device " +
EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION +
"Third, once device will be delivered to edge service, it's going to be available for usage on remote edge instance." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/{edgeId}/device/{deviceId}", method = RequestMethod.POST)
@ResponseBody
- public Device assignDeviceToEdge(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION)
+ public Device assignDeviceToEdge(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION)
@PathVariable(EDGE_ID) String strEdgeId,
- @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
checkParameter(EDGE_ID, strEdgeId);
checkParameter(DEVICE_ID, strDeviceId);
@@ -694,13 +694,13 @@ public class DeviceController extends BaseController {
"Second, remote edge service will receive an 'unassign' command to remove device " +
EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION +
"Third, once 'unassign' command will be delivered to edge service, it's going to remove device locally." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/{edgeId}/device/{deviceId}", method = RequestMethod.DELETE)
@ResponseBody
- public Device unassignDeviceFromEdge(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION)
+ public Device unassignDeviceFromEdge(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION)
@PathVariable(EDGE_ID) String strEdgeId,
- @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
checkParameter(EDGE_ID, strEdgeId);
checkParameter(DEVICE_ID, strDeviceId);
@@ -719,27 +719,27 @@ public class DeviceController extends BaseController {
@RequestMapping(value = "/edge/{edgeId}/devices", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getEdgeDevices(
- @ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(EDGE_ID) String strEdgeId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = DEVICE_TYPE_DESCRIPTION)
+ @Parameter(description = DEVICE_TYPE_DESCRIPTION)
@RequestParam(required = false) String type,
- @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
@RequestParam(required = false) String deviceProfileId,
- @ApiParam(value = DEVICE_ACTIVE_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_ACTIVE_PARAM_DESCRIPTION)
@RequestParam(required = false) Boolean active,
- @ApiParam(value = DEVICE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = DEVICE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DEVICE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "deviceProfileName", "label", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = "Timestamp. Devices with creation time before it won't be queried")
+ @Parameter(description = "Timestamp. Devices with creation time before it won't be queried")
@RequestParam(required = false) Long startTime,
- @ApiParam(value = "Timestamp. Devices with creation time after it won't be queried")
+ @Parameter(description = "Timestamp. Devices with creation time after it won't be queried")
@RequestParam(required = false) Long endTime) throws ThingsboardException {
checkParameter(EDGE_ID, strEdgeId);
TenantId tenantId = getCurrentUser().getTenantId();
@@ -766,11 +766,11 @@ public class DeviceController extends BaseController {
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/devices/count/{otaPackageType}/{deviceProfileId}", method = RequestMethod.GET)
@ResponseBody
- public Long countByDeviceProfileAndEmptyOtaPackage
- (@ApiParam(value = "OTA package type", allowableValues = "FIRMWARE, SOFTWARE")
- @PathVariable("otaPackageType") String otaPackageType,
- @ApiParam(value = "Device Profile Id. I.g. '784f394c-42b6-435a-983c-b7beff2784f9'")
- @PathVariable("deviceProfileId") String deviceProfileId) throws ThingsboardException {
+ public Long countByDeviceProfileAndEmptyOtaPackage(
+ @Parameter(description = "OTA package type", schema = @Schema(allowableValues = {"FIRMWARE", "SOFTWARE"}))
+ @PathVariable("otaPackageType") String otaPackageType,
+ @Parameter(description = "Device Profile Id. I.g. '784f394c-42b6-435a-983c-b7beff2784f9'")
+ @PathVariable("deviceProfileId") String deviceProfileId) throws ThingsboardException {
checkParameter("OtaPackageType", otaPackageType);
checkParameter("DeviceProfileId", deviceProfileId);
return deviceService.countDevicesByTenantIdAndDeviceProfileIdAndEmptyOtaPackage(
diff --git a/application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java b/application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java
index bcbd2e4ef1..02cf15c81d 100644
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java
@@ -15,12 +15,15 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -40,6 +43,7 @@ import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.dao.resource.ImageService;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.dao.timeseries.TimeseriesService;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.entitiy.device.profile.TbDeviceProfileService;
@@ -54,7 +58,6 @@ import static org.thingsboard.server.controller.ControllerConstants.DEVICE_PROFI
import static org.thingsboard.server.controller.ControllerConstants.DEVICE_PROFILE_ID;
import static org.thingsboard.server.controller.ControllerConstants.DEVICE_PROFILE_ID_PARAM_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.DEVICE_PROFILE_INFO_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.DEVICE_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.DEVICE_PROFILE_TEXT_SEARCH_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.INLINE_IMAGES;
import static org.thingsboard.server.controller.ControllerConstants.INLINE_IMAGES_DESCRIPTION;
@@ -62,12 +65,10 @@ import static org.thingsboard.server.controller.ControllerConstants.NEW_LINE;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH;
-import static org.thingsboard.server.controller.ControllerConstants.TRANSPORT_TYPE_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.UUID_WIKI_LINK;
@RestController
@@ -86,14 +87,14 @@ public class DeviceProfileController extends BaseController {
@ApiOperation(value = "Get Device Profile (getDeviceProfileById)",
notes = "Fetch the Device Profile object based on the provided Device Profile Id. " +
"The server checks that the device profile is owned by the same tenant. " + TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/deviceProfile/{deviceProfileId}", method = RequestMethod.GET)
@ResponseBody
public DeviceProfile getDeviceProfileById(
- @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_PROFILE_ID) String strDeviceProfileId,
- @ApiParam(value = INLINE_IMAGES_DESCRIPTION)
+ @Parameter(description = INLINE_IMAGES_DESCRIPTION)
@RequestParam(value = INLINE_IMAGES, required = false) boolean inlineImages) throws ThingsboardException {
checkParameter(DEVICE_PROFILE_ID, strDeviceProfileId);
DeviceProfileId deviceProfileId = new DeviceProfileId(toUUID(strDeviceProfileId));
@@ -107,12 +108,12 @@ public class DeviceProfileController extends BaseController {
@ApiOperation(value = "Get Device Profile Info (getDeviceProfileInfoById)",
notes = "Fetch the Device Profile Info object based on the provided Device Profile Id. "
+ DEVICE_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/deviceProfileInfo/{deviceProfileId}", method = RequestMethod.GET)
@ResponseBody
public DeviceProfileInfo getDeviceProfileInfoById(
- @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_PROFILE_ID) String strDeviceProfileId) throws ThingsboardException {
checkParameter(DEVICE_PROFILE_ID, strDeviceProfileId);
DeviceProfileId deviceProfileId = new DeviceProfileId(toUUID(strDeviceProfileId));
@@ -122,7 +123,7 @@ public class DeviceProfileController extends BaseController {
@ApiOperation(value = "Get Default Device Profile (getDefaultDeviceProfileInfo)",
notes = "Fetch the Default Device Profile Info object. " +
DEVICE_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/deviceProfileInfo/default", method = RequestMethod.GET)
@ResponseBody
@@ -136,12 +137,12 @@ public class DeviceProfileController extends BaseController {
"The call is used for auto-complete in the UI forms. " +
"The implementation limits the number of devices that participate in search to 100 as a trade of between accurate results and time-consuming queries. " +
TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/deviceProfile/devices/keys/timeseries", method = RequestMethod.GET)
@ResponseBody
public List getTimeseriesKeys(
- @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
@RequestParam(name = DEVICE_PROFILE_ID, required = false) String deviceProfileIdStr) throws ThingsboardException {
DeviceProfileId deviceProfileId;
if (StringUtils.isNotEmpty(deviceProfileIdStr)) {
@@ -160,12 +161,12 @@ public class DeviceProfileController extends BaseController {
"The call is used for auto-complete in the UI forms. " +
"The implementation limits the number of devices that participate in search to 100 as a trade of between accurate results and time-consuming queries. " +
TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/deviceProfile/devices/keys/attributes", method = RequestMethod.GET)
@ResponseBody
public List getAttributesKeys(
- @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
@RequestParam(name = DEVICE_PROFILE_ID, required = false) String deviceProfileIdStr) throws ThingsboardException {
DeviceProfileId deviceProfileId;
if (StringUtils.isNotEmpty(deviceProfileIdStr)) {
@@ -186,13 +187,12 @@ public class DeviceProfileController extends BaseController {
"Device profile name is unique in the scope of tenant. Only one 'default' device profile may exist in scope of tenant." + DEVICE_PROFILE_DATA +
"Remove 'id', 'tenantId' from the request body example (below) to create new Device Profile entity. " +
TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json",
- consumes = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/deviceProfile", method = RequestMethod.POST)
@ResponseBody
public DeviceProfile saveDeviceProfile(
- @ApiParam(value = "A JSON value representing the device profile.")
+ @Parameter(description = "A JSON value representing the device profile.")
@RequestBody DeviceProfile deviceProfile) throws Exception {
deviceProfile.setTenantId(getTenantId());
checkEntity(deviceProfile.getId(), deviceProfile, Resource.DEVICE_PROFILE);
@@ -201,13 +201,12 @@ public class DeviceProfileController extends BaseController {
@ApiOperation(value = "Delete device profile (deleteDeviceProfile)",
notes = "Deletes the device profile. Referencing non-existing device profile Id will cause an error. " +
- "Can't delete the device profile if it is referenced by existing devices." + TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ "Can't delete the device profile if it is referenced by existing devices." + TENANT_AUTHORITY_PARAGRAPH)
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/deviceProfile/{deviceProfileId}", method = RequestMethod.DELETE)
@ResponseStatus(value = HttpStatus.OK)
public void deleteDeviceProfile(
- @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_PROFILE_ID) String strDeviceProfileId) throws ThingsboardException {
checkParameter(DEVICE_PROFILE_ID, strDeviceProfileId);
DeviceProfileId deviceProfileId = new DeviceProfileId(toUUID(strDeviceProfileId));
@@ -217,12 +216,12 @@ public class DeviceProfileController extends BaseController {
@ApiOperation(value = "Make Device Profile Default (setDefaultDeviceProfile)",
notes = "Marks device profile as default within a tenant scope." + TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/deviceProfile/{deviceProfileId}/default", method = RequestMethod.POST)
@ResponseBody
public DeviceProfile setDefaultDeviceProfile(
- @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_PROFILE_ID) String strDeviceProfileId) throws ThingsboardException {
checkParameter(DEVICE_PROFILE_ID, strDeviceProfileId);
DeviceProfileId deviceProfileId = new DeviceProfileId(toUUID(strDeviceProfileId));
@@ -234,20 +233,20 @@ public class DeviceProfileController extends BaseController {
@ApiOperation(value = "Get Device Profiles (getDeviceProfiles)",
notes = "Returns a page of devices profile objects owned by tenant. " +
PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/deviceProfiles", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getDeviceProfiles(
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = DEVICE_PROFILE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = DEVICE_PROFILE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DEVICE_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "transportType", "description", "isDefault"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
return checkNotNull(deviceProfileService.findDeviceProfiles(getTenantId(), pageLink));
@@ -256,22 +255,22 @@ public class DeviceProfileController extends BaseController {
@ApiOperation(value = "Get Device Profiles for transport type (getDeviceProfileInfos)",
notes = "Returns a page of devices profile info objects owned by tenant. " +
PAGE_DATA_PARAMETERS + DEVICE_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/deviceProfileInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getDeviceProfileInfos(
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = DEVICE_PROFILE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = DEVICE_PROFILE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DEVICE_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "transportType", "description", "isDefault"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = "Type of the transport", allowableValues = TRANSPORT_TYPE_ALLOWABLE_VALUES)
+ @Parameter(description = "Type of the transport", schema = @Schema(allowableValues = {"DEFAULT", "MQTT", "COAP", "LWM2M", "SNMP"}))
@RequestParam(required = false) String transportType) throws ThingsboardException {
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
return checkNotNull(deviceProfileService.findDeviceProfileInfos(getTenantId(), pageLink, transportType));
@@ -284,7 +283,7 @@ public class DeviceProfileController extends BaseController {
@RequestMapping(value = "/deviceProfile/names", method = RequestMethod.GET)
@ResponseBody
public List getDeviceProfileNames(
- @ApiParam(value = "Flag indicating whether to retrieve exclusively the names of device profiles that are referenced by tenant's devices.")
+ @Parameter(description = "Flag indicating whether to retrieve exclusively the names of device profiles that are referenced by tenant's devices.")
@RequestParam(value = "activeOnly", required = false, defaultValue = "false") boolean activeOnly) throws ThingsboardException {
SecurityUser user = getCurrentUser();
TenantId tenantId = user.getTenantId();
diff --git a/application/src/main/java/org/thingsboard/server/controller/EdgeController.java b/application/src/main/java/org/thingsboard/server/controller/EdgeController.java
index e07a9d5573..9781d48828 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EdgeController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EdgeController.java
@@ -16,8 +16,11 @@
package org.thingsboard.server.controller;
import com.google.common.util.concurrent.ListenableFuture;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
@@ -54,6 +57,7 @@ import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportReques
import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportResult;
import org.thingsboard.server.common.msg.edge.FromEdgeSyncResponse;
import org.thingsboard.server.common.msg.edge.ToEdgeSyncRequest;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.dao.exception.DataValidationException;
import org.thingsboard.server.dao.exception.IncorrectParameterException;
import org.thingsboard.server.dao.model.ModelConstants;
@@ -67,7 +71,6 @@ import org.thingsboard.server.service.security.model.SecurityUser;
import org.thingsboard.server.service.security.permission.Operation;
import org.thingsboard.server.service.security.permission.Resource;
-import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@@ -78,14 +81,12 @@ import java.util.stream.Collectors;
import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID_PARAM_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.EDGE_ID_PARAM_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.EDGE_INFO_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.EDGE_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.EDGE_TEXT_SEARCH_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.EDGE_TYPE_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.RULE_CHAIN_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -120,11 +121,11 @@ public class EdgeController extends BaseController {
@ApiOperation(value = "Get Edge (getEdgeById)",
notes = "Get the Edge object based on the provided Edge Id. " + EDGE_SECURITY_CHECK + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/edge/{edgeId}", method = RequestMethod.GET)
@ResponseBody
- public Edge getEdgeById(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+ public Edge getEdgeById(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(EDGE_ID) String strEdgeId) throws ThingsboardException {
checkParameter(EDGE_ID, strEdgeId);
EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
@@ -133,11 +134,11 @@ public class EdgeController extends BaseController {
@ApiOperation(value = "Get Edge Info (getEdgeInfoById)",
notes = "Get the Edge Info object based on the provided Edge Id. " + EDGE_SECURITY_CHECK + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/edge/info/{edgeId}", method = RequestMethod.GET)
@ResponseBody
- public EdgeInfo getEdgeInfoById(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+ public EdgeInfo getEdgeInfoById(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(EDGE_ID) String strEdgeId) throws ThingsboardException {
checkParameter(EDGE_ID, strEdgeId);
EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
@@ -152,11 +153,11 @@ public class EdgeController extends BaseController {
"\n\nEdge name is unique in the scope of tenant. Use unique identifiers like MAC or IMEI for the edge names and non-unique 'label' field for user-friendly visualization purposes." +
"Remove 'id', 'tenantId' and optionally 'customerId' from the request body example (below) to create new Edge entity. " +
TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge", method = RequestMethod.POST)
@ResponseBody
- public Edge saveEdge(@ApiParam(value = "A JSON value representing the edge.", required = true)
+ public Edge saveEdge(@Parameter(description = "A JSON value representing the edge.", required = true)
@RequestBody Edge edge) throws Exception {
TenantId tenantId = getTenantId();
edge.setTenantId(tenantId);
@@ -182,7 +183,7 @@ public class EdgeController extends BaseController {
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/{edgeId}", method = RequestMethod.DELETE)
@ResponseStatus(value = HttpStatus.OK)
- public void deleteEdge(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+ public void deleteEdge(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(EDGE_ID) String strEdgeId) throws ThingsboardException {
checkParameter(EDGE_ID, strEdgeId);
EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
@@ -192,19 +193,19 @@ public class EdgeController extends BaseController {
@ApiOperation(value = "Get Tenant Edges (getEdges)",
notes = "Returns a page of edges owned by tenant. " +
- PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edges", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
- public PageData getEdges(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ public PageData getEdges(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = EDGE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = EDGE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EDGE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
TenantId tenantId = getCurrentUser().getTenantId();
@@ -213,13 +214,13 @@ public class EdgeController extends BaseController {
@ApiOperation(value = "Assign edge to customer (assignEdgeToCustomer)",
notes = "Creates assignment of the edge to customer. Customer will be able to query edge afterwards." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/customer/{customerId}/edge/{edgeId}", method = RequestMethod.POST)
@ResponseBody
- public Edge assignEdgeToCustomer(@ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
+ public Edge assignEdgeToCustomer(@Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
@PathVariable("customerId") String strCustomerId,
- @ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(EDGE_ID) String strEdgeId) throws ThingsboardException {
checkParameter("customerId", strCustomerId);
checkParameter(EDGE_ID, strEdgeId);
@@ -232,11 +233,11 @@ public class EdgeController extends BaseController {
@ApiOperation(value = "Unassign edge from customer (unassignEdgeFromCustomer)",
notes = "Clears assignment of the edge to customer. Customer will not be able to query edge afterwards." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/customer/edge/{edgeId}", method = RequestMethod.DELETE)
@ResponseBody
- public Edge unassignEdgeFromCustomer(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+ public Edge unassignEdgeFromCustomer(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(EDGE_ID) String strEdgeId) throws ThingsboardException {
checkParameter(EDGE_ID, strEdgeId);
EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
@@ -253,11 +254,11 @@ public class EdgeController extends BaseController {
notes = "Edge will be available for non-authorized (not logged-in) users. " +
"This is useful to create dashboards that you plan to share/embed on a publicly available website. " +
"However, users that are logged-in and belong to different tenant will not be able to access the edge." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/customer/public/edge/{edgeId}", method = RequestMethod.POST)
@ResponseBody
- public Edge assignEdgeToPublicCustomer(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+ public Edge assignEdgeToPublicCustomer(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(EDGE_ID) String strEdgeId) throws ThingsboardException {
checkParameter(EDGE_ID, strEdgeId);
EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
@@ -267,22 +268,22 @@ public class EdgeController extends BaseController {
@ApiOperation(value = "Get Tenant Edges (getTenantEdges)",
notes = "Returns a page of edges owned by tenant. " +
- PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/tenant/edges", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getTenantEdges(
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = EDGE_TYPE_DESCRIPTION)
+ @Parameter(description = EDGE_TYPE_DESCRIPTION)
@RequestParam(required = false) String type,
- @ApiParam(value = EDGE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = EDGE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EDGE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -296,22 +297,22 @@ public class EdgeController extends BaseController {
@ApiOperation(value = "Get Tenant Edge Infos (getTenantEdgeInfos)",
notes = "Returns a page of edges info objects owned by tenant. " +
PAGE_DATA_PARAMETERS + EDGE_INFO_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/tenant/edgeInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getTenantEdgeInfos(
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = EDGE_TYPE_DESCRIPTION)
+ @Parameter(description = EDGE_TYPE_DESCRIPTION)
@RequestParam(required = false) String type,
- @ApiParam(value = EDGE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = EDGE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EDGE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -325,11 +326,11 @@ public class EdgeController extends BaseController {
@ApiOperation(value = "Get Tenant Edge (getTenantEdge)",
notes = "Requested edge must be owned by tenant or customer that the user belongs to. " +
"Edge name is an unique property of edge. So it can be used to identify the edge." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/tenant/edges", params = {"edgeName"}, method = RequestMethod.GET)
@ResponseBody
- public Edge getTenantEdge(@ApiParam(value = "Unique name of the edge", required = true)
+ public Edge getTenantEdge(@Parameter(description = "Unique name of the edge", required = true)
@RequestParam String edgeName) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
return checkNotNull(edgeService.findEdgeByTenantIdAndName(tenantId, edgeName));
@@ -338,13 +339,13 @@ public class EdgeController extends BaseController {
@ApiOperation(value = "Set root rule chain for provided edge (setEdgeRootRuleChain)",
notes = "Change root rule chain of the edge to the new provided rule chain. \n" +
"This operation will send a notification to update root rule chain on remote edge service." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/{edgeId}/{ruleChainId}/root", method = RequestMethod.POST)
@ResponseBody
- public Edge setEdgeRootRuleChain(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+ public Edge setEdgeRootRuleChain(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(EDGE_ID) String strEdgeId,
- @ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION, required = true)
@PathVariable("ruleChainId") String strRuleChainId) throws Exception {
checkParameter(EDGE_ID, strEdgeId);
checkParameter("ruleChainId", strRuleChainId);
@@ -358,24 +359,24 @@ public class EdgeController extends BaseController {
@ApiOperation(value = "Get Customer Edges (getCustomerEdges)",
notes = "Returns a page of edges objects assigned to customer. " +
- PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/customer/{customerId}/edges", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getCustomerEdges(
- @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+ @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
@PathVariable("customerId") String strCustomerId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = EDGE_TYPE_DESCRIPTION)
+ @Parameter(description = EDGE_TYPE_DESCRIPTION)
@RequestParam(required = false) String type,
- @ApiParam(value = EDGE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = EDGE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EDGE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
checkParameter("customerId", strCustomerId);
SecurityUser user = getCurrentUser();
@@ -394,24 +395,24 @@ public class EdgeController extends BaseController {
@ApiOperation(value = "Get Customer Edge Infos (getCustomerEdgeInfos)",
notes = "Returns a page of edges info objects assigned to customer. " +
- PAGE_DATA_PARAMETERS + EDGE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS + EDGE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/customer/{customerId}/edgeInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getCustomerEdgeInfos(
- @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+ @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
@PathVariable("customerId") String strCustomerId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = EDGE_TYPE_DESCRIPTION)
+ @Parameter(description = EDGE_TYPE_DESCRIPTION)
@RequestParam(required = false) String type,
- @ApiParam(value = EDGE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = EDGE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EDGE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
checkParameter("customerId", strCustomerId);
SecurityUser user = getCurrentUser();
@@ -430,12 +431,12 @@ public class EdgeController extends BaseController {
@ApiOperation(value = "Get Edges By Ids (getEdgesByIds)",
notes = "Requested edges must be owned by tenant or assigned to customer which user is performing the request." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/edges", params = {"edgeIds"}, method = RequestMethod.GET)
@ResponseBody
public List getEdgesByIds(
- @ApiParam(value = "A list of edges ids, separated by comma ','", required = true)
+ @Parameter(description = "A list of edges ids, separated by comma ','", required = true)
@RequestParam("edgeIds") String[] strEdgeIds) throws ThingsboardException, ExecutionException, InterruptedException {
checkArrayParameter("edgeIds", strEdgeIds);
SecurityUser user = getCurrentUser();
@@ -459,7 +460,7 @@ public class EdgeController extends BaseController {
notes = "Returns all edges that are related to the specific entity. " +
"The entity id, relation type, edge types, depth of the search, and other query parameters defined using complex 'EdgeSearchQuery' object. " +
"See 'Model' tab of the Parameters for more info." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/edges", method = RequestMethod.POST)
@ResponseBody
@@ -485,7 +486,7 @@ public class EdgeController extends BaseController {
@ApiOperation(value = "Get Edge Types (getEdgeTypes)",
notes = "Returns a set of unique edge types based on edges that are either owned by the tenant or assigned to the customer which user is performing the request."
+ TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/edge/types", method = RequestMethod.GET)
@ResponseBody
@@ -501,7 +502,7 @@ public class EdgeController extends BaseController {
"All entities that are assigned to particular edge are going to be send to remote edge service." + TENANT_AUTHORITY_PARAGRAPH)
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/sync/{edgeId}", method = RequestMethod.POST)
- public DeferredResult syncEdge(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+ public DeferredResult syncEdge(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
@PathVariable("edgeId") String strEdgeId) throws ThingsboardException {
checkParameter("edgeId", strEdgeId);
final DeferredResult response = new DeferredResult<>();
@@ -531,7 +532,7 @@ public class EdgeController extends BaseController {
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/missingToRelatedRuleChains/{edgeId}", method = RequestMethod.GET)
@ResponseBody
- public String findMissingToRelatedRuleChains(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+ public String findMissingToRelatedRuleChains(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
@PathVariable("edgeId") String strEdgeId) throws ThingsboardException {
EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
edgeId = checkNotNull(edgeId);
@@ -542,7 +543,7 @@ public class EdgeController extends BaseController {
@ApiOperation(value = "Import the bulk of edges (processEdgesBulkImport)",
notes = "There's an ability to import the bulk of edges using the only .csv file." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@PostMapping("/edge/bulk_import")
public BulkImportResult processEdgesBulkImport(@RequestBody BulkImportRequest request) throws Exception {
@@ -557,14 +558,14 @@ public class EdgeController extends BaseController {
@ApiOperation(value = "Get Edge Install Instructions (getEdgeInstallInstructions)",
notes = "Get an install instructions for provided edge id." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/instructions/install/{edgeId}/{method}", method = RequestMethod.GET)
@ResponseBody
public EdgeInstructions getEdgeInstallInstructions(
- @ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
@PathVariable("edgeId") String strEdgeId,
- @ApiParam(value = "Installation method ('docker', 'ubuntu' or 'centos')", allowableValues = "docker, ubuntu, centos")
+ @Parameter(description = "Installation method ('docker', 'ubuntu' or 'centos')", schema = @Schema(allowableValues = {"docker", "ubuntu", "centos"}))
@PathVariable("method") String installationMethod,
HttpServletRequest request) throws ThingsboardException {
if (isEdgesEnabled() && edgeInstallServiceOpt.isPresent()) {
@@ -579,14 +580,14 @@ public class EdgeController extends BaseController {
@ApiOperation(value = "Get Edge Upgrade Instructions (getEdgeUpgradeInstructions)",
notes = "Get an upgrade instructions for provided edge version." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/instructions/upgrade/{edgeVersion}/{method}", method = RequestMethod.GET)
@ResponseBody
public EdgeInstructions getEdgeUpgradeInstructions(
- @ApiParam(value = "Edge version", required = true)
+ @Parameter(description = "Edge version", required = true)
@PathVariable("edgeVersion") String edgeVersion,
- @ApiParam(value = "Upgrade method ('docker', 'ubuntu' or 'centos')", allowableValues = "docker, ubuntu, centos")
+ @Parameter(description = "Upgrade method ('docker', 'ubuntu' or 'centos')", schema = @Schema(allowableValues = {"docker", "ubuntu", "centos"}))
@PathVariable("method") String method) throws Exception {
if (isEdgesEnabled() && edgeUpgradeServiceOpt.isPresent()) {
return checkNotNull(edgeUpgradeServiceOpt.get().getUpgradeInstructions(edgeVersion, method));
@@ -601,7 +602,7 @@ public class EdgeController extends BaseController {
@RequestMapping(value = "/edge/{edgeId}/upgrade/available", method = RequestMethod.GET)
@ResponseBody
public boolean isEdgeUpgradeAvailable(
- @ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
@PathVariable("edgeId") String strEdgeId) throws Exception {
if (isEdgesEnabled() && edgeUpgradeServiceOpt.isPresent()) {
EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
diff --git a/application/src/main/java/org/thingsboard/server/controller/EdgeEventController.java b/application/src/main/java/org/thingsboard/server/controller/EdgeEventController.java
index 39e27bf260..8828a714fc 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EdgeEventController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EdgeEventController.java
@@ -15,8 +15,10 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
@@ -33,16 +35,15 @@ import org.thingsboard.server.common.data.id.EdgeId;
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.config.annotations.ApiOperation;
import org.thingsboard.server.dao.edge.EdgeEventService;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.security.permission.Operation;
import static org.thingsboard.server.controller.ControllerConstants.EDGE_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.EDGE_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
@@ -59,26 +60,26 @@ public class EdgeEventController extends BaseController {
@ApiOperation(value = "Get Edge Events (getEdgeEvents)",
notes = "Returns a page of edge events for the requested edge. " +
- PAGE_DATA_PARAMETERS, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/{edgeId}/events", method = RequestMethod.GET)
@ResponseBody
public PageData getEdgeEvents(
- @ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(EDGE_ID) String strEdgeId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = "The case insensitive 'substring' filter based on the edge event type name.")
+ @Parameter(description = "The case insensitive 'substring' filter based on the edge event type name.")
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EDGE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = "Timestamp. Edge events with creation time before it won't be queried")
+ @Parameter(description = "Timestamp. Edge events with creation time before it won't be queried")
@RequestParam(required = false) Long startTime,
- @ApiParam(value = "Timestamp. Edge events with creation time after it won't be queried")
+ @Parameter(description = "Timestamp. Edge events with creation time after it won't be queried")
@RequestParam(required = false) Long endTime) throws ThingsboardException {
checkParameter(EDGE_ID, strEdgeId);
TenantId tenantId = getCurrentUser().getTenantId();
diff --git a/application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java b/application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java
index 1e8b14ea77..d3ca3e5ea0 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.controller;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -47,6 +47,7 @@ import org.thingsboard.server.common.data.sync.vc.VersionLoadResult;
import org.thingsboard.server.common.data.sync.vc.VersionedEntityInfo;
import org.thingsboard.server.common.data.sync.vc.request.create.VersionCreateRequest;
import org.thingsboard.server.common.data.sync.vc.request.load.VersionLoadRequest;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.security.model.SecurityUser;
import org.thingsboard.server.service.security.permission.Operation;
@@ -68,7 +69,6 @@ import static org.thingsboard.server.controller.ControllerConstants.NEW_LINE;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -192,7 +192,7 @@ public class EntitiesVersionControlController extends BaseController {
MARKDOWN_CODE_BLOCK_END +
TENANT_AUTHORITY_PARAGRAPH)
@GetMapping(value = "/version/{requestId}/status")
- public VersionCreationResult getVersionCreateRequestStatus(@ApiParam(value = VC_REQUEST_ID_PARAM_DESCRIPTION, required = true)
+ public VersionCreationResult getVersionCreateRequestStatus(@Parameter(description = VC_REQUEST_ID_PARAM_DESCRIPTION, required = true)
@PathVariable UUID requestId) throws Exception {
accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.WRITE);
return versionControlService.getVersionCreateStatus(getCurrentUser(), requestId);
@@ -235,21 +235,21 @@ public class EntitiesVersionControlController extends BaseController {
MARKDOWN_CODE_BLOCK_END +
TENANT_AUTHORITY_PARAGRAPH)
@GetMapping(value = "/version/{entityType}/{externalEntityUuid}", params = {"branch", "pageSize", "page"})
- public DeferredResult> listEntityVersions(@ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+ public DeferredResult> listEntityVersions(@Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
@PathVariable EntityType entityType,
- @ApiParam(value = "A string value representing external entity id. This is `externalId` property of an entity, or otherwise if not set - simply id of this entity.")
+ @Parameter(description = "A string value representing external entity id. This is `externalId` property of an entity, or otherwise if not set - simply id of this entity.")
@PathVariable UUID externalEntityUuid,
- @ApiParam(value = BRANCH_PARAM_DESCRIPTION)
+ @Parameter(description = BRANCH_PARAM_DESCRIPTION)
@RequestParam String branch,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = ENTITY_VERSION_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ENTITY_VERSION_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = "timestamp")
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = "timestamp"))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws Exception {
accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
EntityId externalEntityId = EntityIdFactory.getByTypeAndUuid(entityType, externalEntityUuid);
@@ -264,19 +264,19 @@ public class EntitiesVersionControlController extends BaseController {
"The response structure is the same as for `listEntityVersions` API method." +
TENANT_AUTHORITY_PARAGRAPH)
@GetMapping(value = "/version/{entityType}", params = {"branch", "pageSize", "page"})
- public DeferredResult> listEntityTypeVersions(@ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+ public DeferredResult> listEntityTypeVersions(@Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
@PathVariable EntityType entityType,
- @ApiParam(value = BRANCH_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = BRANCH_PARAM_DESCRIPTION, required = true)
@RequestParam String branch,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = ENTITY_VERSION_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ENTITY_VERSION_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = "timestamp")
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = "timestamp"))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws Exception {
accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -289,17 +289,17 @@ public class EntitiesVersionControlController extends BaseController {
"The response format is the same as for `listEntityVersions` API method." +
TENANT_AUTHORITY_PARAGRAPH)
@GetMapping(value = "/version", params = {"branch", "pageSize", "page"})
- public DeferredResult> listVersions(@ApiParam(value = BRANCH_PARAM_DESCRIPTION, required = true)
+ public DeferredResult> listVersions(@Parameter(description = BRANCH_PARAM_DESCRIPTION, required = true)
@RequestParam String branch,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = ENTITY_VERSION_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ENTITY_VERSION_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = "timestamp")
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = "timestamp"))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws Exception {
accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -313,9 +313,9 @@ public class EntitiesVersionControlController extends BaseController {
"Entities order will be the same as in the repository." +
TENANT_AUTHORITY_PARAGRAPH)
@GetMapping(value = "/entity/{entityType}/{versionId}")
- public DeferredResult> listEntitiesAtVersion(@ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+ public DeferredResult> listEntitiesAtVersion(@Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
@PathVariable EntityType entityType,
- @ApiParam(value = VERSION_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = VERSION_ID_PARAM_DESCRIPTION, required = true)
@PathVariable String versionId) throws Exception {
accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
return wrapFuture(versionControlService.listEntitiesAtVersion(getTenantId(), versionId, entityType));
@@ -327,7 +327,7 @@ public class EntitiesVersionControlController extends BaseController {
"Returned entities order will be the same as in the repository." +
TENANT_AUTHORITY_PARAGRAPH)
@GetMapping(value = "/entity/{versionId}")
- public DeferredResult> listAllEntitiesAtVersion(@ApiParam(value = VERSION_ID_PARAM_DESCRIPTION, required = true)
+ public DeferredResult> listAllEntitiesAtVersion(@Parameter(description = VERSION_ID_PARAM_DESCRIPTION, required = true)
@PathVariable String versionId) throws Exception {
accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
return wrapFuture(versionControlService.listAllEntitiesAtVersion(getTenantId(), versionId));
@@ -340,11 +340,11 @@ public class EntitiesVersionControlController extends BaseController {
"`hasCredentials` (whether stored device data has credentials)." +
TENANT_AUTHORITY_PARAGRAPH)
@GetMapping("/info/{versionId}/{entityType}/{externalEntityUuid}")
- public DeferredResult getEntityDataInfo(@ApiParam(value = VERSION_ID_PARAM_DESCRIPTION, required = true)
+ public DeferredResult getEntityDataInfo(@Parameter(description = VERSION_ID_PARAM_DESCRIPTION, required = true)
@PathVariable String versionId,
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
@PathVariable EntityType entityType,
- @ApiParam(value = "A string value representing external entity id", required = true)
+ @Parameter(description = "A string value representing external entity id", required = true)
@PathVariable UUID externalEntityUuid) throws Exception {
accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
EntityId entityId = EntityIdFactory.getByTypeAndUuid(entityType, externalEntityUuid);
@@ -356,11 +356,11 @@ public class EntitiesVersionControlController extends BaseController {
"Entity data structure is the same as stored in a repository. " +
TENANT_AUTHORITY_PARAGRAPH)
@GetMapping(value = "/diff/{entityType}/{internalEntityUuid}", params = {"versionId"})
- public DeferredResult compareEntityDataToVersion(@ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+ public DeferredResult compareEntityDataToVersion(@Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
@PathVariable EntityType entityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
@PathVariable UUID internalEntityUuid,
- @ApiParam(value = VERSION_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = VERSION_ID_PARAM_DESCRIPTION, required = true)
@RequestParam String versionId) throws Exception {
accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
EntityId entityId = EntityIdFactory.getByTypeAndUuid(entityType, internalEntityUuid);
@@ -469,7 +469,7 @@ public class EntitiesVersionControlController extends BaseController {
TENANT_AUTHORITY_PARAGRAPH
)
@GetMapping(value = "/entity/{requestId}/status")
- public VersionLoadResult getVersionLoadRequestStatus(@ApiParam(value = VC_REQUEST_ID_PARAM_DESCRIPTION, required = true)
+ public VersionLoadResult getVersionLoadRequestStatus(@Parameter(description = VC_REQUEST_ID_PARAM_DESCRIPTION, required = true)
@PathVariable UUID requestId) throws Exception {
accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.WRITE);
return versionControlService.getVersionLoadStatus(getCurrentUser(), requestId);
diff --git a/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java b/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java
index 4d11a388ff..e6e57e8b8c 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java
@@ -15,8 +15,8 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -39,12 +39,12 @@ import org.thingsboard.server.common.data.query.EntityCountQuery;
import org.thingsboard.server.common.data.query.EntityData;
import org.thingsboard.server.common.data.query.EntityDataPageLink;
import org.thingsboard.server.common.data.query.EntityDataQuery;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.query.EntityQueryService;
import org.thingsboard.server.service.security.permission.Operation;
import static org.thingsboard.server.controller.ControllerConstants.ALARM_DATA_QUERY_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.ATTRIBUTES_SCOPE_ALLOWED_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.ATTRIBUTES_SCOPE_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.ENTITY_COUNT_QUERY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.ENTITY_DATA_QUERY_DESCRIPTION;
@@ -64,7 +64,7 @@ public class EntityQueryController extends BaseController {
@RequestMapping(value = "/entitiesQuery/count", method = RequestMethod.POST)
@ResponseBody
public long countEntitiesByQuery(
- @ApiParam(value = "A JSON value representing the entity count query. See API call notes above for more details.")
+ @Parameter(description = "A JSON value representing the entity count query. See API call notes above for more details.")
@RequestBody EntityCountQuery query) throws ThingsboardException {
checkNotNull(query);
return this.entityQueryService.countEntitiesByQuery(getCurrentUser(), query);
@@ -75,7 +75,7 @@ public class EntityQueryController extends BaseController {
@RequestMapping(value = "/entitiesQuery/find", method = RequestMethod.POST)
@ResponseBody
public PageData findEntityDataByQuery(
- @ApiParam(value = "A JSON value representing the entity data query. See API call notes above for more details.")
+ @Parameter(description = "A JSON value representing the entity data query. See API call notes above for more details.")
@RequestBody EntityDataQuery query) throws ThingsboardException {
checkNotNull(query);
return this.entityQueryService.findEntityDataByQuery(getCurrentUser(), query);
@@ -86,7 +86,7 @@ public class EntityQueryController extends BaseController {
@RequestMapping(value = "/alarmsQuery/find", method = RequestMethod.POST)
@ResponseBody
public PageData findAlarmDataByQuery(
- @ApiParam(value = "A JSON value representing the alarm data query. See API call notes above for more details.")
+ @Parameter(description = "A JSON value representing the alarm data query. See API call notes above for more details.")
@RequestBody AlarmDataQuery query) throws ThingsboardException {
checkNotNull(query);
checkNotNull(query.getPageLink());
@@ -101,7 +101,7 @@ public class EntityQueryController extends BaseController {
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/alarmsQuery/count", method = RequestMethod.POST)
@ResponseBody
- public long countAlarmsByQuery(@ApiParam(value = "A JSON value representing the alarm count query.")
+ public long countAlarmsByQuery(@Parameter(description = "A JSON value representing the alarm count query.")
@RequestBody AlarmCountQuery query) throws ThingsboardException {
checkNotNull(query);
UserId assigneeId = query.getAssigneeId();
@@ -117,13 +117,13 @@ public class EntityQueryController extends BaseController {
@RequestMapping(value = "/entitiesQuery/find/keys", method = RequestMethod.POST)
@ResponseBody
public DeferredResult findEntityTimeseriesAndAttributesKeysByQuery(
- @ApiParam(value = "A JSON value representing the entity data query. See API call notes above for more details.")
+ @Parameter(description = "A JSON value representing the entity data query. See API call notes above for more details.")
@RequestBody EntityDataQuery query,
- @ApiParam(value = "Include all unique time-series keys to the result.")
+ @Parameter(description = "Include all unique time-series keys to the result.")
@RequestParam("timeseries") boolean isTimeseries,
- @ApiParam(value = "Include all unique attribute keys to the result.")
+ @Parameter(description = "Include all unique attribute keys to the result.")
@RequestParam("attributes") boolean isAttributes,
- @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, allowableValues = ATTRIBUTES_SCOPE_ALLOWED_VALUES)
+ @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}))
@RequestParam(value = "scope", required = false) String scope) throws ThingsboardException {
TenantId tenantId = getTenantId();
checkNotNull(query);
diff --git a/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java b/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
index bbd952ca7c..3932e483d5 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
@@ -15,8 +15,9 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
@@ -35,6 +36,7 @@ import org.thingsboard.server.common.data.relation.EntityRelation;
import org.thingsboard.server.common.data.relation.EntityRelationInfo;
import org.thingsboard.server.common.data.relation.EntityRelationsQuery;
import org.thingsboard.server.common.data.relation.RelationTypeGroup;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.entitiy.entity.relation.TbEntityRelationService;
import org.thingsboard.server.service.security.model.SecurityUser;
@@ -79,7 +81,7 @@ public class EntityRelationController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/relation", method = RequestMethod.POST)
@ResponseStatus(value = HttpStatus.OK)
- public void saveRelation(@ApiParam(value = "A JSON value representing the relation.", required = true)
+ public void saveRelation(@Parameter(description = "A JSON value representing the relation.", required = true)
@RequestBody EntityRelation relation) throws ThingsboardException {
checkNotNull(relation);
checkCanCreateRelation(relation.getFrom());
@@ -96,12 +98,12 @@ public class EntityRelationController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/relation", method = RequestMethod.DELETE, params = {FROM_ID, FROM_TYPE, RELATION_TYPE, TO_ID, TO_TYPE})
@ResponseStatus(value = HttpStatus.OK)
- public void deleteRelation(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
- @ApiParam(value = RELATION_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(RELATION_TYPE) String strRelationType,
- @ApiParam(value = RELATION_TYPE_GROUP_PARAM_DESCRIPTION) @RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType) throws ThingsboardException {
+ public void deleteRelation(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
+ @Parameter(description = RELATION_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(RELATION_TYPE) String strRelationType,
+ @Parameter(description = RELATION_TYPE_GROUP_PARAM_DESCRIPTION) @RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup,
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType) throws ThingsboardException {
checkParameter(FROM_ID, strFromId);
checkParameter(FROM_TYPE, strFromType);
checkParameter(RELATION_TYPE, strRelationType);
@@ -123,8 +125,8 @@ public class EntityRelationController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN','TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/relations", method = RequestMethod.DELETE, params = {"entityId", "entityType"})
@ResponseStatus(value = HttpStatus.OK)
- public void deleteRelations(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam("entityId") String strId,
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam("entityType") String strType) throws ThingsboardException {
+ public void deleteRelations(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam("entityId") String strId,
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam("entityType") String strType) throws ThingsboardException {
checkParameter("entityId", strId);
checkParameter("entityType", strType);
EntityId entityId = EntityIdFactory.getByTypeAndId(strType, strId);
@@ -134,16 +136,16 @@ public class EntityRelationController extends BaseController {
@ApiOperation(value = "Get Relation (getRelation)",
notes = "Returns relation object between two specified entities if present. Otherwise throws exception. " + SECURITY_CHECKS_ENTITIES_DESCRIPTION,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/relation", method = RequestMethod.GET, params = {FROM_ID, FROM_TYPE, RELATION_TYPE, TO_ID, TO_TYPE})
@ResponseBody
- public EntityRelation getRelation(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
- @ApiParam(value = RELATION_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(RELATION_TYPE) String strRelationType,
- @ApiParam(value = RELATION_TYPE_GROUP_PARAM_DESCRIPTION) @RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType) throws ThingsboardException {
+ public EntityRelation getRelation(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
+ @Parameter(description = RELATION_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(RELATION_TYPE) String strRelationType,
+ @Parameter(description = RELATION_TYPE_GROUP_PARAM_DESCRIPTION) @RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup,
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType) throws ThingsboardException {
checkParameter(FROM_ID, strFromId);
checkParameter(FROM_TYPE, strFromType);
checkParameter(RELATION_TYPE, strRelationType);
@@ -160,13 +162,13 @@ public class EntityRelationController extends BaseController {
@ApiOperation(value = "Get List of Relations (findByFrom)",
notes = "Returns list of relation objects for the specified entity by the 'from' direction. " +
SECURITY_CHECKS_ENTITY_DESCRIPTION,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/relations", method = RequestMethod.GET, params = {FROM_ID, FROM_TYPE})
@ResponseBody
- public List findByFrom(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
- @ApiParam(value = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
+ public List findByFrom(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
+ @Parameter(description = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
@RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup) throws ThingsboardException {
checkParameter(FROM_ID, strFromId);
checkParameter(FROM_TYPE, strFromType);
@@ -179,13 +181,13 @@ public class EntityRelationController extends BaseController {
@ApiOperation(value = "Get List of Relation Infos (findInfoByFrom)",
notes = "Returns list of relation info objects for the specified entity by the 'from' direction. " +
SECURITY_CHECKS_ENTITY_DESCRIPTION + " " + RELATION_INFO_DESCRIPTION,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/relations/info", method = RequestMethod.GET, params = {FROM_ID, FROM_TYPE})
@ResponseBody
- public List findInfoByFrom(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
- @ApiParam(value = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
+ public List findInfoByFrom(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
+ @Parameter(description = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
@RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup) throws ThingsboardException, ExecutionException, InterruptedException {
checkParameter(FROM_ID, strFromId);
checkParameter(FROM_TYPE, strFromType);
@@ -198,14 +200,14 @@ public class EntityRelationController extends BaseController {
@ApiOperation(value = "Get List of Relations (findByFrom)",
notes = "Returns list of relation objects for the specified entity by the 'from' direction and relation type. " +
SECURITY_CHECKS_ENTITY_DESCRIPTION,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/relations", method = RequestMethod.GET, params = {FROM_ID, FROM_TYPE, RELATION_TYPE})
@ResponseBody
- public List findByFrom(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
- @ApiParam(value = RELATION_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(RELATION_TYPE) String strRelationType,
- @ApiParam(value = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
+ public List findByFrom(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
+ @Parameter(description = RELATION_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(RELATION_TYPE) String strRelationType,
+ @Parameter(description = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
@RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup) throws ThingsboardException {
checkParameter(FROM_ID, strFromId);
checkParameter(FROM_TYPE, strFromType);
@@ -219,13 +221,13 @@ public class EntityRelationController extends BaseController {
@ApiOperation(value = "Get List of Relations (findByTo)",
notes = "Returns list of relation objects for the specified entity by the 'to' direction. " +
SECURITY_CHECKS_ENTITY_DESCRIPTION,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/relations", method = RequestMethod.GET, params = {TO_ID, TO_TYPE})
@ResponseBody
- public List findByTo(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType,
- @ApiParam(value = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
+ public List findByTo(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType,
+ @Parameter(description = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
@RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup) throws ThingsboardException {
checkParameter(TO_ID, strToId);
checkParameter(TO_TYPE, strToType);
@@ -238,13 +240,13 @@ public class EntityRelationController extends BaseController {
@ApiOperation(value = "Get List of Relation Infos (findInfoByTo)",
notes = "Returns list of relation info objects for the specified entity by the 'to' direction. " +
SECURITY_CHECKS_ENTITY_DESCRIPTION + " " + RELATION_INFO_DESCRIPTION,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/relations/info", method = RequestMethod.GET, params = {TO_ID, TO_TYPE})
@ResponseBody
- public List findInfoByTo(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType,
- @ApiParam(value = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
+ public List findInfoByTo(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType,
+ @Parameter(description = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
@RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup) throws ThingsboardException, ExecutionException, InterruptedException {
checkParameter(TO_ID, strToId);
checkParameter(TO_TYPE, strToType);
@@ -257,14 +259,14 @@ public class EntityRelationController extends BaseController {
@ApiOperation(value = "Get List of Relations (findByTo)",
notes = "Returns list of relation objects for the specified entity by the 'to' direction and relation type. " +
SECURITY_CHECKS_ENTITY_DESCRIPTION,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/relations", method = RequestMethod.GET, params = {TO_ID, TO_TYPE, RELATION_TYPE})
@ResponseBody
- public List findByTo(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType,
- @ApiParam(value = RELATION_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(RELATION_TYPE) String strRelationType,
- @ApiParam(value = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
+ public List findByTo(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType,
+ @Parameter(description = RELATION_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(RELATION_TYPE) String strRelationType,
+ @Parameter(description = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
@RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup) throws ThingsboardException {
checkParameter(TO_ID, strToId);
checkParameter(TO_TYPE, strToType);
@@ -278,11 +280,11 @@ public class EntityRelationController extends BaseController {
@ApiOperation(value = "Find related entities (findByQuery)",
notes = "Returns all entities that are related to the specific entity. " +
"The entity id, relation type, entity types, depth of the search, and other query parameters defined using complex 'EntityRelationsQuery' object. " +
- "See 'Model' tab of the Parameters for more info.", produces = MediaType.APPLICATION_JSON_VALUE)
+ "See 'Model' tab of the Parameters for more info.", responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/relations", method = RequestMethod.POST)
@ResponseBody
- public List findByQuery(@ApiParam(value = "A JSON value representing the entity relations query object.", required = true)
+ public List findByQuery(@Parameter(description = "A JSON value representing the entity relations query object.", required = true)
@RequestBody EntityRelationsQuery query) throws ThingsboardException, ExecutionException, InterruptedException {
checkNotNull(query);
checkNotNull(query.getParameters());
@@ -294,11 +296,11 @@ public class EntityRelationController extends BaseController {
@ApiOperation(value = "Find related entity infos (findInfoByQuery)",
notes = "Returns all entity infos that are related to the specific entity. " +
"The entity id, relation type, entity types, depth of the search, and other query parameters defined using complex 'EntityRelationsQuery' object. " +
- "See 'Model' tab of the Parameters for more info. " + RELATION_INFO_DESCRIPTION, produces = MediaType.APPLICATION_JSON_VALUE)
+ "See 'Model' tab of the Parameters for more info. " + RELATION_INFO_DESCRIPTION, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/relations/info", method = RequestMethod.POST)
@ResponseBody
- public List findInfoByQuery(@ApiParam(value = "A JSON value representing the entity relations query object.", required = true)
+ public List findInfoByQuery(@Parameter(description = "A JSON value representing the entity relations query object.", required = true)
@RequestBody EntityRelationsQuery query) throws ThingsboardException, ExecutionException, InterruptedException {
checkNotNull(query);
checkNotNull(query.getParameters());
diff --git a/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java b/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java
index 66a14502d5..59877bd4d2 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java
@@ -16,8 +16,10 @@
package org.thingsboard.server.controller;
import com.google.common.util.concurrent.ListenableFuture;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
@@ -45,6 +47,7 @@ import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.dao.exception.IncorrectParameterException;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.queue.util.TbCoreComponent;
@@ -66,15 +69,12 @@ import static org.thingsboard.server.controller.ControllerConstants.EDGE_UNASSIG
import static org.thingsboard.server.controller.ControllerConstants.ENTITY_VIEW_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.ENTITY_VIEW_ID_PARAM_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.ENTITY_VIEW_INFO_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.ENTITY_VIEW_INFO_SORT_PROPERTY_ALLOWABLE_VALUES;
-import static org.thingsboard.server.controller.ControllerConstants.ENTITY_VIEW_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.ENTITY_VIEW_TYPE;
import static org.thingsboard.server.controller.ControllerConstants.MODEL_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -98,12 +98,12 @@ public class EntityViewController extends BaseController {
@ApiOperation(value = "Get entity view (getEntityViewById)",
notes = "Fetch the EntityView object based on the provided entity view id. "
+ ENTITY_VIEW_DESCRIPTION + MODEL_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/entityView/{entityViewId}", method = RequestMethod.GET)
@ResponseBody
public EntityView getEntityViewById(
- @ApiParam(value = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
+ @Parameter(description = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
@PathVariable(ENTITY_VIEW_ID) String strEntityViewId) throws ThingsboardException {
checkParameter(ENTITY_VIEW_ID, strEntityViewId);
return checkEntityViewId(new EntityViewId(toUUID(strEntityViewId)), Operation.READ);
@@ -112,12 +112,12 @@ public class EntityViewController extends BaseController {
@ApiOperation(value = "Get Entity View info (getEntityViewInfoById)",
notes = "Fetch the Entity View info object based on the provided Entity View Id. "
+ ENTITY_VIEW_INFO_DESCRIPTION + MODEL_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/entityView/info/{entityViewId}", method = RequestMethod.GET)
@ResponseBody
public EntityViewInfo getEntityViewInfoById(
- @ApiParam(value = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
+ @Parameter(description = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
@PathVariable(ENTITY_VIEW_ID) String strEntityViewId) throws ThingsboardException {
checkParameter(ENTITY_VIEW_ID, strEntityViewId);
EntityViewId entityViewId = new EntityViewId(toUUID(strEntityViewId));
@@ -128,12 +128,12 @@ public class EntityViewController extends BaseController {
notes = ENTITY_VIEW_DESCRIPTION + MODEL_DESCRIPTION +
"Remove 'id', 'tenantId' and optionally 'customerId' from the request body example (below) to create new Entity View entity." +
TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/entityView", method = RequestMethod.POST)
@ResponseBody
public EntityView saveEntityView(
- @ApiParam(value = "A JSON object representing the entity view.")
+ @Parameter(description = "A JSON object representing the entity view.")
@RequestBody EntityView entityView) throws Exception {
entityView.setTenantId(getCurrentUser().getTenantId());
EntityView existingEntityView = null;
@@ -153,7 +153,7 @@ public class EntityViewController extends BaseController {
@RequestMapping(value = "/entityView/{entityViewId}", method = RequestMethod.DELETE)
@ResponseStatus(value = HttpStatus.OK)
public void deleteEntityView(
- @ApiParam(value = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
+ @Parameter(description = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
@PathVariable(ENTITY_VIEW_ID) String strEntityViewId) throws ThingsboardException {
checkParameter(ENTITY_VIEW_ID, strEntityViewId);
EntityViewId entityViewId = new EntityViewId(toUUID(strEntityViewId));
@@ -163,12 +163,12 @@ public class EntityViewController extends BaseController {
@ApiOperation(value = "Get Entity View by name (getTenantEntityView)",
notes = "Fetch the Entity View object based on the tenant id and entity view name. " + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/tenant/entityViews", params = {"entityViewName"}, method = RequestMethod.GET)
@ResponseBody
public EntityView getTenantEntityView(
- @ApiParam(value = "Entity View name")
+ @Parameter(description = "Entity View name")
@RequestParam String entityViewName) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
return checkNotNull(entityViewService.findEntityViewByTenantIdAndName(tenantId, entityViewName));
@@ -180,9 +180,9 @@ public class EntityViewController extends BaseController {
@RequestMapping(value = "/customer/{customerId}/entityView/{entityViewId}", method = RequestMethod.POST)
@ResponseBody
public EntityView assignEntityViewToCustomer(
- @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+ @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
@PathVariable(CUSTOMER_ID) String strCustomerId,
- @ApiParam(value = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
+ @Parameter(description = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
@PathVariable(ENTITY_VIEW_ID) String strEntityViewId) throws ThingsboardException {
checkParameter(CUSTOMER_ID, strCustomerId);
checkParameter(ENTITY_VIEW_ID, strEntityViewId);
@@ -202,7 +202,7 @@ public class EntityViewController extends BaseController {
@RequestMapping(value = "/customer/entityView/{entityViewId}", method = RequestMethod.DELETE)
@ResponseBody
public EntityView unassignEntityViewFromCustomer(
- @ApiParam(value = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
+ @Parameter(description = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
@PathVariable(ENTITY_VIEW_ID) String strEntityViewId) throws ThingsboardException {
checkParameter(ENTITY_VIEW_ID, strEntityViewId);
EntityViewId entityViewId = new EntityViewId(toUUID(strEntityViewId));
@@ -223,19 +223,19 @@ public class EntityViewController extends BaseController {
@RequestMapping(value = "/customer/{customerId}/entityViews", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getCustomerEntityViews(
- @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(CUSTOMER_ID) String strCustomerId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = ENTITY_VIEW_TYPE)
+ @Parameter(description = ENTITY_VIEW_TYPE)
@RequestParam(required = false) String type,
- @ApiParam(value = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ENTITY_VIEW_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name, type"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
checkParameter(CUSTOMER_ID, strCustomerId);
TenantId tenantId = getCurrentUser().getTenantId();
@@ -256,19 +256,19 @@ public class EntityViewController extends BaseController {
@RequestMapping(value = "/customer/{customerId}/entityViewInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getCustomerEntityViewInfos(
- @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(CUSTOMER_ID) String strCustomerId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = ENTITY_VIEW_TYPE)
+ @Parameter(description = ENTITY_VIEW_TYPE)
@RequestParam(required = false) String type,
- @ApiParam(value = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ENTITY_VIEW_INFO_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
checkParameter("customerId", strCustomerId);
TenantId tenantId = getCurrentUser().getTenantId();
@@ -289,17 +289,17 @@ public class EntityViewController extends BaseController {
@RequestMapping(value = "/tenant/entityViews", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getTenantEntityViews(
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = ENTITY_VIEW_TYPE)
+ @Parameter(description = ENTITY_VIEW_TYPE)
@RequestParam(required = false) String type,
- @ApiParam(value = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ENTITY_VIEW_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name, type"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -318,17 +318,17 @@ public class EntityViewController extends BaseController {
@RequestMapping(value = "/tenant/entityViewInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getTenantEntityViewInfos(
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = ENTITY_VIEW_TYPE)
+ @Parameter(description = ENTITY_VIEW_TYPE)
@RequestParam(required = false) String type,
- @ApiParam(value = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ENTITY_VIEW_INFO_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "customerTitle"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -347,7 +347,7 @@ public class EntityViewController extends BaseController {
@RequestMapping(value = "/entityViews", method = RequestMethod.POST)
@ResponseBody
public List findByQuery(
- @ApiParam(value = "The entity view search query JSON")
+ @Parameter(description = "The entity view search query JSON")
@RequestBody EntityViewSearchQuery query) throws ThingsboardException, ExecutionException, InterruptedException {
checkNotNull(query);
checkNotNull(query.getParameters());
@@ -386,7 +386,7 @@ public class EntityViewController extends BaseController {
@RequestMapping(value = "/customer/public/entityView/{entityViewId}", method = RequestMethod.POST)
@ResponseBody
public EntityView assignEntityViewToPublicCustomer(
- @ApiParam(value = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
+ @Parameter(description = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
@PathVariable(ENTITY_VIEW_ID) String strEntityViewId) throws ThingsboardException {
checkParameter(ENTITY_VIEW_ID, strEntityViewId);
EntityViewId entityViewId = new EntityViewId(toUUID(strEntityViewId));
@@ -400,7 +400,7 @@ public class EntityViewController extends BaseController {
"Second, remote edge service will receive a copy of assignment entity view " +
EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION +
"Third, once entity view will be delivered to edge service, it's going to be available for usage on remote edge instance.",
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/{edgeId}/entityView/{entityViewId}", method = RequestMethod.POST)
@ResponseBody
@@ -425,7 +425,7 @@ public class EntityViewController extends BaseController {
"Second, remote edge service will receive an 'unassign' command to remove entity view " +
EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION +
"Third, once 'unassign' command will be delivered to edge service, it's going to remove entity view locally.",
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/{edgeId}/entityView/{entityViewId}", method = RequestMethod.DELETE)
@ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/EventController.java b/application/src/main/java/org/thingsboard/server/controller/EventController.java
index fd203361cf..b1e2405ae6 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EventController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EventController.java
@@ -15,8 +15,10 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
@@ -39,6 +41,7 @@ import org.thingsboard.server.common.data.id.EntityIdFactory;
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.config.annotations.ApiOperation;
import org.thingsboard.server.dao.event.EventService;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.security.permission.Operation;
@@ -52,7 +55,6 @@ import static org.thingsboard.server.controller.ControllerConstants.EVENT_DEBUG_
import static org.thingsboard.server.controller.ControllerConstants.EVENT_END_TIME_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.EVENT_ERROR_FILTER_OBJ;
import static org.thingsboard.server.controller.ControllerConstants.EVENT_LC_EVENT_FILTER_OBJ;
-import static org.thingsboard.server.controller.ControllerConstants.EVENT_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.EVENT_START_TIME_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.EVENT_STATS_FILTER_OBJ;
import static org.thingsboard.server.controller.ControllerConstants.EVENT_TEXT_SEARCH_DESCRIPTION;
@@ -60,7 +62,6 @@ import static org.thingsboard.server.controller.ControllerConstants.NEW_LINE;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_ID;
@@ -107,32 +108,32 @@ public class EventController extends BaseController {
@ApiOperation(value = "Get Events by type (getEvents)",
notes = "Returns a page of events for specified entity by specifying event type. " +
- PAGE_DATA_PARAMETERS, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/events/{entityType}/{entityId}/{eventType}", method = RequestMethod.GET)
@ResponseBody
public PageData getEvents(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
@PathVariable(ENTITY_TYPE) String strEntityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(ENTITY_ID) String strEntityId,
- @ApiParam(value = "A string value representing event type", example = "STATS", required = true)
+ @Parameter(description = "A string value representing event type", example = "STATS", required = true)
@PathVariable("eventType") String eventType,
- @ApiParam(value = TENANT_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = TENANT_ID_PARAM_DESCRIPTION, required = true)
@RequestParam(TENANT_ID) String strTenantId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = EVENT_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = EVENT_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EVENT_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"ts", "id"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = EVENT_START_TIME_DESCRIPTION)
+ @Parameter(description = EVENT_START_TIME_DESCRIPTION)
@RequestParam(required = false) Long startTime,
- @ApiParam(value = EVENT_END_TIME_DESCRIPTION)
+ @Parameter(description = EVENT_END_TIME_DESCRIPTION)
@RequestParam(required = false) Long endTime) throws ThingsboardException {
checkParameter("EntityId", strEntityId);
checkParameter("EntityType", strEntityType);
@@ -149,30 +150,30 @@ public class EventController extends BaseController {
"The call was deprecated to improve the performance of the system. " +
"Current implementation will return 'Lifecycle' events only. " +
"Use 'Get events by type' or 'Get events by filter' instead. " +
- PAGE_DATA_PARAMETERS, produces = MediaType.APPLICATION_JSON_VALUE)
+ PAGE_DATA_PARAMETERS, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/events/{entityType}/{entityId}", method = RequestMethod.GET)
@ResponseBody
public PageData getEvents(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
@PathVariable(ENTITY_TYPE) String strEntityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(ENTITY_ID) String strEntityId,
- @ApiParam(value = TENANT_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = TENANT_ID_PARAM_DESCRIPTION, required = true)
@RequestParam("tenantId") String strTenantId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = EVENT_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = EVENT_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EVENT_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"ts", "id"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = EVENT_START_TIME_DESCRIPTION)
+ @Parameter(description = EVENT_START_TIME_DESCRIPTION)
@RequestParam(required = false) Long startTime,
- @ApiParam(value = EVENT_END_TIME_DESCRIPTION)
+ @Parameter(description = EVENT_END_TIME_DESCRIPTION)
@RequestParam(required = false) Long endTime) throws ThingsboardException {
checkParameter("EntityId", strEntityId);
checkParameter("EntityType", strEntityType);
@@ -190,32 +191,32 @@ public class EventController extends BaseController {
notes = "Returns a page of events for the chosen entity by specifying the event filter. " +
PAGE_DATA_PARAMETERS + NEW_LINE +
EVENT_FILTER_DEFINITION,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/events/{entityType}/{entityId}", method = RequestMethod.POST)
@ResponseBody
public PageData getEvents(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
@PathVariable(ENTITY_TYPE) String strEntityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(ENTITY_ID) String strEntityId,
- @ApiParam(value = TENANT_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = TENANT_ID_PARAM_DESCRIPTION, required = true)
@RequestParam(TENANT_ID) String strTenantId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = "A JSON value representing the event filter.", required = true)
+ @Parameter(description = "A JSON value representing the event filter.", required = true)
@RequestBody EventFilter eventFilter,
- @ApiParam(value = EVENT_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = EVENT_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EVENT_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"ts", "id"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = EVENT_START_TIME_DESCRIPTION)
+ @Parameter(description = EVENT_START_TIME_DESCRIPTION)
@RequestParam(required = false) Long startTime,
- @ApiParam(value = EVENT_END_TIME_DESCRIPTION)
+ @Parameter(description = EVENT_END_TIME_DESCRIPTION)
@RequestParam(required = false) Long endTime) throws ThingsboardException {
checkParameter("EntityId", strEntityId);
checkParameter("EntityType", strEntityType);
@@ -232,15 +233,15 @@ public class EventController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/events/{entityType}/{entityId}/clear", method = RequestMethod.POST)
@ResponseStatus(HttpStatus.OK)
- public void clearEvents(@ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+ public void clearEvents(@Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
@PathVariable(ENTITY_TYPE) String strEntityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(ENTITY_ID) String strEntityId,
- @ApiParam(value = EVENT_START_TIME_DESCRIPTION)
+ @Parameter(description = EVENT_START_TIME_DESCRIPTION)
@RequestParam(required = false) Long startTime,
- @ApiParam(value = EVENT_END_TIME_DESCRIPTION)
+ @Parameter(description = EVENT_END_TIME_DESCRIPTION)
@RequestParam(required = false) Long endTime,
- @ApiParam(value = EVENT_FILTER_DEFINITION)
+ @Parameter(description = EVENT_FILTER_DEFINITION)
@RequestBody EventFilter eventFilter) throws ThingsboardException {
checkParameter("EntityId", strEntityId);
checkParameter("EntityType", strEntityType);
diff --git a/application/src/main/java/org/thingsboard/server/controller/ImageController.java b/application/src/main/java/org/thingsboard/server/controller/ImageController.java
index 516a8941a8..c8d24d6081 100644
--- a/application/src/main/java/org/thingsboard/server/controller/ImageController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/ImageController.java
@@ -15,7 +15,8 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -26,7 +27,6 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.Base64Utils;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -59,14 +59,13 @@ import org.thingsboard.server.service.security.model.SecurityUser;
import org.thingsboard.server.service.security.permission.Operation;
import org.thingsboard.server.service.security.permission.Resource;
+import java.util.Base64;
import java.util.concurrent.TimeUnit;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_INCLUDE_SYSTEM_IMAGES_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_TEXT_SEARCH_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
@@ -120,9 +119,9 @@ public class ImageController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@PutMapping(IMAGE_URL)
- public TbResourceInfo updateImage(@ApiParam(value = IMAGE_TYPE_PARAM_DESCRIPTION, allowableValues = IMAGE_TYPE_PARAM_ALLOWABLE_VALUES, required = true)
+ public TbResourceInfo updateImage(@Parameter(description = IMAGE_TYPE_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"tenant", "system"}), required = true)
@PathVariable String type,
- @ApiParam(value = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
@PathVariable String key,
@RequestPart MultipartFile file) throws Exception {
TbResourceInfo imageInfo = checkImageInfo(type, key, Operation.WRITE);
@@ -140,9 +139,9 @@ public class ImageController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@PutMapping(IMAGE_URL + "/info")
- public TbResourceInfo updateImageInfo(@ApiParam(value = IMAGE_TYPE_PARAM_DESCRIPTION, allowableValues = IMAGE_TYPE_PARAM_ALLOWABLE_VALUES, required = true)
+ public TbResourceInfo updateImageInfo(@Parameter(description = IMAGE_TYPE_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"tenant", "system"}), required = true)
@PathVariable String type,
- @ApiParam(value = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
@PathVariable String key,
@RequestBody TbResourceInfo request) throws ThingsboardException {
TbResourceInfo imageInfo = checkImageInfo(type, key, Operation.WRITE);
@@ -153,9 +152,9 @@ public class ImageController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@PutMapping(IMAGE_URL + "/public/{isPublic}")
- public TbResourceInfo updateImagePublicStatus(@ApiParam(value = IMAGE_TYPE_PARAM_DESCRIPTION, allowableValues = IMAGE_TYPE_PARAM_ALLOWABLE_VALUES, required = true)
+ public TbResourceInfo updateImagePublicStatus(@Parameter(description = IMAGE_TYPE_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"tenant", "system"}), required = true)
@PathVariable String type,
- @ApiParam(value = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
@PathVariable String key,
@PathVariable boolean isPublic) throws ThingsboardException {
TbResourceInfo imageInfo = checkImageInfo(type, key, Operation.WRITE);
@@ -166,9 +165,9 @@ public class ImageController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@GetMapping(value = IMAGE_URL, produces = "image/*")
- public ResponseEntity downloadImage(@ApiParam(value = IMAGE_TYPE_PARAM_DESCRIPTION, allowableValues = IMAGE_TYPE_PARAM_ALLOWABLE_VALUES, required = true)
+ public ResponseEntity downloadImage(@Parameter(description = IMAGE_TYPE_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"tenant", "system"}), required = true)
@PathVariable String type,
- @ApiParam(value = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
@PathVariable String key,
@RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws Exception {
return downloadIfChanged(type, key, etag, false);
@@ -183,9 +182,9 @@ public class ImageController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@GetMapping(value = IMAGE_URL + "/export")
- public ImageExportData exportImage(@ApiParam(value = IMAGE_TYPE_PARAM_DESCRIPTION, allowableValues = IMAGE_TYPE_PARAM_ALLOWABLE_VALUES, required = true)
+ public ImageExportData exportImage(@Parameter(description = IMAGE_TYPE_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"tenant", "system"}), required = true)
@PathVariable String type,
- @ApiParam(value = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
@PathVariable String key) throws Exception {
TbResourceInfo imageInfo = checkImageInfo(type, key, Operation.READ);
ImageDescriptor descriptor = imageInfo.getDescriptor(ImageDescriptor.class);
@@ -197,7 +196,7 @@ public class ImageController extends BaseController {
.resourceKey(imageInfo.getResourceKey())
.isPublic(imageInfo.isPublic())
.publicResourceKey(imageInfo.getPublicResourceKey())
- .data(Base64Utils.encodeToString(data))
+ .data(Base64.getEncoder().encodeToString(data))
.build();
}
@@ -222,15 +221,15 @@ public class ImageController extends BaseController {
ImageDescriptor descriptor = new ImageDescriptor();
descriptor.setMediaType(imageData.getMediaType());
image.setDescriptorValue(descriptor);
- image.setData(Base64Utils.decodeFromString(imageData.getData()));
+ image.setData(Base64.getDecoder().decode(imageData.getData()));
return tbImageService.save(image, user);
}
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@GetMapping(value = IMAGE_URL + "/preview", produces = "image/png")
- public ResponseEntity downloadImagePreview(@ApiParam(value = IMAGE_TYPE_PARAM_DESCRIPTION, allowableValues = IMAGE_TYPE_PARAM_ALLOWABLE_VALUES, required = true)
+ public ResponseEntity downloadImagePreview(@Parameter(description = IMAGE_TYPE_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"tenant", "system"}), required = true)
@PathVariable String type,
- @ApiParam(value = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
@PathVariable String key,
@RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws Exception {
return downloadIfChanged(type, key, etag, true);
@@ -238,26 +237,26 @@ public class ImageController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@GetMapping(IMAGE_URL + "/info")
- public TbResourceInfo getImageInfo(@ApiParam(value = IMAGE_TYPE_PARAM_DESCRIPTION, allowableValues = IMAGE_TYPE_PARAM_ALLOWABLE_VALUES, required = true)
+ public TbResourceInfo getImageInfo(@Parameter(description = IMAGE_TYPE_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"tenant", "system"}), required = true)
@PathVariable String type,
- @ApiParam(value = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
@PathVariable String key) throws ThingsboardException {
return checkImageInfo(type, key, Operation.READ);
}
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@GetMapping("/api/images")
- public PageData getImages(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ public PageData getImages(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = RESOURCE_INCLUDE_SYSTEM_IMAGES_DESCRIPTION)
+ @Parameter(description = RESOURCE_INCLUDE_SYSTEM_IMAGES_DESCRIPTION)
@RequestParam(required = false) boolean includeSystemImages,
- @ApiParam(value = RESOURCE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = RESOURCE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = RESOURCE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title", "resourceType", "tenantId"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
// PE: generic permission
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -271,9 +270,9 @@ public class ImageController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@DeleteMapping(IMAGE_URL)
- public ResponseEntity deleteImage(@ApiParam(value = IMAGE_TYPE_PARAM_DESCRIPTION, allowableValues = IMAGE_TYPE_PARAM_ALLOWABLE_VALUES, required = true)
+ public ResponseEntity deleteImage(@Parameter(description = IMAGE_TYPE_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"tenant", "system"}), required = true)
@PathVariable String type,
- @ApiParam(value = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
@PathVariable String key,
@RequestParam(name = "force", required = false) boolean force) throws ThingsboardException {
TbResourceInfo imageInfo = checkImageInfo(type, key, Operation.DELETE);
diff --git a/application/src/main/java/org/thingsboard/server/controller/Lwm2mController.java b/application/src/main/java/org/thingsboard/server/controller/Lwm2mController.java
index fdfa55f5e7..f6670193d9 100644
--- a/application/src/main/java/org/thingsboard/server/controller/Lwm2mController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/Lwm2mController.java
@@ -15,11 +15,13 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -33,6 +35,7 @@ import org.thingsboard.server.common.data.SaveDeviceWithCredentialsRequest;
import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.LwM2MServerSecurityConfigDefault;
import org.thingsboard.server.common.data.exception.ThingsboardException;
import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.service.lwm2m.LwM2MService;
import java.util.Map;
@@ -57,12 +60,12 @@ public class Lwm2mController extends BaseController {
@ApiOperation(value = "Get Lwm2m Bootstrap SecurityInfo (getLwm2mBootstrapSecurityInfo)",
notes = "Get the Lwm2m Bootstrap SecurityInfo object (of the current server) based on the provided isBootstrapServer parameter. If isBootstrapServer == true, get the parameters of the current Bootstrap Server. If isBootstrapServer == false, get the parameters of the current Lwm2m Server. Used for client settings when starting the client in Bootstrap mode. " +
TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/lwm2m/deviceProfile/bootstrap/{isBootstrapServer}", method = RequestMethod.GET)
@ResponseBody
public LwM2MServerSecurityConfigDefault getLwm2mBootstrapSecurityInfo(
- @ApiParam(value = IS_BOOTSTRAP_SERVER_PARAM_DESCRIPTION)
+ @Parameter(description = IS_BOOTSTRAP_SERVER_PARAM_DESCRIPTION)
@PathVariable(IS_BOOTSTRAP_SERVER) boolean bootstrapServer) throws ThingsboardException {
return lwM2MService.getServerSecurityInfo(bootstrapServer);
}
diff --git a/application/src/main/java/org/thingsboard/server/controller/MailConfigTemplateController.java b/application/src/main/java/org/thingsboard/server/controller/MailConfigTemplateController.java
index c1db70ebed..e17d8e55bc 100644
--- a/application/src/main/java/org/thingsboard/server/controller/MailConfigTemplateController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/MailConfigTemplateController.java
@@ -16,7 +16,6 @@
package org.thingsboard.server.controller;
import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.mail.TbMailConfigTemplateService;
import org.thingsboard.server.service.security.permission.Operation;
diff --git a/application/src/main/java/org/thingsboard/server/controller/NotificationController.java b/application/src/main/java/org/thingsboard/server/controller/NotificationController.java
index d2b095c7fa..55f4e6d9fa 100644
--- a/application/src/main/java/org/thingsboard/server/controller/NotificationController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/NotificationController.java
@@ -15,8 +15,8 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -57,6 +57,7 @@ import org.thingsboard.server.common.data.notification.template.NotificationTemp
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.page.SortOrder;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.dao.notification.NotificationRequestService;
import org.thingsboard.server.dao.notification.NotificationService;
import org.thingsboard.server.dao.notification.NotificationSettingsService;
@@ -68,7 +69,6 @@ import org.thingsboard.server.service.security.model.SecurityUser;
import org.thingsboard.server.service.security.permission.Operation;
import org.thingsboard.server.service.security.permission.Resource;
-import javax.validation.Valid;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -160,17 +160,17 @@ public class NotificationController extends BaseController {
"}\n```")
@GetMapping("/notifications")
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
- public PageData getNotifications(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ public PageData getNotifications(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = "Case-insensitive 'substring' filter based on notification subject or text")
+ @Parameter(description = "Case-insensitive 'substring' filter based on notification subject or text")
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION)
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION)
+ @Parameter(description = SORT_ORDER_DESCRIPTION)
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = "To search for unread notifications only")
+ @Parameter(description = "To search for unread notifications only")
@RequestParam(defaultValue = "false") boolean unreadOnly,
@AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
// no permissions
@@ -268,7 +268,7 @@ public class NotificationController extends BaseController {
@PostMapping("/notification/request/preview")
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
public NotificationRequestPreview getNotificationRequestPreview(@RequestBody @Valid NotificationRequest request,
- @ApiParam(value = "Amount of the recipients to show in preview")
+ @Parameter(description = "Amount of the recipients to show in preview")
@RequestParam(defaultValue = "20") int recipientsPreviewSize,
@AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
// PE: generic permission
@@ -376,15 +376,15 @@ public class NotificationController extends BaseController {
SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
@GetMapping("/notification/requests")
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
- public PageData getNotificationRequests(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ public PageData getNotificationRequests(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = "Case-insensitive 'substring' filed based on the used template name")
+ @Parameter(description = "Case-insensitive 'substring' filed based on the used template name")
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION)
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION)
+ @Parameter(description = SORT_ORDER_DESCRIPTION)
@RequestParam(required = false) String sortOrder,
@AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
// PE: generic permission
diff --git a/application/src/main/java/org/thingsboard/server/controller/NotificationRuleController.java b/application/src/main/java/org/thingsboard/server/controller/NotificationRuleController.java
index 159a5d00f2..f3a7309212 100644
--- a/application/src/main/java/org/thingsboard/server/controller/NotificationRuleController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/NotificationRuleController.java
@@ -15,8 +15,8 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,13 +37,12 @@ import org.thingsboard.server.common.data.notification.rule.NotificationRuleInfo
import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType;
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
-import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.dao.notification.NotificationRuleService;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.security.model.SecurityUser;
import org.thingsboard.server.service.security.permission.Operation;
-import javax.validation.Valid;
import java.util.UUID;
import static org.thingsboard.server.controller.ControllerConstants.MARKDOWN_CODE_BLOCK_END;
@@ -125,11 +124,7 @@ public class NotificationRuleController extends BaseController {
throw new IllegalArgumentException("Trigger type " + triggerType + " is not available");
}
- boolean created = notificationRule.getId() == null;
- notificationRule = doSaveAndLog(EntityType.NOTIFICATION_RULE, notificationRule, notificationRuleService::saveNotificationRule);
- tbClusterService.broadcastEntityStateChangeEvent(user.getTenantId(), notificationRule.getId(), created ?
- ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
- return notificationRule;
+ return doSaveAndLog(EntityType.NOTIFICATION_RULE, notificationRule, notificationRuleService::saveNotificationRule);
}
@ApiOperation(value = "Get notification rule by id (getNotificationRuleById)",
@@ -150,15 +145,15 @@ public class NotificationRuleController extends BaseController {
SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
@GetMapping("/rules")
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
- public PageData getNotificationRules(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ public PageData getNotificationRules(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = "Case-insensitive 'substring' filter based on rule's name")
+ @Parameter(description = "Case-insensitive 'substring' filter based on rule's name")
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION)
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION)
+ @Parameter(description = SORT_ORDER_DESCRIPTION)
@RequestParam(required = false) String sortOrder,
@AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
// PE: generic permission
@@ -177,7 +172,6 @@ public class NotificationRuleController extends BaseController {
NotificationRuleId notificationRuleId = new NotificationRuleId(id);
NotificationRule notificationRule = checkEntityId(notificationRuleId, notificationRuleService::findNotificationRuleById, Operation.DELETE);
doDeleteAndLog(EntityType.NOTIFICATION_RULE, notificationRule, notificationRuleService::deleteNotificationRuleById);
- tbClusterService.broadcastEntityStateChangeEvent(user.getTenantId(), notificationRuleId, ComponentLifecycleEvent.DELETED);
}
}
diff --git a/application/src/main/java/org/thingsboard/server/controller/NotificationTargetController.java b/application/src/main/java/org/thingsboard/server/controller/NotificationTargetController.java
index 5464f4b8a2..8f0a2fb3cd 100644
--- a/application/src/main/java/org/thingsboard/server/controller/NotificationTargetController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/NotificationTargetController.java
@@ -15,8 +15,8 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
@@ -48,12 +48,12 @@ import org.thingsboard.server.common.data.notification.targets.platform.UserList
import org.thingsboard.server.common.data.notification.targets.platform.UsersFilter;
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.dao.notification.NotificationTargetService;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.security.model.SecurityUser;
import org.thingsboard.server.service.security.permission.Operation;
-import javax.validation.Valid;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
@@ -134,9 +134,9 @@ public class NotificationTargetController extends BaseController {
@PostMapping("/target/recipients")
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
public PageData getRecipientsForNotificationTargetConfig(@RequestBody NotificationTarget notificationTarget,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
@AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
// PE: generic permission
@@ -156,7 +156,7 @@ public class NotificationTargetController extends BaseController {
SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
@GetMapping(value = "/targets", params = {"ids"})
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
- public List getNotificationTargetsByIds(@ApiParam(value = "Comma-separated list of uuids representing targets ids", required = true)
+ public List getNotificationTargetsByIds(@Parameter(description = "Comma-separated list of uuids representing targets ids", required = true)
@RequestParam("ids") UUID[] ids,
@AuthenticationPrincipal SecurityUser user) {
// PE: generic permission
@@ -170,15 +170,15 @@ public class NotificationTargetController extends BaseController {
SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
@GetMapping("/targets")
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
- public PageData getNotificationTargets(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ public PageData getNotificationTargets(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = "Case-insensitive 'substring' filed based on the target's name")
+ @Parameter(description = "Case-insensitive 'substring' filed based on the target's name")
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION)
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION)
+ @Parameter(description = SORT_ORDER_DESCRIPTION)
@RequestParam(required = false) String sortOrder,
@AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
// PE: generic permission
diff --git a/application/src/main/java/org/thingsboard/server/controller/NotificationTemplateController.java b/application/src/main/java/org/thingsboard/server/controller/NotificationTemplateController.java
index 574a72e96f..6948218531 100644
--- a/application/src/main/java/org/thingsboard/server/controller/NotificationTemplateController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/NotificationTemplateController.java
@@ -15,8 +15,8 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -42,13 +42,13 @@ import org.thingsboard.server.common.data.notification.targets.slack.SlackConver
import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.dao.notification.NotificationSettingsService;
import org.thingsboard.server.dao.notification.NotificationTemplateService;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.security.model.SecurityUser;
import org.thingsboard.server.service.security.permission.Operation;
-import javax.validation.Valid;
import java.util.List;
import java.util.UUID;
@@ -137,17 +137,17 @@ public class NotificationTemplateController extends BaseController {
SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
@GetMapping("/templates")
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
- public PageData getNotificationTemplates(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ public PageData getNotificationTemplates(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = "Case-insensitive 'substring' filter based on template's name and notification type")
+ @Parameter(description = "Case-insensitive 'substring' filter based on template's name and notification type")
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION)
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION)
+ @Parameter(description = SORT_ORDER_DESCRIPTION)
@RequestParam(required = false) String sortOrder,
- @ApiParam(value = "Comma-separated list of notification types to filter the templates")
+ @Parameter(description = "Comma-separated list of notification types to filter the templates")
@RequestParam(required = false) NotificationType[] notificationTypes,
@AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
// PE: generic permission
@@ -177,7 +177,7 @@ public class NotificationTemplateController extends BaseController {
@GetMapping("/slack/conversations")
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
public List listSlackConversations(@RequestParam SlackConversationType type,
- @ApiParam(value = "Slack bot token. If absent - system Slack settings will be used")
+ @Parameter(description = "Slack bot token. If absent - system Slack settings will be used")
@RequestParam(required = false) String token,
@AuthenticationPrincipal SecurityUser user) {
// PE: generic permission
diff --git a/application/src/main/java/org/thingsboard/server/controller/OAuth2ConfigTemplateController.java b/application/src/main/java/org/thingsboard/server/controller/OAuth2ConfigTemplateController.java
index d9879b73a2..8924578900 100644
--- a/application/src/main/java/org/thingsboard/server/controller/OAuth2ConfigTemplateController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/OAuth2ConfigTemplateController.java
@@ -15,8 +15,7 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -30,6 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
import org.thingsboard.server.common.data.exception.ThingsboardException;
import org.thingsboard.server.common.data.id.OAuth2ClientRegistrationTemplateId;
import org.thingsboard.server.common.data.oauth2.OAuth2ClientRegistrationTemplate;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.security.permission.Operation;
import org.thingsboard.server.service.security.permission.Resource;
@@ -63,7 +63,7 @@ public class OAuth2ConfigTemplateController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN')")
@RequestMapping(value = "/{clientRegistrationTemplateId}", method = RequestMethod.DELETE)
@ResponseStatus(value = HttpStatus.OK)
- public void deleteClientRegistrationTemplate(@ApiParam(value = "String representation of client registration template id to delete", example = "139b1f81-2f5d-11ec-9dbe-9b627e1a88f4")
+ public void deleteClientRegistrationTemplate(@Parameter(description = "String representation of client registration template id to delete", example = "139b1f81-2f5d-11ec-9dbe-9b627e1a88f4")
@PathVariable(CLIENT_REGISTRATION_TEMPLATE_ID) String strClientRegistrationTemplateId) throws ThingsboardException {
checkParameter(CLIENT_REGISTRATION_TEMPLATE_ID, strClientRegistrationTemplateId);
accessControlService.checkPermission(getCurrentUser(), Resource.OAUTH2_CONFIGURATION_TEMPLATE, Operation.DELETE);
diff --git a/application/src/main/java/org/thingsboard/server/controller/OAuth2Controller.java b/application/src/main/java/org/thingsboard/server/controller/OAuth2Controller.java
index eeedd2842d..c0a9d6d26f 100644
--- a/application/src/main/java/org/thingsboard/server/controller/OAuth2Controller.java
+++ b/application/src/main/java/org/thingsboard/server/controller/OAuth2Controller.java
@@ -15,8 +15,9 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -33,13 +34,13 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
import org.thingsboard.server.common.data.oauth2.OAuth2ClientInfo;
import org.thingsboard.server.common.data.oauth2.OAuth2Info;
import org.thingsboard.server.common.data.oauth2.PlatformType;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.dao.oauth2.OAuth2Configuration;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.security.permission.Operation;
import org.thingsboard.server.service.security.permission.Resource;
import org.thingsboard.server.utils.MiscUtils;
-import javax.servlet.http.HttpServletRequest;
import java.util.Enumeration;
import java.util.List;
@@ -61,13 +62,13 @@ public class OAuth2Controller extends BaseController {
@RequestMapping(value = "/noauth/oauth2Clients", method = RequestMethod.POST)
@ResponseBody
public List getOAuth2Clients(HttpServletRequest request,
- @ApiParam(value = "Mobile application package name, to find OAuth2 clients " +
+ @Parameter(description = "Mobile application package name, to find OAuth2 clients " +
"where there is configured mobile application with such package name")
@RequestParam(required = false) String pkgName,
- @ApiParam(value = "Platform type to search OAuth2 clients for which " +
+ @Parameter(description = "Platform type to search OAuth2 clients for which " +
"the usage with this platform type is allowed in the settings. " +
"If platform type is not one of allowable values - it will just be ignored",
- allowableValues = "WEB, ANDROID, IOS")
+ schema = @Schema(allowableValues = "WEB, ANDROID, IOS"))
@RequestParam(required = false) String platform) throws ThingsboardException {
if (log.isDebugEnabled()) {
log.debug("Executing getOAuth2Clients: [{}][{}][{}]", request.getScheme(), request.getServerName(), request.getServerPort());
@@ -81,7 +82,8 @@ public class OAuth2Controller extends BaseController {
if (StringUtils.isNotEmpty(platform)) {
try {
platformType = PlatformType.valueOf(platform);
- } catch (Exception e) {}
+ } catch (Exception e) {
+ }
}
return oAuth2Service.getOAuth2Clients(MiscUtils.getScheme(request), MiscUtils.getDomainNameAndPort(request), pkgName, platformType);
}
diff --git a/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java b/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java
index 72b477f17a..4ceb39534f 100644
--- a/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java
@@ -15,8 +15,10 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.io.ByteArrayResource;
@@ -42,6 +44,7 @@ import org.thingsboard.server.common.data.ota.ChecksumAlgorithm;
import org.thingsboard.server.common.data.ota.OtaPackageType;
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.entitiy.ota.TbOtaPackageService;
import org.thingsboard.server.service.security.permission.Operation;
@@ -52,16 +55,13 @@ import java.io.IOException;
import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE;
import static org.thingsboard.server.controller.ControllerConstants.DEVICE_PROFILE_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.OTA_PACKAGE_CHECKSUM_ALGORITHM_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.OTA_PACKAGE_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.OTA_PACKAGE_ID_PARAM_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.OTA_PACKAGE_INFO_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.OTA_PACKAGE_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.OTA_PACKAGE_TEXT_SEARCH_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -84,7 +84,7 @@ public class OtaPackageController extends BaseController {
@PreAuthorize("hasAnyAuthority( 'TENANT_ADMIN')")
@RequestMapping(value = "/otaPackage/{otaPackageId}/download", method = RequestMethod.GET)
@ResponseBody
- public ResponseEntity downloadOtaPackage(@ApiParam(value = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
+ public ResponseEntity downloadOtaPackage(@Parameter(description = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
@PathVariable(OTA_PACKAGE_ID) String strOtaPackageId) throws ThingsboardException {
checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
@@ -106,11 +106,11 @@ public class OtaPackageController extends BaseController {
@ApiOperation(value = "Get OTA Package Info (getOtaPackageInfoById)",
notes = "Fetch the OTA Package Info object based on the provided OTA Package Id. " +
OTA_PACKAGE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/otaPackage/info/{otaPackageId}", method = RequestMethod.GET)
@ResponseBody
- public OtaPackageInfo getOtaPackageInfoById(@ApiParam(value = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
+ public OtaPackageInfo getOtaPackageInfoById(@Parameter(description = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
@PathVariable(OTA_PACKAGE_ID) String strOtaPackageId) throws ThingsboardException {
checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
@@ -120,11 +120,11 @@ public class OtaPackageController extends BaseController {
@ApiOperation(value = "Get OTA Package (getOtaPackageById)",
notes = "Fetch the OTA Package object based on the provided OTA Package Id. " +
"The server checks that the OTA Package is owned by the same tenant. " + OTA_PACKAGE_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH,
- produces = APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/otaPackage/{otaPackageId}", method = RequestMethod.GET)
@ResponseBody
- public OtaPackage getOtaPackageById(@ApiParam(value = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
+ public OtaPackage getOtaPackageById(@Parameter(description = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
@PathVariable(OTA_PACKAGE_ID) String strOtaPackageId) throws ThingsboardException {
checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
@@ -137,12 +137,11 @@ public class OtaPackageController extends BaseController {
"Specify existing OTA Package id to update the OTA Package Info. " +
"Referencing non-existing OTA Package Id will cause 'Not Found' error. " +
"\n\nOTA Package combination of the title with the version is unique in the scope of tenant. " + TENANT_AUTHORITY_PARAGRAPH,
- produces = APPLICATION_JSON_VALUE,
- consumes = APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/otaPackage", method = RequestMethod.POST)
@ResponseBody
- public OtaPackageInfo saveOtaPackageInfo(@ApiParam(value = "A JSON value representing the OTA Package.")
+ public OtaPackageInfo saveOtaPackageInfo(@Parameter(description = "A JSON value representing the OTA Package.")
@RequestBody SaveOtaPackageInfoRequest otaPackageInfo) throws ThingsboardException {
otaPackageInfo.setTenantId(getTenantId());
checkEntity(otaPackageInfo.getId(), otaPackageInfo, Resource.OTA_PACKAGE);
@@ -152,18 +151,18 @@ public class OtaPackageController extends BaseController {
@ApiOperation(value = "Save OTA Package data (saveOtaPackageData)",
notes = "Update the OTA Package. Adds the date to the existing OTA Package Info" + TENANT_AUTHORITY_PARAGRAPH,
- produces = APPLICATION_JSON_VALUE,
- consumes = MULTIPART_FORM_DATA_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = APPLICATION_JSON_VALUE)),
+ requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(content = @Content(mediaType = MULTIPART_FORM_DATA_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/otaPackage/{otaPackageId}", method = RequestMethod.POST, consumes = MULTIPART_FORM_DATA_VALUE)
@ResponseBody
- public OtaPackageInfo saveOtaPackageData(@ApiParam(value = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
+ public OtaPackageInfo saveOtaPackageData(@Parameter(description = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
@PathVariable(OTA_PACKAGE_ID) String strOtaPackageId,
- @ApiParam(value = "OTA Package checksum. For example, '0xd87f7e0c'")
+ @Parameter(description = "OTA Package checksum. For example, '0xd87f7e0c'")
@RequestParam(required = false) String checksum,
- @ApiParam(value = "OTA Package checksum algorithm.", allowableValues = OTA_PACKAGE_CHECKSUM_ALGORITHM_ALLOWABLE_VALUES)
+ @Parameter(description = "OTA Package checksum algorithm.", schema = @Schema(allowableValues = {"MD5", "SHA256", "SHA384", "SHA512", "CRC32", "MURMUR3_32", "MURMUR3_128"}))
@RequestParam(CHECKSUM_ALGORITHM) String checksumAlgorithmStr,
- @ApiParam(value = "OTA Package data.")
+ @Parameter(description = "OTA Package data.")
@RequestPart MultipartFile file) throws ThingsboardException, IOException {
checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
checkParameter(CHECKSUM_ALGORITHM, checksumAlgorithmStr);
@@ -178,19 +177,19 @@ public class OtaPackageController extends BaseController {
@ApiOperation(value = "Get OTA Package Infos (getOtaPackages)",
notes = "Returns a page of OTA Package Info objects owned by tenant. " +
PAGE_DATA_PARAMETERS + OTA_PACKAGE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/otaPackages", method = RequestMethod.GET)
@ResponseBody
- public PageData getOtaPackages(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ public PageData getOtaPackages(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = OTA_PACKAGE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = OTA_PACKAGE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = OTA_PACKAGE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "type", "title", "version", "tag", "url", "fileName", "dataSize", "checksum"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
return checkNotNull(otaPackageService.findTenantOtaPackagesByTenantId(getTenantId(), pageLink));
@@ -199,23 +198,23 @@ public class OtaPackageController extends BaseController {
@ApiOperation(value = "Get OTA Package Infos (getOtaPackages)",
notes = "Returns a page of OTA Package Info objects owned by tenant. " +
PAGE_DATA_PARAMETERS + OTA_PACKAGE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/otaPackages/{deviceProfileId}/{type}", method = RequestMethod.GET)
@ResponseBody
- public PageData getOtaPackages(@ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+ public PageData getOtaPackages(@Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
@PathVariable("deviceProfileId") String strDeviceProfileId,
- @ApiParam(value = "OTA Package type.", allowableValues = "FIRMWARE, SOFTWARE")
+ @Parameter(description = "OTA Package type.", schema = @Schema(allowableValues = "FIRMWARE, SOFTWARE"))
@PathVariable("type") String strType,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = OTA_PACKAGE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = OTA_PACKAGE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = OTA_PACKAGE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "type", "title", "version", "tag", "url", "fileName", "dataSize", "checksum"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
checkParameter("deviceProfileId", strDeviceProfileId);
checkParameter("type", strType);
@@ -227,11 +226,11 @@ public class OtaPackageController extends BaseController {
@ApiOperation(value = "Delete OTA Package (deleteOtaPackage)",
notes = "Deletes the OTA Package. Referencing non-existing OTA Package Id will cause an error. " +
"Can't delete the OTA Package if it is referenced by existing devices or device profile." + TENANT_AUTHORITY_PARAGRAPH,
- produces = APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/otaPackage/{otaPackageId}", method = RequestMethod.DELETE)
@ResponseBody
- public void deleteOtaPackage(@ApiParam(value = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
+ public void deleteOtaPackage(@Parameter(description = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
@PathVariable("otaPackageId") String strOtaPackageId) throws ThingsboardException {
checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
diff --git a/application/src/main/java/org/thingsboard/server/controller/QueueController.java b/application/src/main/java/org/thingsboard/server/controller/QueueController.java
index b5f00efdfe..089ba9bcca 100644
--- a/application/src/main/java/org/thingsboard/server/controller/QueueController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/QueueController.java
@@ -15,8 +15,8 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PathVariable;
@@ -32,6 +32,7 @@ import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.queue.Queue;
import org.thingsboard.server.common.msg.queue.ServiceType;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.entitiy.queue.TbQueueService;
import org.thingsboard.server.service.security.permission.Operation;
@@ -45,10 +46,7 @@ import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DE
import static org.thingsboard.server.controller.ControllerConstants.QUEUE_ID_PARAM_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.QUEUE_NAME_PARAM_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.QUEUE_QUEUE_TEXT_SEARCH_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.QUEUE_SERVICE_TYPE_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.QUEUE_SERVICE_TYPE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.QUEUE_SORT_PROPERTY_ALLOWABLE_VALUES;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SYSTEM_AUTHORITY_PARAGRAPH;
@@ -69,17 +67,17 @@ public class QueueController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@RequestMapping(value = "/queues", params = {"serviceType", "pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
- public PageData getTenantQueuesByServiceType(@ApiParam(value = QUEUE_SERVICE_TYPE_DESCRIPTION, allowableValues = QUEUE_SERVICE_TYPE_ALLOWABLE_VALUES, required = true)
+ public PageData getTenantQueuesByServiceType(@Parameter(description = QUEUE_SERVICE_TYPE_DESCRIPTION, schema = @Schema(allowableValues = {"TB-RULE-ENGINE", "TB-CORE", "TB-TRANSPORT", "JS-EXECUTOR"}, required = true))
@RequestParam String serviceType,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = QUEUE_QUEUE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = QUEUE_QUEUE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = QUEUE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "topic"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
checkParameter("serviceType", serviceType);
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -97,7 +95,7 @@ public class QueueController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@RequestMapping(value = "/queues/{queueId}", method = RequestMethod.GET)
@ResponseBody
- public Queue getQueueById(@ApiParam(value = QUEUE_ID_PARAM_DESCRIPTION)
+ public Queue getQueueById(@Parameter(description = QUEUE_ID_PARAM_DESCRIPTION)
@PathVariable("queueId") String queueIdStr) throws ThingsboardException {
checkParameter("queueId", queueIdStr);
QueueId queueId = new QueueId(UUID.fromString(queueIdStr));
@@ -110,7 +108,7 @@ public class QueueController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@RequestMapping(value = "/queues/name/{queueName}", method = RequestMethod.GET)
@ResponseBody
- public Queue getQueueByName(@ApiParam(value = QUEUE_NAME_PARAM_DESCRIPTION)
+ public Queue getQueueByName(@Parameter(description = QUEUE_NAME_PARAM_DESCRIPTION)
@PathVariable("queueName") String queueName) throws ThingsboardException {
checkParameter("queueName", queueName);
return checkNotNull(queueService.findQueueByTenantIdAndName(getTenantId(), queueName));
@@ -126,9 +124,9 @@ public class QueueController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN')")
@RequestMapping(value = "/queues", params = {"serviceType"}, method = RequestMethod.POST)
@ResponseBody
- public Queue saveQueue(@ApiParam(value = "A JSON value representing the queue.")
+ public Queue saveQueue(@Parameter(description = "A JSON value representing the queue.")
@RequestBody Queue queue,
- @ApiParam(value = QUEUE_SERVICE_TYPE_DESCRIPTION, allowableValues = QUEUE_SERVICE_TYPE_ALLOWABLE_VALUES, required = true)
+ @Parameter(description = QUEUE_SERVICE_TYPE_DESCRIPTION, schema = @Schema(allowableValues = {"TB-RULE-ENGINE", "TB-CORE", "TB-TRANSPORT", "JS-EXECUTOR"}, required = true))
@RequestParam String serviceType) throws ThingsboardException {
checkParameter("serviceType", serviceType);
queue.setTenantId(getCurrentUser().getTenantId());
@@ -151,7 +149,7 @@ public class QueueController extends BaseController {
@PreAuthorize("hasAnyAuthority('SYS_ADMIN')")
@RequestMapping(value = "/queues/{queueId}", method = RequestMethod.DELETE)
@ResponseBody
- public void deleteQueue(@ApiParam(value = QUEUE_ID_PARAM_DESCRIPTION)
+ public void deleteQueue(@Parameter(description = QUEUE_ID_PARAM_DESCRIPTION)
@PathVariable("queueId") String queueIdStr) throws ThingsboardException {
checkParameter("queueId", queueIdStr);
QueueId queueId = new QueueId(toUUID(queueIdStr));
diff --git a/application/src/main/java/org/thingsboard/server/controller/RpcV1Controller.java b/application/src/main/java/org/thingsboard/server/controller/RpcV1Controller.java
index 0ac83bd11b..c87f5386db 100644
--- a/application/src/main/java/org/thingsboard/server/controller/RpcV1Controller.java
+++ b/application/src/main/java/org/thingsboard/server/controller/RpcV1Controller.java
@@ -15,8 +15,7 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -30,6 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.request.async.DeferredResult;
import org.thingsboard.server.common.data.exception.ThingsboardException;
import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.queue.util.TbCoreComponent;
import java.util.UUID;
@@ -48,9 +48,9 @@ public class RpcV1Controller extends AbstractRpcController {
@RequestMapping(value = "/oneway/{deviceId}", method = RequestMethod.POST)
@ResponseBody
public DeferredResult handleOneWayDeviceRPCRequest(
- @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
@PathVariable("deviceId") String deviceIdStr,
- @ApiParam(value = "A JSON value representing the RPC request.")
+ @Parameter(description = "A JSON value representing the RPC request.")
@RequestBody String requestBody) throws ThingsboardException {
return handleDeviceRPCRequest(true, new DeviceId(UUID.fromString(deviceIdStr)), requestBody, HttpStatus.REQUEST_TIMEOUT, HttpStatus.CONFLICT);
}
@@ -60,9 +60,9 @@ public class RpcV1Controller extends AbstractRpcController {
@RequestMapping(value = "/twoway/{deviceId}", method = RequestMethod.POST)
@ResponseBody
public DeferredResult handleTwoWayDeviceRPCRequest(
- @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
@PathVariable("deviceId") String deviceIdStr,
- @ApiParam(value = "A JSON value representing the RPC request.")
+ @Parameter(description = "A JSON value representing the RPC request.")
@RequestBody String requestBody) throws ThingsboardException {
return handleDeviceRPCRequest(false, new DeviceId(UUID.fromString(deviceIdStr)), requestBody, HttpStatus.REQUEST_TIMEOUT, HttpStatus.CONFLICT);
}
diff --git a/application/src/main/java/org/thingsboard/server/controller/RpcV2Controller.java b/application/src/main/java/org/thingsboard/server/controller/RpcV2Controller.java
index f9de7a5b1c..6c08f4a2e2 100644
--- a/application/src/main/java/org/thingsboard/server/controller/RpcV2Controller.java
+++ b/application/src/main/java/org/thingsboard/server/controller/RpcV2Controller.java
@@ -16,10 +16,11 @@
package org.thingsboard.server.controller;
import com.google.common.util.concurrent.FutureCallback;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import jakarta.annotation.Nullable;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -45,12 +46,12 @@ import org.thingsboard.server.common.data.rpc.Rpc;
import org.thingsboard.server.common.data.rpc.RpcStatus;
import org.thingsboard.server.common.msg.TbMsg;
import org.thingsboard.server.common.msg.TbMsgMetaData;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.exception.ToErrorResponseEntity;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.common.msg.rpc.RemoveRpcActorMsg;
import org.thingsboard.server.service.security.permission.Operation;
-import javax.annotation.Nullable;
import java.util.UUID;
import static org.thingsboard.server.controller.ControllerConstants.DEVICE_ID;
@@ -61,10 +62,7 @@ import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.RPC_ID;
import static org.thingsboard.server.controller.ControllerConstants.RPC_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.RPC_SORT_PROPERTY_ALLOWABLE_VALUES;
-import static org.thingsboard.server.controller.ControllerConstants.RPC_STATUS_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.RPC_TEXT_SEARCH_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -117,36 +115,36 @@ public class RpcV2Controller extends AbstractRpcController {
@ApiOperation(value = "Send one-way RPC request", notes = ONE_WAY_RPC_REQUEST_DESCRIPTION)
@ApiResponses(value = {
- @ApiResponse(code = 200, message = "Persistent RPC request was saved to the database or lightweight RPC request was sent to the device."),
- @ApiResponse(code = 400, message = "Invalid structure of the request."),
- @ApiResponse(code = 401, message = "User is not authorized to send the RPC request. Most likely, User belongs to different Customer or Tenant."),
- @ApiResponse(code = 504, message = "Timeout to process the RPC call. Most likely, device is offline."),
+ @ApiResponse(responseCode = "200", description = "Persistent RPC request was saved to the database or lightweight RPC request was sent to the device."),
+ @ApiResponse(responseCode = "400", description = "Invalid structure of the request."),
+ @ApiResponse(responseCode = "401", description = "User is not authorized to send the RPC request. Most likely, User belongs to different Customer or Tenant."),
+ @ApiResponse(responseCode = "504", description = "Timeout to process the RPC call. Most likely, device is offline."),
})
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/oneway/{deviceId}", method = RequestMethod.POST)
@ResponseBody
public DeferredResult handleOneWayDeviceRPCRequest(
- @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
@PathVariable("deviceId") String deviceIdStr,
- @ApiParam(value = "A JSON value representing the RPC request.")
+ @Parameter(description = "A JSON value representing the RPC request.")
@RequestBody String requestBody) throws ThingsboardException {
return handleDeviceRPCRequest(true, new DeviceId(UUID.fromString(deviceIdStr)), requestBody, HttpStatus.GATEWAY_TIMEOUT, HttpStatus.GATEWAY_TIMEOUT);
}
@ApiOperation(value = "Send two-way RPC request", notes = TWO_WAY_RPC_REQUEST_DESCRIPTION)
@ApiResponses(value = {
- @ApiResponse(code = 200, message = "Persistent RPC request was saved to the database or lightweight RPC response received."),
- @ApiResponse(code = 400, message = "Invalid structure of the request."),
- @ApiResponse(code = 401, message = "User is not authorized to send the RPC request. Most likely, User belongs to different Customer or Tenant."),
- @ApiResponse(code = 504, message = "Timeout to process the RPC call. Most likely, device is offline."),
+ @ApiResponse(responseCode = "200", description = "Persistent RPC request was saved to the database or lightweight RPC response received."),
+ @ApiResponse(responseCode = "400", description = "Invalid structure of the request."),
+ @ApiResponse(responseCode = "401", description = "User is not authorized to send the RPC request. Most likely, User belongs to different Customer or Tenant."),
+ @ApiResponse(responseCode = "504", description = "Timeout to process the RPC call. Most likely, device is offline."),
})
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/twoway/{deviceId}", method = RequestMethod.POST)
@ResponseBody
public DeferredResult handleTwoWayDeviceRPCRequest(
- @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
@PathVariable(DEVICE_ID) String deviceIdStr,
- @ApiParam(value = "A JSON value representing the RPC request.")
+ @Parameter(description = "A JSON value representing the RPC request.")
@RequestBody String requestBody) throws ThingsboardException {
return handleDeviceRPCRequest(false, new DeviceId(UUID.fromString(deviceIdStr)), requestBody, HttpStatus.GATEWAY_TIMEOUT, HttpStatus.GATEWAY_TIMEOUT);
}
@@ -156,7 +154,7 @@ public class RpcV2Controller extends AbstractRpcController {
@RequestMapping(value = "/persistent/{rpcId}", method = RequestMethod.GET)
@ResponseBody
public Rpc getPersistedRpc(
- @ApiParam(value = RPC_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = RPC_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(RPC_ID) String strRpc) throws ThingsboardException {
checkParameter("RpcId", strRpc);
RpcId rpcId = new RpcId(UUID.fromString(strRpc));
@@ -168,19 +166,19 @@ public class RpcV2Controller extends AbstractRpcController {
@RequestMapping(value = "/persistent/device/{deviceId}", method = RequestMethod.GET)
@ResponseBody
public DeferredResult getPersistedRpcByDevice(
- @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(DEVICE_ID) String strDeviceId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = "Status of the RPC", allowableValues = RPC_STATUS_ALLOWABLE_VALUES)
+ @Parameter(description = "Status of the RPC", schema = @Schema(allowableValues = {"QUEUED", "SENT", "DELIVERED", "SUCCESSFUL", "TIMEOUT", "EXPIRED", "FAILED"}))
@RequestParam(required = false) RpcStatus rpcStatus,
- @ApiParam(value = RPC_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = RPC_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = RPC_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "expirationTime", "request", "response"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
checkParameter("DeviceId", strDeviceId);
if (rpcStatus != null && rpcStatus.equals(RpcStatus.DELETED)) {
@@ -223,7 +221,7 @@ public class RpcV2Controller extends AbstractRpcController {
@RequestMapping(value = "/persistent/{rpcId}", method = RequestMethod.DELETE)
@ResponseBody
public void deleteRpc(
- @ApiParam(value = RPC_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = RPC_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(RPC_ID) String strRpc) throws ThingsboardException {
checkParameter("RpcId", strRpc);
RpcId rpcId = new RpcId(UUID.fromString(strRpc));
diff --git a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
index 2d21986834..e7c6e138ca 100644
--- a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
@@ -20,8 +20,10 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -66,6 +68,7 @@ import org.thingsboard.server.common.data.script.ScriptLanguage;
import org.thingsboard.server.common.msg.TbMsg;
import org.thingsboard.server.common.msg.TbMsgDataType;
import org.thingsboard.server.common.msg.TbMsgMetaData;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.dao.event.EventService;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.rule.TbRuleChainService;
@@ -93,12 +96,9 @@ import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PA
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.RULE_CHAIN_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.RULE_CHAIN_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.RULE_CHAIN_TEXT_SEARCH_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.RULE_CHAIN_TYPES_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.RULE_CHAIN_TYPE_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.RULE_NODE_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -163,7 +163,7 @@ public class RuleChainController extends BaseController {
@RequestMapping(value = "/ruleChain/{ruleChainId}", method = RequestMethod.GET)
@ResponseBody
public RuleChain getRuleChainById(
- @ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+ @Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
@PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
checkParameter(RULE_CHAIN_ID, strRuleChainId);
RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
@@ -177,7 +177,7 @@ public class RuleChainController extends BaseController {
@RequestMapping(value = "/ruleChain/{ruleChainId}/output/labels", method = RequestMethod.GET)
@ResponseBody
public Set getRuleChainOutputLabels(
- @ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+ @Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
@PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
checkParameter(RULE_CHAIN_ID, strRuleChainId);
RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
@@ -192,7 +192,7 @@ public class RuleChainController extends BaseController {
@RequestMapping(value = "/ruleChain/{ruleChainId}/output/labels/usage", method = RequestMethod.GET)
@ResponseBody
public List getRuleChainOutputLabelsUsage(
- @ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+ @Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
@PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
checkParameter(RULE_CHAIN_ID, strRuleChainId);
RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
@@ -206,7 +206,7 @@ public class RuleChainController extends BaseController {
@RequestMapping(value = "/ruleChain/{ruleChainId}/metadata", method = RequestMethod.GET)
@ResponseBody
public RuleChainMetaData getRuleChainMetaData(
- @ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+ @Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
@PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
checkParameter(RULE_CHAIN_ID, strRuleChainId);
RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
@@ -226,7 +226,7 @@ public class RuleChainController extends BaseController {
@RequestMapping(value = "/ruleChain", method = RequestMethod.POST)
@ResponseBody
public RuleChain saveRuleChain(
- @ApiParam(value = "A JSON value representing the rule chain.")
+ @Parameter(description = "A JSON value representing the rule chain.")
@RequestBody RuleChain ruleChain) throws Exception {
ruleChain.setTenantId(getCurrentUser().getTenantId());
checkEntity(ruleChain.getId(), ruleChain, Resource.RULE_CHAIN);
@@ -240,7 +240,7 @@ public class RuleChainController extends BaseController {
@RequestMapping(value = "/ruleChain/device/default", method = RequestMethod.POST)
@ResponseBody
public RuleChain saveRuleChain(
- @ApiParam(value = "A JSON value representing the request.")
+ @Parameter(description = "A JSON value representing the request.")
@RequestBody DefaultRuleChainCreateRequest request) throws Exception {
checkNotNull(request);
checkParameter(request.getName(), "name");
@@ -253,7 +253,7 @@ public class RuleChainController extends BaseController {
@RequestMapping(value = "/ruleChain/{ruleChainId}/root", method = RequestMethod.POST)
@ResponseBody
public RuleChain setRootRuleChain(
- @ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+ @Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
@PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
checkParameter(RULE_CHAIN_ID, strRuleChainId);
RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
@@ -267,9 +267,9 @@ public class RuleChainController extends BaseController {
@RequestMapping(value = "/ruleChain/metadata", method = RequestMethod.POST)
@ResponseBody
public RuleChainMetaData saveRuleChainMetaData(
- @ApiParam(value = "A JSON value representing the rule chain metadata.")
+ @Parameter(description = "A JSON value representing the rule chain metadata.")
@RequestBody RuleChainMetaData ruleChainMetaData,
- @ApiParam(value = "Update related rule nodes.")
+ @Parameter(description = "Update related rule nodes.")
@RequestParam(value = "updateRelated", required = false, defaultValue = "true") boolean updateRelated
) throws Exception {
TenantId tenantId = getTenantId();
@@ -291,17 +291,17 @@ public class RuleChainController extends BaseController {
@RequestMapping(value = "/ruleChains", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getRuleChains(
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = RULE_CHAIN_TYPE_DESCRIPTION, allowableValues = RULE_CHAIN_TYPES_ALLOWABLE_VALUES)
+ @Parameter(description = RULE_CHAIN_TYPE_DESCRIPTION, schema = @Schema(allowableValues = {"CORE", "EDGE"}))
@RequestParam(value = "type", required = false) String typeStr,
- @ApiParam(value = RULE_CHAIN_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = RULE_CHAIN_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = RULE_CHAIN_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "root"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -319,7 +319,7 @@ public class RuleChainController extends BaseController {
@RequestMapping(value = "/ruleChain/{ruleChainId}", method = RequestMethod.DELETE)
@ResponseStatus(value = HttpStatus.OK)
public void deleteRuleChain(
- @ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+ @Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
@PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
checkParameter(RULE_CHAIN_ID, strRuleChainId);
RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
@@ -334,7 +334,7 @@ public class RuleChainController extends BaseController {
@RequestMapping(value = "/ruleNode/{ruleNodeId}/debugIn", method = RequestMethod.GET)
@ResponseBody
public JsonNode getLatestRuleNodeDebugInput(
- @ApiParam(value = RULE_NODE_ID_PARAM_DESCRIPTION)
+ @Parameter(description = RULE_NODE_ID_PARAM_DESCRIPTION)
@PathVariable(RULE_NODE_ID) String strRuleNodeId) throws ThingsboardException {
checkParameter(RULE_NODE_ID, strRuleNodeId);
RuleNodeId ruleNodeId = new RuleNodeId(toUUID(strRuleNodeId));
@@ -369,9 +369,9 @@ public class RuleChainController extends BaseController {
@RequestMapping(value = "/ruleChain/testScript", method = RequestMethod.POST)
@ResponseBody
public JsonNode testScript(
- @ApiParam(value = "Script language: JS or TBEL")
+ @Parameter(description = "Script language: JS or TBEL")
@RequestParam(required = false) ScriptLanguage scriptLang,
- @ApiParam(value = "Test JS request. See API call description above.")
+ @Parameter(description = "Test JS request. See API call description above.")
@RequestBody JsonNode inputParams) throws ThingsboardException, JsonProcessingException {
String script = inputParams.get("script").asText();
String scriptType = inputParams.get("scriptType").asText();
@@ -443,7 +443,7 @@ public class RuleChainController extends BaseController {
@RequestMapping(value = "/ruleChains/export", params = {"limit"}, method = RequestMethod.GET)
@ResponseBody
public RuleChainData exportRuleChains(
- @ApiParam(value = "A limit of rule chains to export.", required = true)
+ @Parameter(description = "A limit of rule chains to export.", required = true)
@RequestParam("limit") int limit) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
PageLink pageLink = new PageLink(limit);
@@ -455,19 +455,12 @@ public class RuleChainController extends BaseController {
@RequestMapping(value = "/ruleChains/import", method = RequestMethod.POST)
@ResponseBody
public List importRuleChains(
- @ApiParam(value = "A JSON value representing the rule chains.")
+ @Parameter(description = "A JSON value representing the rule chains.")
@RequestBody RuleChainData ruleChainData,
- @ApiParam(value = "Enables overwrite for existing rule chains with the same name.")
+ @Parameter(description = "Enables overwrite for existing rule chains with the same name.")
@RequestParam(required = false, defaultValue = "false") boolean overwrite) throws ThingsboardException {
TenantId tenantId = getCurrentUser().getTenantId();
- List importResults = ruleChainService.importTenantRuleChains(tenantId, ruleChainData, overwrite, tbRuleChainService::updateRuleNodeConfiguration);
- for (RuleChainImportResult importResult : importResults) {
- if (importResult.getError() == null) {
- tbClusterService.broadcastEntityStateChangeEvent(importResult.getTenantId(), importResult.getRuleChainId(),
- importResult.isUpdated() ? ComponentLifecycleEvent.UPDATED : ComponentLifecycleEvent.CREATED);
- }
- }
- return importResults;
+ return ruleChainService.importTenantRuleChains(tenantId, ruleChainData, overwrite, tbRuleChainService::updateRuleNodeConfiguration);
}
private String msgToOutput(TbMsg msg) throws Exception {
@@ -507,7 +500,7 @@ public class RuleChainController extends BaseController {
EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION +
"Third, once rule chain will be delivered to edge service, it's going to start processing messages locally. " +
"\n\nOnly rule chain with type 'EDGE' can be assigned to edge." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/{edgeId}/ruleChain/{ruleChainId}", method = RequestMethod.POST)
@ResponseBody
@@ -530,7 +523,7 @@ public class RuleChainController extends BaseController {
"Second, remote edge service will receive an 'unassign' command to remove rule chain " +
EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION +
"Third, once 'unassign' command will be delivered to edge service, it's going to remove rule chain locally." + TENANT_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/edge/{edgeId}/ruleChain/{ruleChainId}", method = RequestMethod.DELETE)
@ResponseBody
@@ -552,17 +545,17 @@ public class RuleChainController extends BaseController {
@RequestMapping(value = "/edge/{edgeId}/ruleChains", params = {"pageSize", "page"}, method = RequestMethod.GET)
@ResponseBody
public PageData getEdgeRuleChains(
- @ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+ @Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
@PathVariable(EDGE_ID) String strEdgeId,
- @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = RULE_CHAIN_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = RULE_CHAIN_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = RULE_CHAIN_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "root"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
checkParameter(EDGE_ID, strEdgeId);
TenantId tenantId = getCurrentUser().getTenantId();
@@ -578,7 +571,7 @@ public class RuleChainController extends BaseController {
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/ruleChain/{ruleChainId}/edgeTemplateRoot", method = RequestMethod.POST)
@ResponseBody
- public RuleChain setEdgeTemplateRootRuleChain(@ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+ public RuleChain setEdgeTemplateRootRuleChain(@Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
@PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
checkParameter(RULE_CHAIN_ID, strRuleChainId);
RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
@@ -592,7 +585,7 @@ public class RuleChainController extends BaseController {
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/ruleChain/{ruleChainId}/autoAssignToEdge", method = RequestMethod.POST)
@ResponseBody
- public RuleChain setAutoAssignToEdgeRuleChain(@ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+ public RuleChain setAutoAssignToEdgeRuleChain(@Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
@PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
checkParameter(RULE_CHAIN_ID, strRuleChainId);
RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
@@ -606,7 +599,7 @@ public class RuleChainController extends BaseController {
@PreAuthorize("hasAuthority('TENANT_ADMIN')")
@RequestMapping(value = "/ruleChain/{ruleChainId}/autoAssignToEdge", method = RequestMethod.DELETE)
@ResponseBody
- public RuleChain unsetAutoAssignToEdgeRuleChain(@ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+ public RuleChain unsetAutoAssignToEdgeRuleChain(@Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
@PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
checkParameter(RULE_CHAIN_ID, strRuleChainId);
RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
diff --git a/application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java b/application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java
index 01a7cae420..cb2033b29d 100644
--- a/application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java
@@ -17,6 +17,8 @@ package org.thingsboard.server.controller;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.swagger.v3.oas.annotations.Hidden;
+import jakarta.annotation.PostConstruct;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -40,14 +42,12 @@ import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.security.model.SecurityUser;
import org.thingsboard.server.service.security.model.UserPrincipal;
import org.thingsboard.server.service.sync.vc.EntitiesVersionControlService;
-import springfox.documentation.annotations.ApiIgnore;
-import javax.annotation.PostConstruct;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
-@ApiIgnore
+@Hidden
@RestController
@TbCoreComponent
@RequestMapping("/api")
diff --git a/application/src/main/java/org/thingsboard/server/controller/TbResourceController.java b/application/src/main/java/org/thingsboard/server/controller/TbResourceController.java
index 56c67f4fa5..bf59f78519 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TbResourceController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TbResourceController.java
@@ -15,8 +15,10 @@
*/
package org.thingsboard.server.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -47,6 +49,7 @@ import org.thingsboard.server.common.data.lwm2m.LwM2mObject;
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.queue.util.TbCoreComponent;
import org.thingsboard.server.service.resource.TbResourceService;
import org.thingsboard.server.service.security.permission.Operation;
@@ -60,18 +63,14 @@ import java.util.Set;
import static org.thingsboard.server.controller.ControllerConstants.AVAILABLE_FOR_ANY_AUTHORIZED_USER;
import static org.thingsboard.server.controller.ControllerConstants.LWM2M_OBJECT_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.LWM2M_OBJECT_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_ID_PARAM_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_INFO_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_SORT_PROPERTY_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_TEXT_SEARCH_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_TYPE;
-import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_TYPE_PROPERTY_ALLOWABLE_VALUES;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH;
@@ -93,7 +92,7 @@ public class TbResourceController extends BaseController {
@ApiOperation(value = "Download Resource (downloadResource)", notes = "Download Resource based on the provided Resource Id." + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@GetMapping(value = "/resource/{resourceId}/download")
- public ResponseEntity downloadResource(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+ public ResponseEntity downloadResource(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
@PathVariable(RESOURCE_ID) String strResourceId) throws ThingsboardException {
checkParameter(RESOURCE_ID, strResourceId);
TbResourceId resourceId = new TbResourceId(toUUID(strResourceId));
@@ -111,7 +110,7 @@ public class TbResourceController extends BaseController {
@ApiOperation(value = "Download LWM2M Resource (downloadLwm2mResourceIfChanged)", notes = DOWNLOAD_RESOURCE_IF_NOT_CHANGED + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@GetMapping(value = "/resource/lwm2m/{resourceId}/download", produces = "application/xml")
- public ResponseEntity downloadLwm2mResourceIfChanged(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+ public ResponseEntity downloadLwm2mResourceIfChanged(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
@PathVariable(RESOURCE_ID) String strResourceId,
@RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws ThingsboardException {
return downloadResourceIfChanged(ResourceType.LWM2M_MODEL, strResourceId, etag);
@@ -120,7 +119,7 @@ public class TbResourceController extends BaseController {
@ApiOperation(value = "Download PKCS_12 Resource (downloadPkcs12ResourceIfChanged)", notes = DOWNLOAD_RESOURCE_IF_NOT_CHANGED + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@RequestMapping(value = "/resource/pkcs12/{resourceId}/download", method = RequestMethod.GET, produces = "application/x-pkcs12")
- public ResponseEntity downloadPkcs12ResourceIfChanged(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+ public ResponseEntity downloadPkcs12ResourceIfChanged(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
@PathVariable(RESOURCE_ID) String strResourceId,
@RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws ThingsboardException {
return downloadResourceIfChanged(ResourceType.PKCS_12, strResourceId, etag);
@@ -130,7 +129,7 @@ public class TbResourceController extends BaseController {
notes = DOWNLOAD_RESOURCE_IF_NOT_CHANGED + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@GetMapping(value = "/resource/jks/{resourceId}/download", produces = "application/x-java-keystore")
- public ResponseEntity downloadJksResourceIfChanged(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+ public ResponseEntity downloadJksResourceIfChanged(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
@PathVariable(RESOURCE_ID) String strResourceId,
@RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws ThingsboardException {
return downloadResourceIfChanged(ResourceType.JKS, strResourceId, etag);
@@ -139,7 +138,7 @@ public class TbResourceController extends BaseController {
@ApiOperation(value = "Download JS Resource (downloadJsResourceIfChanged)", notes = DOWNLOAD_RESOURCE_IF_NOT_CHANGED + AVAILABLE_FOR_ANY_AUTHORIZED_USER)
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@GetMapping(value = "/resource/js/{resourceId}/download", produces = "application/javascript")
- public ResponseEntity downloadJsResourceIfChanged(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+ public ResponseEntity downloadJsResourceIfChanged(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
@PathVariable(RESOURCE_ID) String strResourceId,
@RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws ThingsboardException {
return downloadResourceIfChanged(ResourceType.JS_MODULE, strResourceId, etag);
@@ -148,10 +147,10 @@ public class TbResourceController extends BaseController {
@ApiOperation(value = "Get Resource Info (getResourceInfoById)",
notes = "Fetch the Resource Info object based on the provided Resource Id. " +
RESOURCE_INFO_DESCRIPTION + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@GetMapping(value = "/resource/info/{resourceId}")
- public TbResourceInfo getResourceInfoById(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+ public TbResourceInfo getResourceInfoById(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
@PathVariable(RESOURCE_ID) String strResourceId) throws ThingsboardException {
checkParameter(RESOURCE_ID, strResourceId);
TbResourceId resourceId = new TbResourceId(toUUID(strResourceId));
@@ -161,11 +160,11 @@ public class TbResourceController extends BaseController {
@ApiOperation(value = "Get Resource (getResourceById)",
notes = "Fetch the Resource object based on the provided Resource Id. " +
RESOURCE_DESCRIPTION + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json", hidden = true)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)), hidden = true)
@Deprecated // resource's data should be fetched with a download request
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@GetMapping(value = "/resource/{resourceId}")
- public TbResource getResourceById(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+ public TbResource getResourceById(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
@PathVariable(RESOURCE_ID) String strResourceId) throws ThingsboardException {
checkParameter(RESOURCE_ID, strResourceId);
TbResourceId resourceId = new TbResourceId(toUUID(strResourceId));
@@ -180,11 +179,10 @@ public class TbResourceController extends BaseController {
"\n\nResource combination of the title with the key is unique in the scope of tenant. " +
"Remove 'id', 'tenantId' from the request body example (below) to create new Resource entity." +
SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json",
- consumes = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@PostMapping(value = "/resource")
- public TbResourceInfo saveResource(@ApiParam(value = "A JSON value representing the Resource.")
+ public TbResourceInfo saveResource(@Parameter(description = "A JSON value representing the Resource.")
@RequestBody TbResource resource) throws Exception {
resource.setTenantId(getTenantId());
checkEntity(resource.getId(), resource, Resource.TB_RESOURCE);
@@ -194,20 +192,20 @@ public class TbResourceController extends BaseController {
@ApiOperation(value = "Get Resource Infos (getResources)",
notes = "Returns a page of Resource Info objects owned by tenant or sysadmin. " +
PAGE_DATA_PARAMETERS + RESOURCE_INFO_DESCRIPTION + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@GetMapping(value = "/resource")
- public PageData getResources(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ public PageData getResources(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = RESOURCE_TYPE, allowableValues = RESOURCE_TYPE_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = RESOURCE_TYPE, schema = @Schema(allowableValues = {"LWM2M_MODEL", "JKS", "PKCS_12", "JS_MODULE"}))
@RequestParam(required = false) String resourceType,
- @ApiParam(value = RESOURCE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = RESOURCE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = RESOURCE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title", "resourceType", "tenantId"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
TbResourceInfoFilter.TbResourceInfoFilterBuilder filter = TbResourceInfoFilter.builder();
@@ -230,18 +228,18 @@ public class TbResourceController extends BaseController {
@ApiOperation(value = "Get All Resource Infos (getAllResources)",
notes = "Returns a page of Resource Info objects owned by tenant. " +
PAGE_DATA_PARAMETERS + RESOURCE_INFO_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@GetMapping(value = "/resource/tenant")
- public PageData getTenantResources(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ public PageData getTenantResources(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = RESOURCE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = RESOURCE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = RESOURCE_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title", "resourceType", "tenantId"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
TbResourceInfoFilter filter = TbResourceInfoFilter.builder()
@@ -254,18 +252,18 @@ public class TbResourceController extends BaseController {
@ApiOperation(value = "Get LwM2M Objects (getLwm2mListObjectsPage)",
notes = "Returns a page of LwM2M objects parsed from Resources with type 'LWM2M_MODEL' owned by tenant or sysadmin. " +
PAGE_DATA_PARAMETERS + LWM2M_OBJECT_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@GetMapping(value = "/resource/lwm2m/page")
- public List getLwm2mListObjectsPage(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+ public List getLwm2mListObjectsPage(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@RequestParam int pageSize,
- @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+ @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@RequestParam int page,
- @ApiParam(value = RESOURCE_TEXT_SEARCH_DESCRIPTION)
+ @Parameter(description = RESOURCE_TEXT_SEARCH_DESCRIPTION)
@RequestParam(required = false) String textSearch,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = LWM2M_OBJECT_SORT_PROPERTY_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"id", "name"}))
@RequestParam(required = false) String sortProperty,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(required = false) String sortOrder) throws ThingsboardException {
PageLink pageLink = new PageLink(pageSize, page, textSearch);
return checkNotNull(tbResourceService.findLwM2mObjectPage(getTenantId(), sortProperty, sortOrder, pageLink));
@@ -274,14 +272,14 @@ public class TbResourceController extends BaseController {
@ApiOperation(value = "Get LwM2M Objects (getLwm2mListObjects)",
notes = "Returns a page of LwM2M objects parsed from Resources with type 'LWM2M_MODEL' owned by tenant or sysadmin. " +
"You can specify parameters to filter the results. " + LWM2M_OBJECT_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH,
- produces = "application/json")
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
@GetMapping(value = "/resource/lwm2m")
- public List getLwm2mListObjects(@ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES, required = true)
+ public List getLwm2mListObjects(@Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}, required = true))
@RequestParam String sortOrder,
- @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = LWM2M_OBJECT_SORT_PROPERTY_ALLOWABLE_VALUES, required = true)
+ @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"id", "name"}, required = true))
@RequestParam String sortProperty,
- @ApiParam(value = "LwM2M Object ids.", required = true)
+ @Parameter(description = "LwM2M Object ids.", required = true)
@RequestParam(required = false) String[] objectIds) throws ThingsboardException {
return checkNotNull(tbResourceService.findLwM2mObject(getTenantId(), sortOrder, sortProperty, objectIds));
}
@@ -290,7 +288,7 @@ public class TbResourceController extends BaseController {
notes = "Deletes the Resource. Referencing non-existing Resource Id will cause an error." + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@DeleteMapping(value = "/resource/{resourceId}")
- public void deleteResource(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+ public void deleteResource(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
@PathVariable("resourceId") String strResourceId) throws ThingsboardException {
checkParameter(RESOURCE_ID, strResourceId);
TbResourceId resourceId = new TbResourceId(toUUID(strResourceId));
diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
index 288828f046..9ca600603c 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
@@ -24,10 +24,14 @@ import com.google.common.util.concurrent.MoreExecutors;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import com.google.gson.JsonParser;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -48,7 +52,8 @@ import org.thingsboard.common.util.ThingsBoardThreadFactory;
import org.thingsboard.server.common.data.kv.AggregationParams;
import org.thingsboard.server.common.data.kv.IntervalType;
import org.thingsboard.server.common.msg.rule.engine.DeviceAttributesEventNotificationMsg;
-import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.adaptor.JsonConverter;
+import org.thingsboard.server.common.data.AttributeScope;
import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.StringUtils;
import org.thingsboard.server.common.data.TenantProfile;
@@ -76,7 +81,8 @@ import org.thingsboard.server.common.data.kv.ReadTsKvQuery;
import org.thingsboard.server.common.data.kv.StringDataEntry;
import org.thingsboard.server.common.data.kv.TsKvEntry;
import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
-import org.thingsboard.server.common.adaptor.JsonConverter;
+import org.thingsboard.server.common.msg.rule.engine.DeviceAttributesEventNotificationMsg;
+import org.thingsboard.server.config.annotations.ApiOperation;
import org.thingsboard.server.dao.timeseries.TimeseriesService;
import org.thingsboard.server.exception.InvalidParametersException;
import org.thingsboard.server.exception.UncheckedApiException;
@@ -87,9 +93,6 @@ import org.thingsboard.server.service.security.permission.Operation;
import org.thingsboard.server.service.telemetry.AttributeData;
import org.thingsboard.server.service.telemetry.TsData;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashMap;
@@ -102,8 +105,6 @@ import java.util.stream.Collectors;
import static org.thingsboard.server.controller.ControllerConstants.ATTRIBUTES_JSON_REQUEST_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.ATTRIBUTES_KEYS_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.ATTRIBUTES_SAVE_SCOPE_ALLOWED_VALUES;
-import static org.thingsboard.server.controller.ControllerConstants.ATTRIBUTES_SCOPE_ALLOWED_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.ATTRIBUTES_SCOPE_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.ATTRIBUTE_DATA_EXAMPLE;
import static org.thingsboard.server.controller.ControllerConstants.DEVICE_ID;
@@ -128,7 +129,6 @@ import static org.thingsboard.server.controller.ControllerConstants.SAVE_ENTITY_
import static org.thingsboard.server.controller.ControllerConstants.SAVE_ENTITY_TIMESERIES_STATUS_OK;
import static org.thingsboard.server.controller.ControllerConstants.SAVE_ENTITY_TIMESERIES_STATUS_UNAUTHORIZED;
import static org.thingsboard.server.controller.ControllerConstants.SAVE_TIMESERIES_REQUEST_PAYLOAD;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.STRICT_DATA_TYPES_DESCRIPTION;
import static org.thingsboard.server.controller.ControllerConstants.TELEMETRY_JSON_REQUEST_DESCRIPTION;
@@ -178,13 +178,13 @@ public class TelemetryController extends BaseController {
"\n * CLIENT_SCOPE - supported for devices;" +
"\n * SHARED_SCOPE - supported for devices. "
+ "\n\n" + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/{entityType}/{entityId}/keys/attributes", method = RequestMethod.GET)
@ResponseBody
public DeferredResult getAttributeKeys(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr) throws ThingsboardException {
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr) throws ThingsboardException {
return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr, this::getAttributeKeysCallback);
}
@@ -194,14 +194,14 @@ public class TelemetryController extends BaseController {
"\n * CLIENT_SCOPE - supported for devices;" +
"\n * SHARED_SCOPE - supported for devices. "
+ "\n\n" + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/{entityType}/{entityId}/keys/attributes/{scope}", method = RequestMethod.GET)
@ResponseBody
public DeferredResult getAttributeKeysByScope(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
- @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, required = true, allowableValues = ATTRIBUTES_SCOPE_ALLOWED_VALUES) @PathVariable("scope") String scope) throws ThingsboardException {
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
+ @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, required = true, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"})) @PathVariable("scope") AttributeScope scope) throws ThingsboardException {
return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
(result, tenantId, entityId) -> getAttributeKeysCallback(result, tenantId, entityId, scope));
}
@@ -213,14 +213,14 @@ public class TelemetryController extends BaseController {
+ ATTRIBUTE_DATA_EXAMPLE
+ MARKDOWN_CODE_BLOCK_END
+ "\n\n " + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/{entityType}/{entityId}/values/attributes", method = RequestMethod.GET)
@ResponseBody
public DeferredResult getAttributes(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
- @ApiParam(value = ATTRIBUTES_KEYS_DESCRIPTION) @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException {
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
+ @Parameter(description = ATTRIBUTES_KEYS_DESCRIPTION) @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException {
SecurityUser user = getCurrentUser();
return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
(result, tenantId, entityId) -> getAttributeValuesCallback(result, user, entityId, null, keysStr));
@@ -236,15 +236,15 @@ public class TelemetryController extends BaseController {
+ ATTRIBUTE_DATA_EXAMPLE
+ MARKDOWN_CODE_BLOCK_END
+ "\n\n " + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/{entityType}/{entityId}/values/attributes/{scope}", method = RequestMethod.GET)
@ResponseBody
public DeferredResult getAttributesByScope(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
- @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, allowableValues = ATTRIBUTES_SCOPE_ALLOWED_VALUES, required = true) @PathVariable("scope") String scope,
- @ApiParam(value = ATTRIBUTES_KEYS_DESCRIPTION) @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException {
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
+ @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, required = true)) @PathVariable("scope") AttributeScope scope,
+ @Parameter(description = ATTRIBUTES_KEYS_DESCRIPTION) @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException {
SecurityUser user = getCurrentUser();
return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
(result, tenantId, entityId) -> getAttributeValuesCallback(result, user, entityId, scope, keysStr));
@@ -253,13 +253,13 @@ public class TelemetryController extends BaseController {
@ApiOperation(value = "Get time-series keys (getTimeseriesKeys)",
notes = "Returns a set of unique time-series key names for the selected entity. " +
"\n\n" + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/{entityType}/{entityId}/keys/timeseries", method = RequestMethod.GET)
@ResponseBody
public DeferredResult getTimeseriesKeys(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr) throws ThingsboardException {
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr) throws ThingsboardException {
return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_TELEMETRY, entityType, entityIdStr,
(result, tenantId, entityId) -> Futures.addCallback(tsService.findAllLatest(tenantId, entityId), getTsKeysToResponseCallback(result), MoreExecutors.directExecutor()));
}
@@ -276,15 +276,15 @@ public class TelemetryController extends BaseController {
+ LATEST_TS_STRICT_DATA_EXAMPLE
+ MARKDOWN_CODE_BLOCK_END
+ "\n\n " + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/{entityType}/{entityId}/values/timeseries", method = RequestMethod.GET)
@ResponseBody
public DeferredResult getLatestTimeseries(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
- @ApiParam(value = TELEMETRY_KEYS_DESCRIPTION) @RequestParam(name = "keys", required = false) String keysStr,
- @ApiParam(value = STRICT_DATA_TYPES_DESCRIPTION)
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
+ @Parameter(description = TELEMETRY_KEYS_DESCRIPTION) @RequestParam(name = "keys", required = false) String keysStr,
+ @Parameter(description = STRICT_DATA_TYPES_DESCRIPTION)
@RequestParam(name = "useStrictDataTypes", required = false, defaultValue = "false") Boolean useStrictDataTypes) throws ThingsboardException {
SecurityUser user = getCurrentUser();
return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_TELEMETRY, entityType, entityIdStr,
@@ -300,34 +300,34 @@ public class TelemetryController extends BaseController {
+ TS_STRICT_DATA_EXAMPLE
+ MARKDOWN_CODE_BLOCK_END
+ "\n\n" + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/{entityType}/{entityId}/values/timeseries", method = RequestMethod.GET, params = {"keys", "startTs", "endTs"})
@ResponseBody
public DeferredResult getTimeseries(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
- @ApiParam(value = TELEMETRY_KEYS_BASE_DESCRIPTION, required = true) @RequestParam(name = "keys") String keys,
- @ApiParam(value = "A long value representing the start timestamp of the time range in milliseconds, UTC.")
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
+ @Parameter(description = TELEMETRY_KEYS_BASE_DESCRIPTION, required = true) @RequestParam(name = "keys") String keys,
+ @Parameter(description = "A long value representing the start timestamp of the time range in milliseconds, UTC.")
@RequestParam(name = "startTs") Long startTs,
- @ApiParam(value = "A long value representing the end timestamp of the time range in milliseconds, UTC.")
+ @Parameter(description = "A long value representing the end timestamp of the time range in milliseconds, UTC.")
@RequestParam(name = "endTs") Long endTs,
- @ApiParam(value = "A string value representing the type fo the interval.", allowableValues = "MILLISECONDS, WEEK, WEEK_ISO, MONTH, QUARTER")
+ @Parameter(description = "A string value representing the type fo the interval.", schema = @Schema(allowableValues = {"MILLISECONDS", "WEEK", "WEEK_ISO", "MONTH", "QUARTER"}))
@RequestParam(name = "intervalType", required = false) IntervalType intervalType,
- @ApiParam(value = "A long value representing the aggregation interval range in milliseconds.")
+ @Parameter(description = "A long value representing the aggregation interval range in milliseconds.")
@RequestParam(name = "interval", defaultValue = "0") Long interval,
- @ApiParam(value = "A string value representing the timezone that will be used to calculate exact timestamps for 'WEEK', 'WEEK_ISO', 'MONTH' and 'QUARTER' interval types.")
+ @Parameter(description = "A string value representing the timezone that will be used to calculate exact timestamps for 'WEEK', 'WEEK_ISO', 'MONTH' and 'QUARTER' interval types.")
@RequestParam(name = "timeZone", required = false) String timeZone,
- @ApiParam(value = "An integer value that represents a max number of timeseries data points to fetch." +
- " This parameter is used only in the case if 'agg' parameter is set to 'NONE'.", defaultValue = "100")
+ @Parameter(description = "An integer value that represents a max number of timeseries data points to fetch." +
+ " This parameter is used only in the case if 'agg' parameter is set to 'NONE'.", schema = @Schema(defaultValue = "100"))
@RequestParam(name = "limit", defaultValue = "100") Integer limit,
- @ApiParam(value = "A string value representing the aggregation function. " +
+ @Parameter(description = "A string value representing the aggregation function. " +
"If the interval is not specified, 'agg' parameter will use 'NONE' value.",
- allowableValues = "MIN, MAX, AVG, SUM, COUNT, NONE")
+ schema = @Schema(allowableValues = {"MIN", "MAX", "AVG", "SUM", "COUNT", "NONE"}))
@RequestParam(name = "agg", defaultValue = "NONE") String aggStr,
- @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+ @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
@RequestParam(name = "orderBy", defaultValue = "DESC") String orderBy,
- @ApiParam(value = STRICT_DATA_TYPES_DESCRIPTION)
+ @Parameter(description = STRICT_DATA_TYPES_DESCRIPTION)
@RequestParam(name = "useStrictDataTypes", required = false, defaultValue = "false") Boolean useStrictDataTypes) throws ThingsboardException {
return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_TELEMETRY, entityType, entityIdStr,
(result, tenantId, entityId) -> {
@@ -349,23 +349,23 @@ public class TelemetryController extends BaseController {
notes = "Creates or updates the device attributes based on device id and specified attribute scope. " +
SAVE_ATTRIBUTES_REQUEST_PAYLOAD
+ TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@ApiResponses(value = {
- @ApiResponse(code = 200, message = SAVE_ATTIRIBUTES_STATUS_OK +
+ @ApiResponse(responseCode = "200", description = SAVE_ATTIRIBUTES_STATUS_OK +
"Platform creates an audit log event about device attributes updates with action type 'ATTRIBUTES_UPDATED', " +
"and also sends event msg to the rule engine with msg type 'ATTRIBUTES_UPDATED'."),
- @ApiResponse(code = 400, message = SAVE_ATTIRIBUTES_STATUS_BAD_REQUEST),
- @ApiResponse(code = 401, message = "User is not authorized to save device attributes for selected device. Most likely, User belongs to different Customer or Tenant."),
- @ApiResponse(code = 500, message = "The exception was thrown during processing the request. " +
+ @ApiResponse(responseCode = "400", description = SAVE_ATTIRIBUTES_STATUS_BAD_REQUEST),
+ @ApiResponse(responseCode = "401", description = "User is not authorized to save device attributes for selected device. Most likely, User belongs to different Customer or Tenant."),
+ @ApiResponse(responseCode = "500", description = "The exception was thrown during processing the request. " +
"Platform creates an audit log event about device attributes updates with action type 'ATTRIBUTES_UPDATED' that includes an error stacktrace."),
})
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/{deviceId}/{scope}", method = RequestMethod.POST)
@ResponseBody
public DeferredResult saveDeviceAttributes(
- @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION, required = true) @PathVariable("deviceId") String deviceIdStr,
- @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, allowableValues = ATTRIBUTES_SAVE_SCOPE_ALLOWED_VALUES, required = true) @PathVariable("scope") String scope,
- @ApiParam(value = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
+ @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION, required = true) @PathVariable("deviceId") String deviceIdStr,
+ @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, required = true)) @PathVariable("scope") AttributeScope scope,
+ @Parameter(description = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
EntityId entityId = EntityIdFactory.getByTypeAndUuid(EntityType.DEVICE, deviceIdStr);
return saveAttributes(getTenantId(), entityId, scope, request);
}
@@ -375,21 +375,21 @@ public class TelemetryController extends BaseController {
ENTITY_SAVE_ATTRIBUTE_SCOPES +
SAVE_ATTRIBUTES_REQUEST_PAYLOAD
+ INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@ApiResponses(value = {
- @ApiResponse(code = 200, message = SAVE_ATTIRIBUTES_STATUS_OK + SAVE_ENTITY_ATTRIBUTES_STATUS_OK),
- @ApiResponse(code = 400, message = SAVE_ATTIRIBUTES_STATUS_BAD_REQUEST),
- @ApiResponse(code = 401, message = SAVE_ENTITY_ATTRIBUTES_STATUS_UNAUTHORIZED),
- @ApiResponse(code = 500, message = SAVE_ENTITY_ATTRIBUTES_STATUS_INTERNAL_SERVER_ERROR),
+ @ApiResponse(responseCode = "200", description = SAVE_ATTIRIBUTES_STATUS_OK + SAVE_ENTITY_ATTRIBUTES_STATUS_OK),
+ @ApiResponse(responseCode = "400", description = SAVE_ATTIRIBUTES_STATUS_BAD_REQUEST),
+ @ApiResponse(responseCode = "401", description = SAVE_ENTITY_ATTRIBUTES_STATUS_UNAUTHORIZED),
+ @ApiResponse(responseCode = "500", description = SAVE_ENTITY_ATTRIBUTES_STATUS_INTERNAL_SERVER_ERROR),
})
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/{entityType}/{entityId}/{scope}", method = RequestMethod.POST)
@ResponseBody
public DeferredResult saveEntityAttributesV1(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
- @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, allowableValues = ATTRIBUTES_SAVE_SCOPE_ALLOWED_VALUES) @PathVariable("scope") String scope,
- @ApiParam(value = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
+ @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"})) @PathVariable("scope")AttributeScope scope,
+ @Parameter(description = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true)@RequestBody JsonNode request) throws ThingsboardException {
EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
return saveAttributes(getTenantId(), entityId, scope, request);
}
@@ -399,21 +399,21 @@ public class TelemetryController extends BaseController {
ENTITY_SAVE_ATTRIBUTE_SCOPES +
SAVE_ATTRIBUTES_REQUEST_PAYLOAD
+ INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@ApiResponses(value = {
- @ApiResponse(code = 200, message = SAVE_ATTIRIBUTES_STATUS_OK + SAVE_ENTITY_ATTRIBUTES_STATUS_OK),
- @ApiResponse(code = 400, message = SAVE_ATTIRIBUTES_STATUS_BAD_REQUEST),
- @ApiResponse(code = 401, message = SAVE_ENTITY_ATTRIBUTES_STATUS_UNAUTHORIZED),
- @ApiResponse(code = 500, message = SAVE_ENTITY_ATTRIBUTES_STATUS_INTERNAL_SERVER_ERROR),
+ @ApiResponse(responseCode = "200", description = SAVE_ATTIRIBUTES_STATUS_OK + SAVE_ENTITY_ATTRIBUTES_STATUS_OK),
+ @ApiResponse(responseCode = "400", description = SAVE_ATTIRIBUTES_STATUS_BAD_REQUEST),
+ @ApiResponse(responseCode = "401", description = SAVE_ENTITY_ATTRIBUTES_STATUS_UNAUTHORIZED),
+ @ApiResponse(responseCode = "500", description = SAVE_ENTITY_ATTRIBUTES_STATUS_INTERNAL_SERVER_ERROR),
})
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/{entityType}/{entityId}/attributes/{scope}", method = RequestMethod.POST)
@ResponseBody
public DeferredResult saveEntityAttributesV2(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
- @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, allowableValues = ATTRIBUTES_SAVE_SCOPE_ALLOWED_VALUES, required = true) @PathVariable("scope") String scope,
- @ApiParam(value = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
+ @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, required = true)) @PathVariable("scope")AttributeScope scope,
+ @Parameter(description = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true)@RequestBody JsonNode request) throws ThingsboardException {
EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
return saveAttributes(getTenantId(), entityId, scope, request);
}
@@ -424,21 +424,21 @@ public class TelemetryController extends BaseController {
SAVE_TIMESERIES_REQUEST_PAYLOAD +
"\n\n The scope parameter is not used in the API call implementation but should be specified whatever value because it is used as a path variable. "
+ INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@ApiResponses(value = {
- @ApiResponse(code = 200, message = SAVE_ENTITY_TIMESERIES_STATUS_OK),
- @ApiResponse(code = 400, message = INVALID_STRUCTURE_OF_THE_REQUEST),
- @ApiResponse(code = 401, message = SAVE_ENTITY_TIMESERIES_STATUS_UNAUTHORIZED),
- @ApiResponse(code = 500, message = SAVE_ENTITY_TIMESERIES_STATUS_INTERNAL_SERVER_ERROR),
+ @ApiResponse(responseCode = "200", description = SAVE_ENTITY_TIMESERIES_STATUS_OK),
+ @ApiResponse(responseCode = "400", description = INVALID_STRUCTURE_OF_THE_REQUEST),
+ @ApiResponse(responseCode = "401", description = SAVE_ENTITY_TIMESERIES_STATUS_UNAUTHORIZED),
+ @ApiResponse(responseCode = "500", description = SAVE_ENTITY_TIMESERIES_STATUS_INTERNAL_SERVER_ERROR),
})
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/{entityType}/{entityId}/timeseries/{scope}", method = RequestMethod.POST)
@ResponseBody
public DeferredResult saveEntityTelemetry(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
- @ApiParam(value = TELEMETRY_SCOPE_DESCRIPTION, required = true, allowableValues = "ANY") @PathVariable("scope") String scope,
- @ApiParam(value = TELEMETRY_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody String requestBody) throws ThingsboardException {
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
+ @Parameter(description = TELEMETRY_SCOPE_DESCRIPTION, required = true, schema = @Schema(allowableValues = "ANY")) @PathVariable("scope")String scope,
+ @Parameter(description = TELEMETRY_JSON_REQUEST_DESCRIPTION, required = true)@RequestBody String requestBody) throws ThingsboardException {
EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
return saveTelemetry(getTenantId(), entityId, requestBody, 0L);
}
@@ -449,22 +449,22 @@ public class TelemetryController extends BaseController {
"\n\n The scope parameter is not used in the API call implementation but should be specified whatever value because it is used as a path variable. "
+ "\n\nThe ttl parameter takes affect only in case of Cassandra DB."
+ INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@ApiResponses(value = {
- @ApiResponse(code = 200, message = SAVE_ENTITY_TIMESERIES_STATUS_OK),
- @ApiResponse(code = 400, message = INVALID_STRUCTURE_OF_THE_REQUEST),
- @ApiResponse(code = 401, message = SAVE_ENTITY_TIMESERIES_STATUS_UNAUTHORIZED),
- @ApiResponse(code = 500, message = SAVE_ENTITY_TIMESERIES_STATUS_INTERNAL_SERVER_ERROR),
+ @ApiResponse(responseCode = "200", description = SAVE_ENTITY_TIMESERIES_STATUS_OK),
+ @ApiResponse(responseCode = "400", description = INVALID_STRUCTURE_OF_THE_REQUEST),
+ @ApiResponse(responseCode = "401", description = SAVE_ENTITY_TIMESERIES_STATUS_UNAUTHORIZED),
+ @ApiResponse(responseCode = "500", description = SAVE_ENTITY_TIMESERIES_STATUS_INTERNAL_SERVER_ERROR),
})
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/{entityType}/{entityId}/timeseries/{scope}/{ttl}", method = RequestMethod.POST)
@ResponseBody
public DeferredResult saveEntityTelemetryWithTTL(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
- @ApiParam(value = TELEMETRY_SCOPE_DESCRIPTION, required = true, allowableValues = "ANY") @PathVariable("scope") String scope,
- @ApiParam(value = "A long value representing TTL (Time to Live) parameter.", required = true) @PathVariable("ttl") Long ttl,
- @ApiParam(value = TELEMETRY_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody String requestBody) throws ThingsboardException {
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
+ @Parameter(description = TELEMETRY_SCOPE_DESCRIPTION, required = true, schema = @Schema(allowableValues = "ANY")) @PathVariable("scope")AttributeScope scope,
+ @Parameter(description = "A long value representing TTL (Time to Live) parameter.", required = true)@PathVariable("ttl")Long ttl,
+ @Parameter(description = TELEMETRY_JSON_REQUEST_DESCRIPTION, required = true)@RequestBody String requestBody) throws ThingsboardException {
EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
return saveTelemetry(getTenantId(), entityId, requestBody, ttl);
}
@@ -477,31 +477,31 @@ public class TelemetryController extends BaseController {
" Use 'rewriteLatestIfDeleted' to rewrite latest value (stored in separate table for performance) if the value's timestamp matches the time-range and 'deleteLatest' param is true." +
" The replacement value will be fetched from the 'time-series' table, and its timestamp will be the most recent one before the defined time-range. " +
TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@ApiResponses(value = {
- @ApiResponse(code = 200, message = "Timeseries for the selected keys in the request was removed. " +
+ @ApiResponse(responseCode = "200", description = "Timeseries for the selected keys in the request was removed. " +
"Platform creates an audit log event about entity timeseries removal with action type 'TIMESERIES_DELETED'."),
- @ApiResponse(code = 400, message = "Platform returns a bad request in case if keys list is empty or start and end timestamp values is empty when deleteAllDataForKeys is set to false."),
- @ApiResponse(code = 401, message = "User is not authorized to delete entity timeseries for selected entity. Most likely, User belongs to different Customer or Tenant."),
- @ApiResponse(code = 500, message = "The exception was thrown during processing the request. " +
+ @ApiResponse(responseCode = "400", description = "Platform returns a bad request in case if keys list is empty or start and end timestamp values is empty when deleteAllDataForKeys is set to false."),
+ @ApiResponse(responseCode = "401", description = "User is not authorized to delete entity timeseries for selected entity. Most likely, User belongs to different Customer or Tenant."),
+ @ApiResponse(responseCode = "500", description = "The exception was thrown during processing the request. " +
"Platform creates an audit log event about entity timeseries removal with action type 'TIMESERIES_DELETED' that includes an error stacktrace."),
})
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/{entityType}/{entityId}/timeseries/delete", method = RequestMethod.DELETE)
@ResponseBody
public DeferredResult deleteEntityTimeseries(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
- @ApiParam(value = TELEMETRY_KEYS_DESCRIPTION, required = true) @RequestParam(name = "keys") String keysStr,
- @ApiParam(value = "A boolean value to specify if should be deleted all data for selected keys or only data that are in the selected time range.")
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
+ @Parameter(description = TELEMETRY_KEYS_DESCRIPTION, required = true) @RequestParam(name = "keys") String keysStr,
+ @Parameter(description = "A boolean value to specify if should be deleted all data for selected keys or only data that are in the selected time range.")
@RequestParam(name = "deleteAllDataForKeys", defaultValue = "false") boolean deleteAllDataForKeys,
- @ApiParam(value = "A long value representing the start timestamp of removal time range in milliseconds.")
+ @Parameter(description = "A long value representing the start timestamp of removal time range in milliseconds.")
@RequestParam(name = "startTs", required = false) Long startTs,
- @ApiParam(value = "A long value representing the end timestamp of removal time range in milliseconds.")
+ @Parameter(description = "A long value representing the end timestamp of removal time range in milliseconds.")
@RequestParam(name = "endTs", required = false) Long endTs,
- @ApiParam(value = "If the parameter is set to true, the latest telemetry can be removed, otherwise, in case that parameter is set to false the latest value will not removed.")
+ @Parameter(description = "If the parameter is set to true, the latest telemetry can be removed, otherwise, in case that parameter is set to false the latest value will not removed.")
@RequestParam(name = "deleteLatest", required = false, defaultValue = "true") boolean deleteLatest,
- @ApiParam(value = "If the parameter is set to true, the latest telemetry will be rewritten in case that current latest value was removed, otherwise, in case that parameter is set to false the new latest value will not set.")
+ @Parameter(description = "If the parameter is set to true, the latest telemetry will be rewritten in case that current latest value was removed, otherwise, in case that parameter is set to false the new latest value will not set.")
@RequestParam(name = "rewriteLatestIfDeleted", defaultValue = "false") boolean rewriteLatestIfDeleted) throws ThingsboardException {
EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
return deleteTimeseries(entityId, keysStr, deleteAllDataForKeys, startTs, endTs, rewriteLatestIfDeleted, deleteLatest);
@@ -553,22 +553,22 @@ public class TelemetryController extends BaseController {
@ApiOperation(value = "Delete device attributes (deleteDeviceAttributes)",
notes = "Delete device attributes using provided Device Id, scope and a list of keys. " +
"Referencing a non-existing Device Id will cause an error" + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@ApiResponses(value = {
- @ApiResponse(code = 200, message = "Device attributes was removed for the selected keys in the request. " +
+ @ApiResponse(responseCode = "200", description = "Device attributes was removed for the selected keys in the request. " +
"Platform creates an audit log event about device attributes removal with action type 'ATTRIBUTES_DELETED'."),
- @ApiResponse(code = 400, message = "Platform returns a bad request in case if keys or scope are not specified."),
- @ApiResponse(code = 401, message = "User is not authorized to delete device attributes for selected entity. Most likely, User belongs to different Customer or Tenant."),
- @ApiResponse(code = 500, message = "The exception was thrown during processing the request. " +
+ @ApiResponse(responseCode = "400", description = "Platform returns a bad request in case if keys or scope are not specified."),
+ @ApiResponse(responseCode = "401", description = "User is not authorized to delete device attributes for selected entity. Most likely, User belongs to different Customer or Tenant."),
+ @ApiResponse(responseCode = "500", description = "The exception was thrown during processing the request. " +
"Platform creates an audit log event about device attributes removal with action type 'ATTRIBUTES_DELETED' that includes an error stacktrace."),
})
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/{deviceId}/{scope}", method = RequestMethod.DELETE)
@ResponseBody
public DeferredResult deleteDeviceAttributes(
- @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION, required = true) @PathVariable(DEVICE_ID) String deviceIdStr,
- @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, allowableValues = ATTRIBUTES_SCOPE_ALLOWED_VALUES, required = true) @PathVariable("scope") String scope,
- @ApiParam(value = ATTRIBUTES_KEYS_DESCRIPTION, required = true) @RequestParam(name = "keys") String keysStr) throws ThingsboardException {
+ @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION, required = true) @PathVariable(DEVICE_ID) String deviceIdStr,
+ @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, required = true)) @PathVariable("scope")AttributeScope scope,
+ @Parameter(description = ATTRIBUTES_KEYS_DESCRIPTION, required = true)@RequestParam(name = "keys")String keysStr) throws ThingsboardException {
EntityId entityId = EntityIdFactory.getByTypeAndUuid(EntityType.DEVICE, deviceIdStr);
return deleteAttributes(entityId, scope, keysStr);
}
@@ -576,64 +576,58 @@ public class TelemetryController extends BaseController {
@ApiOperation(value = "Delete entity attributes (deleteEntityAttributes)",
notes = "Delete entity attributes using provided Entity Id, scope and a list of keys. " +
INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
- produces = MediaType.APPLICATION_JSON_VALUE)
+ responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
@ApiResponses(value = {
- @ApiResponse(code = 200, message = "Entity attributes was removed for the selected keys in the request. " +
+ @ApiResponse(responseCode = "200", description = "Entity attributes was removed for the selected keys in the request. " +
"Platform creates an audit log event about entity attributes removal with action type 'ATTRIBUTES_DELETED'."),
- @ApiResponse(code = 400, message = "Platform returns a bad request in case if keys or scope are not specified."),
- @ApiResponse(code = 401, message = "User is not authorized to delete entity attributes for selected entity. Most likely, User belongs to different Customer or Tenant."),
- @ApiResponse(code = 500, message = "The exception was thrown during processing the request. " +
+ @ApiResponse(responseCode = "400", description = "Platform returns a bad request in case if keys or scope are not specified."),
+ @ApiResponse(responseCode = "401", description = "User is not authorized to delete entity attributes for selected entity. Most likely, User belongs to different Customer or Tenant."),
+ @ApiResponse(responseCode = "500", description = "The exception was thrown during processing the request. " +
"Platform creates an audit log event about entity attributes removal with action type 'ATTRIBUTES_DELETED' that includes an error stacktrace."),
})
@PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@RequestMapping(value = "/{entityType}/{entityId}/{scope}", method = RequestMethod.DELETE)
@ResponseBody
public DeferredResult deleteEntityAttributes(
- @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
- @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
- @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, required = true, allowableValues = ATTRIBUTES_SCOPE_ALLOWED_VALUES) @PathVariable("scope") String scope,
- @ApiParam(value = ATTRIBUTES_KEYS_DESCRIPTION, required = true) @RequestParam(name = "keys") String keysStr) throws ThingsboardException {
+ @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
+ @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
+ @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, required = true, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"})) @PathVariable("scope")AttributeScope scope,
+ @Parameter(description = ATTRIBUTES_KEYS_DESCRIPTION, required = true)@RequestParam(name = "keys")String keysStr) throws ThingsboardException {
EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
return deleteAttributes(entityId, scope, keysStr);
}
- private DeferredResult deleteAttributes(EntityId entityIdSrc, String scope, String keysStr) throws ThingsboardException {
+ private DeferredResult deleteAttributes(EntityId entityIdSrc, AttributeScope scope, String keysStr) throws ThingsboardException {
List keys = toKeysList(keysStr);
if (keys.isEmpty()) {
return getImmediateDeferredResult("Empty keys: " + keysStr, HttpStatus.BAD_REQUEST);
}
SecurityUser user = getCurrentUser();
- if (DataConstants.SERVER_SCOPE.equals(scope) ||
- DataConstants.SHARED_SCOPE.equals(scope) ||
- DataConstants.CLIENT_SCOPE.equals(scope)) {
- return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.WRITE_ATTRIBUTES, entityIdSrc, (result, tenantId, entityId) -> {
- tsSubService.deleteAndNotify(tenantId, entityId, scope, keys, new FutureCallback() {
- @Override
- public void onSuccess(@Nullable Void tmp) {
- logAttributesDeleted(user, entityId, scope, keys, null);
- if (entityIdSrc.getEntityType().equals(EntityType.DEVICE)) {
- DeviceId deviceId = new DeviceId(entityId.getId());
- tbClusterService.pushMsgToCore(DeviceAttributesEventNotificationMsg.onDelete(
- user.getTenantId(), deviceId, scope, keys), null);
- }
- result.setResult(new ResponseEntity<>(HttpStatus.OK));
+ return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.WRITE_ATTRIBUTES, entityIdSrc, (result, tenantId, entityId) -> {
+ tsSubService.deleteAndNotify(tenantId, entityId, scope.name(), keys, new FutureCallback() {
+ @Override
+ public void onSuccess(@Nullable Void tmp) {
+ logAttributesDeleted(user, entityId, scope, keys, null);
+ if (entityIdSrc.getEntityType().equals(EntityType.DEVICE)) {
+ DeviceId deviceId = new DeviceId(entityId.getId());
+ tbClusterService.pushMsgToCore(DeviceAttributesEventNotificationMsg.onDelete(
+ user.getTenantId(), deviceId, scope.name(), keys), null);
}
+ result.setResult(new ResponseEntity<>(HttpStatus.OK));
+ }
- @Override
- public void onFailure(Throwable t) {
- logAttributesDeleted(user, entityId, scope, keys, t);
- result.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
- }
- });
+ @Override
+ public void onFailure(Throwable t) {
+ logAttributesDeleted(user, entityId, scope, keys, t);
+ result.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
+ }
});
- } else {
- return getImmediateDeferredResult("Invalid attribute scope: " + scope, HttpStatus.BAD_REQUEST);
- }
+ });
}
- private DeferredResult saveAttributes(TenantId srcTenantId, EntityId entityIdSrc, String scope, JsonNode json) throws ThingsboardException {
- if (!DataConstants.SERVER_SCOPE.equals(scope) && !DataConstants.SHARED_SCOPE.equals(scope)) {
+ private DeferredResult saveAttributes(TenantId srcTenantId, EntityId entityIdSrc, AttributeScope scope, JsonNode json) throws ThingsboardException {
+ if (AttributeScope.SERVER_SCOPE != scope && AttributeScope.SHARED_SCOPE != scope) {
return getImmediateDeferredResult("Invalid scope: " + scope, HttpStatus.BAD_REQUEST);
}
if (json.isObject()) {
@@ -722,10 +716,10 @@ public class TelemetryController extends BaseController {
Futures.addCallback(future, getTsKvListCallback(result, useStrictDataTypes), MoreExecutors.directExecutor());
}
- private void getAttributeValuesCallback(@Nullable DeferredResult result, SecurityUser user, EntityId entityId, String scope, String keys) {
+ private void getAttributeValuesCallback(@Nullable DeferredResult result, SecurityUser user, EntityId entityId, AttributeScope scope, String keys) {
List keyList = toKeysList(keys);
FutureCallback> callback = getAttributeValuesToResponseCallback(result, user, scope, entityId, keyList);
- if (!StringUtils.isEmpty(scope)) {
+ if (scope != null) {
if (keyList != null && !keyList.isEmpty()) {
Futures.addCallback(attributesService.find(user.getTenantId(), entityId, scope, keyList), callback, MoreExecutors.directExecutor());
} else {
@@ -733,7 +727,7 @@ public class TelemetryController extends BaseController {
}
} else {
List>> futures = new ArrayList<>();
- for (String tmpScope : DataConstants.allScopes()) {
+ for (AttributeScope tmpScope : AttributeScope.values()) {
if (keyList != null && !keyList.isEmpty()) {
futures.add(attributesService.find(user.getTenantId(), entityId, tmpScope, keyList));
} else {
@@ -747,13 +741,13 @@ public class TelemetryController extends BaseController {
}
}
- private void getAttributeKeysCallback(@Nullable DeferredResult result, TenantId tenantId, EntityId entityId, String scope) {
+ private void getAttributeKeysCallback(@Nullable DeferredResult result, TenantId tenantId, EntityId entityId, AttributeScope scope) {
Futures.addCallback(attributesService.findAll(tenantId, entityId, scope), getAttributeKeysToResponseCallback(result), MoreExecutors.directExecutor());
}
private void getAttributeKeysCallback(@Nullable DeferredResult result, TenantId tenantId, EntityId entityId) {
List>> futures = new ArrayList<>();
- for (String scope : DataConstants.allScopes()) {
+ for (AttributeScope scope : AttributeScope.values()) {
futures.add(attributesService.findAll(tenantId, entityId, scope));
}
@@ -796,7 +790,7 @@ public class TelemetryController extends BaseController {
}
private FutureCallback> getAttributeValuesToResponseCallback(final DeferredResult response,
- final SecurityUser user, final String scope,
+ final SecurityUser user, final AttributeScope scope,
final EntityId entityId, final List keyList) {
return new FutureCallback<>() {
@Override
@@ -838,28 +832,28 @@ public class TelemetryController extends BaseController {
}
private void logTimeseriesDeleted(SecurityUser user, EntityId entityId, List keys, long startTs, long endTs, Throwable e) {
- notificationEntityService.logEntityAction(user.getTenantId(), entityId, ActionType.TIMESERIES_DELETED, user,
+ logEntityActionService.logEntityAction(user.getTenantId(), entityId, ActionType.TIMESERIES_DELETED, user,
toException(e), keys, startTs, endTs);
}
private void logTelemetryUpdated(SecurityUser user, EntityId entityId, List telemetry, Throwable e) {
- notificationEntityService.logEntityAction(user.getTenantId(), entityId, ActionType.TIMESERIES_UPDATED, user,
+ logEntityActionService.logEntityAction(user.getTenantId(), entityId, ActionType.TIMESERIES_UPDATED, user,
toException(e), telemetry);
}
- private void logAttributesDeleted(SecurityUser user, EntityId entityId, String scope, List keys, Throwable e) {
- notificationEntityService.logEntityAction(user.getTenantId(), (UUIDBased & EntityId) entityId,
+ private void logAttributesDeleted(SecurityUser user, EntityId entityId, AttributeScope scope, List keys, Throwable e) {
+ logEntityActionService.logEntityAction(user.getTenantId(), (UUIDBased & EntityId) entityId,
ActionType.ATTRIBUTES_DELETED, user, toException(e), scope, keys);
}
- private void logAttributesUpdated(SecurityUser user, EntityId entityId, String scope, List attributes, Throwable e) {
- notificationEntityService.logEntityAction(user.getTenantId(), entityId, ActionType.ATTRIBUTES_UPDATED, user,
+ private void logAttributesUpdated(SecurityUser user, EntityId entityId, AttributeScope scope, List attributes, Throwable e) {
+ logEntityActionService.logEntityAction(user.getTenantId(), entityId, ActionType.ATTRIBUTES_UPDATED, user,
toException(e), scope, attributes);
}
- private void logAttributesRead(SecurityUser user, EntityId entityId, String scope, List