diff --git a/.idea/httpRequests/http-requests-log.http b/.idea/httpRequests/http-requests-log.http deleted file mode 100644 index 79f18e1..0000000 --- a/.idea/httpRequests/http-requests-log.http +++ /dev/null @@ -1,1135 +0,0 @@ -GET http://localhost:9601/monitorPlatform/monitorPercentage -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -<> 2023-09-14T085602.200.json - -### - -GET http://localhost:9601/monitorPlatform/monitorUnitPercentage -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -<> 2023-09-14T085533.200.json - -### - -POST http://localhost:9601/monitorPlatform/treeList -Content-Length: 0 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -<> 2023-09-14T085526.200.json - -### - -POST http://localhost:9602/tdengine/addSuperTableColumn -Content-Type: application/json -Content-Length: 148 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_scene_1", - "superTableName": "st_ds34", - "field": { - "fieldName": "ttttt", - "dataTypeCode": 10, - "size":100 - } -} - -<> 2023-09-13T172758.200.json - -### - -POST http://localhost:9602/tdengine/addSuperTableColumn -Content-Type: application/json -Content-Length: 149 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_scene_1", - "superTableName": "st_ds_34", - "field": { - "fieldName": "ttttt", - "dataTypeCode": 10, - "size":100 - } -} - -<> 2023-09-13T172744.200.json - -### - -POST http://localhost:9602/tdengine/dropSuperTableColumn -Content-Type: application/json -Content-Length: 110 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{"databaseName":"db_scene_1", - "superTableName":"st_devicemode_37", - "field": { - "fieldName": "ddd" - } -} - -<> 2023-09-13T165010.200.json - -### - -POST http://localhost:9602/tdengine/dropSuperTableColumn -Content-Type: application/json -Content-Length: 124 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{"databaseName":"test", - "superTableName":"supertable1", - "field": { - "fieldName": "ttttt", - "dataTypeCode": 3 - } -} - -<> 2023-09-13T160812.200.json - -### - -GET http://localhost:9601/monitorUnit/monitorUnitPercentage -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -<> 2023-09-13T160602.200.json - -### - -GET http://localhost:9601/monitorUnit/monitorUnitPercentage -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -<> 2023-09-13T160600.200.json - -### - -GET http://localhost:9601/monitorUnit/monitorUnitPercentage -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -<> 2023-09-13T155532.200.json - -### - -GET http://localhost:9201/config/configKeyStr/hw.gps.longitude -Content-Length: 18 -Content-Type: */*; charset=UTF-8 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -"hw.gps.longitude" - -<> f.txt - -### - -GET http://localhost:9601/deviceModeFunction/getDeviceModeParameters/1 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -<> 2023-09-12T110359.200.json - -### - -POST http://localhost/monitorUnit/getDeviceOperations - - } - -### - -POST http://localhost:9601/monitorUnit/export - -<> 2023-09-05T031749.200.json - -### - -GET http://localhost:9601/monitorUnit/ElectronicNumVo - -<> 2023-09-05T031734.200.json - -### - -POST http://localhost:9602/tdengine/getOnlineDevicesGroupByDay -Content-Type: application/json -Content-Length: 71 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "params": { "beginTime":1666666666666,"endTime":1766666666666 } - -} - -<> 2023-09-05T151123.200.json - -### - -POST http://localhost:9602/tdengine/getOnlineDevicesGroupByDay -Content-Type: application/json -Content-Length: 71 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "params": { "beginTime":1666666666666,"endTime":1766666666666 } - -} - -<> 2023-09-05T151121.200.json - -### - -POST http://localhost:9602/tdengine/getOnlineDevicesGroupByDay -Content-Type: application/json -Content-Length: 71 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "params": { "beginTime":1666666666666,"endTime":1766666666666 } - -} - -<> 2023-09-05T151106.200.json - -### - -POST http://localhost:9602/tdengine/getOnlineDevicesGroupByDay -Content-Type: application/json -Content-Length: 102 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "params": {"superTableName":"st_ds_1", - "beginTime":1666666666666,"endTime":1766666666666 } - -} - -<> 2023-09-05T150635.200.json - -### - -POST http://localhost:9602/tdengine/getOnlineDevicesGroupByDay -Content-Type: application/json -Content-Length: 102 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "params": {"superTableName":"st_ds_1", - "beginTime":1666666666666,"endTime":1766666666666 } - -} - -<> 2023-09-05T150420.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_4", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 0 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693683999996 - } - ] -} - -<> 2023-09-05T150015.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_4", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 0 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693583999996 - } - ] -} - -<> 2023-09-05T150007.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_4", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 0 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693582999996 - } - ] -} - -<> 2023-09-05T150004.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_4", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 0 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693581999996 - } - ] -} - -<> 2023-09-05T145959.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_3", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 0 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693772969706 - } - ] -} - -<> 2023-09-05T145949.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_3", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 1 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693772969106 - } - ] -} - -<> 2023-09-05T145933.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_3", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 1 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693672969106 - } - ] -} - -<> 2023-09-05T145928.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_3", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 0 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693572969106 - } - ] -} - -<> 2023-09-05T145916.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_3", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 1 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693572949106 - } - ] -} - -<> 2023-09-05T145911.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_3", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 1 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693571949106 - } - ] -} - -<> 2023-09-05T145907.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_2", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 1 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693326578166 - } - ] -} - -<> 2023-09-05T145851.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_2", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 1 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693326378166 - } - ] -} - -<> 2023-09-05T145821.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_2", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 0 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693326368166 - } - ] -} - -<> 2023-09-05T145814.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_2", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 0 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693316368166 - } - ] -} - -<> 2023-09-05T145810.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_1", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 0 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693766689106 - } - ] -} - -<> 2023-09-05T145759.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_1", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 1 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693666689106 - } - ] -} - -<> 2023-09-05T145750.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_1", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 1 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693616689106 - } - ] -} - -<> 2023-09-05T145745.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_1", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 1 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693616589106 - } - ] -} - -<> 2023-09-05T145741.200.json - -### - -POST http://localhost:9602/tdengine/insertTable -Content-Type: application/json -Content-Length: 292 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "tableName": "t_ds_1", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "fieldValue": 0 - }, - { - "fieldName": "deviceType", - "fieldValue": 1 - }, - { - "fieldName": "ts", - "fieldValue": 1693616189106 - } - ] -} - -<> 2023-09-05T145734.200.json - -### - -POST http://localhost:9602/tdengine/createTable -Content-Type: application/json -Content-Length: 494 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "superTableName": "st_ds", - "tableName": "t_ds_4", - "tagsFieldValues": [ - { - "fieldName": "deviceCode", - "fieldValue": "'0009340109040_33a'" - }, - { - "fieldName": "deviceName", - "fieldValue": "'定位传感器'" - }, - { - "fieldName": "deviceModeId", - "fieldValue": 1 - }, - { - "fieldName": "monitorUnitId", - "fieldValue": 1 - }, - { - "fieldName": "sceneId", - "fieldValue": 1 - } - ] -} - -<> 2023-09-05T145715.200.json - -### - -POST http://localhost:9602/tdengine/createTable -Content-Type: application/json -Content-Length: 492 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "superTableName": "st_ds", - "tableName": "t_ds_3", - "tagsFieldValues": [ - { - "fieldName": "deviceCode", - "fieldValue": "0009340109040924" - }, - { - "fieldName": "deviceName", - "fieldValue": "'温度传感器2'" - }, - { - "fieldName": "deviceModeId", - "fieldValue": 1 - }, - { - "fieldName": "monitorUnitId", - "fieldValue": 1 - }, - { - "fieldName": "sceneId", - "fieldValue": 1 - } - ] -} - -<> 2023-09-05T145711.200.json - -### - -POST http://localhost:9602/tdengine/createTable -Content-Type: application/json -Content-Length: 492 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "superTableName": "st_ds", - "tableName": "t_ds_2", - "tagsFieldValues": [ - { - "fieldName": "deviceCode", - "fieldValue": "0009340109040126" - }, - { - "fieldName": "deviceName", - "fieldValue": "'温度传感器1'" - }, - { - "fieldName": "deviceModeId", - "fieldValue": 1 - }, - { - "fieldName": "monitorUnitId", - "fieldValue": 1 - }, - { - "fieldName": "sceneId", - "fieldValue": 1 - } - ] -} - -<> 2023-09-05T145708.200.json - -### - -POST http://localhost:9602/tdengine/createTable -Content-Type: application/json -Content-Length: 467 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "superTableName": "st_ds", - "tableName": "t_ds_1", - "tagsFieldValues": [ - { - "fieldName": "deviceCode", - "fieldValue": "1" - }, - { - "fieldName": "deviceName", - "fieldValue": "'基站'" - }, - { - "fieldName": "deviceModeId", - "fieldValue": 1 - }, - { - "fieldName": "monitorUnitId", - "fieldValue": 1 - }, - { - "fieldName": "sceneId", - "fieldValue": 1 - } - ] -} - -<> 2023-09-05T145704.200.json - -### - -POST http://localhost:9602/tdengine/createSuperTable -Content-Type: application/json -Content-Length: 667 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "databaseName": "db_hwsaas", - "superTableName": "st_ds", - "firstFieldName": "ts", - "schemaFields": [ - { - "fieldName": "onlineStatus", - "dataTypeCode": 8 - }, - { - "fieldName": "deviceType", - "dataTypeCode": 8 - } - ], - "tagsFields": [ - { - "fieldName": "deviceCode", - "dataTypeCode": 10, - "size": 50 - }, - { - "fieldName": "deviceName", - "dataTypeCode": 10, - "size": 200 - }, - { - "fieldName": "deviceModeId", - "dataTypeCode": 2 - }, - { - "fieldName": "monitorUnitId", - "dataTypeCode": 2 - }, - { - "fieldName": "sceneId", - "dataTypeCode": 2 - } - ] -} - -<> 2023-09-05T145614.200.json - -### - -POST http://localhost:9602/tdengine/getOnlineDevicesGroupByDay -Content-Type: application/json -Content-Length: 130 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "params": {"databaseName":"db_scene_1","superTableName":"st_ds_1", - "beginTime":1666666666666,"endTime":1766666666666 } - -} - -<> 2023-09-05T144005.200.json - -### - -POST http://localhost:9602/tdengine/getOnlineDevicesGroupByDay -Content-Type: application/json -Content-Length: 130 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "params": {"databaseName":"db_scene_1","superTableName":"st_ds_1", - "beginTime":1666666666666,"endTime":1766666666666 } - -} - -<> 2023-09-05T144003.200.json - -### - -POST http://localhost:9602/tdengine/getOnlineDevicesGroupByDay -Content-Type: application/json -Content-Length: 130 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "params": {"databaseName":"db_scene_1","superTableName":"st_ds_1", - "beginTime":1666666666666,"endTime":1766666666666 } - -} - -<> 2023-09-05T143711.200.json - -### - -POST http://localhost:9602/tdengine/getOnlineDevicesGroupByDay -Content-Type: application/json -Content-Length: 130 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "params": {"databaseName":"db_scene_1","superTableName":"st_ds_1", - "beginTime":1666666666666,"endTime":1766666666666 } - -} - -<> 2023-09-05T143237.200.json - -### - -POST http://localhost:9602/tdengine/getOnlineDevicesGroupByDay -Content-Type: application/json -Content-Length: 130 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "params": {"databaseName":"db_scene_1","superTableName":"st_ds_1", - "beginTime":1666666666666,"endTime":1766666666666 } - -} - -<> 2023-09-05T142515.200.json - -### - -POST http://localhost:9602/tdengine/getOnlineDevicesGroupByDay -Content-Type: application/json -Content-Length: 130 -Connection: Keep-Alive -User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.8) -Accept-Encoding: br,deflate,gzip,x-gzip - -{ - "params": {"databaseName":"db_scene_1","superTableName":"st_ds_1", - "beginTime":1666666666666,"endTime":1766666666666 } - -} - -<> 2023-09-05T142512.200.json - -### - diff --git a/ruoyi-modules/hw-mqtt-broker/src/main/resources/bootstrap.yml b/ruoyi-modules/hw-mqtt-broker/src/main/resources/bootstrap.yml index 3495892..dfdd7fd 100644 --- a/ruoyi-modules/hw-mqtt-broker/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/hw-mqtt-broker/src/main/resources/bootstrap.yml @@ -27,9 +27,6 @@ spring: active: dev cloud: nacos: - discovery: - # 服务注册地址 - server-addr: localhost:8848 config: # 配置中心地址 server-addr: localhost:8848 diff --git a/ruoyi-modules/hw-websocket-server/src/main/java/com/hw/websocket/controller/WebSocketApi.java b/ruoyi-modules/hw-websocket-server/src/main/java/com/hw/websocket/controller/WebSocketApi.java index 6799a6b..d36358b 100644 --- a/ruoyi-modules/hw-websocket-server/src/main/java/com/hw/websocket/controller/WebSocketApi.java +++ b/ruoyi-modules/hw-websocket-server/src/main/java/com/hw/websocket/controller/WebSocketApi.java @@ -3,6 +3,7 @@ package com.hw.websocket.controller; import com.alibaba.fastjson2.JSONObject; import com.hw.websocket.operate.WebSocket; import com.ruoyi.common.core.utils.uuid.UUID; +import com.ruoyi.common.core.web.domain.AjaxResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -29,11 +30,15 @@ public class WebSocketApi { @PostMapping() @ResponseBody - public void push(String message){ + public AjaxResult push(String message){ + String info = null; try{ + String[] split = info.split("1"); webSocket.sendAllMessage(message); + return AjaxResult.success(); }catch (Exception ex){ logger.error("WebSocket Api接口异常:"+ex.getMessage()); + return AjaxResult.error(ex.getMessage()); } } } diff --git a/ruoyi-modules/hw-websocket-server/src/main/resources/application.yml b/ruoyi-modules/hw-websocket-server/src/main/resources/application.yml index 7e8b233..e7adb8c 100644 --- a/ruoyi-modules/hw-websocket-server/src/main/resources/application.yml +++ b/ruoyi-modules/hw-websocket-server/src/main/resources/application.yml @@ -5,21 +5,21 @@ server: # Spring spring: application: - # ???? + # 应用名称 name: hw-websocket profiles: - # ???? + # 环境配置 active: dev cloud: nacos: discovery: - # ?????? + # 服务注册地址 server-addr: localhost:8848 config: - # ?????? + # 配置中心地址 server-addr: localhost:8848 - # ?????? + # 配置文件格式 file-extension: yml - # ???? + # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}