test/dgiot
1
0
Fork 0
mirror of https://gitee.com/dgiiot/dgiot.git synced 2024-11-30 03:07:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: device state

Browse Source
This commit is contained in:
dawnwinterLiu 2023-04-19 15:59:59 +08:00
parent 59c1516f40
commit dbedd578a7
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dgiot_device/src/utils/dgiot_device_cache.erl
View File

@ -42,7 +42,7 @@ parse_cache_Device(_ClassName) ->
end,
Query = #{
<<"order">> => <<"updatedAt">>,
<<"keys">> => [<<"ACL">>, <<"updatedAt">>, <<"devaddr">>, <<"status">>, <<"isEnable">>, <<"profile">>, <<"product">>, <<"location">>, <<"deviceSecret">>],
<<"keys">> => [<<"ACL">>, <<"updatedAt">>, <<"state">>, <<"devaddr">>, <<"status">>, <<"isEnable">>, <<"profile">>, <<"product">>, <<"location">>, <<"deviceSecret">>],
<<"where">> => #{}
},
dgiot_parse_loader:start(<<"Device">>, Query, 0, 100, 1000000, Success).

8
apps/dgiot_tdengine/src/dgiot_tdengine_channel.erl
View File

@ -227,7 +227,13 @@ handle_message({data, Product, DevAddr, Data, Context}, #state{id = ChannelId} =
%% 数据与产品，设备地址分离
handle_message({sql, Sql}, #state{id = ChannelId} = State) ->
dgiot_metrics:inc(dgiot_tdengine, <<"tdengine_recv">>, 1),
dgiot_tdengine:batch_sql(ChannelId, Sql),
case catch dgiot_tdengine:batch_sql(ChannelId, Sql) of
{Err, Reason} when Err == error; Err == 'EXIT' ->
dgiot_bridge:send_log(ChannelId, "Save to Tdengine error, ~p, ~p", [Sql, Reason]),
ok;
_ ->
pass
end,
{ok, State};
%% 规则引擎导入

2
apps/dgiot_zhcltech

@ -1 +1 @@
Subproject commit 9303052c9aee6e4f9cc38249a1e800e686c4c775
Subproject commit 2ace04bea5a1e77fee19bbe189a76e40f55c862f