test/dgiot
1
0
Fork 0
mirror of https://gitee.com/dgiiot/dgiot.git synced 2024-12-02 20:28:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add trace log, Modify meter channel

Browse Source
This commit is contained in:
AvantLiu 2021-10-10 12:03:12 +08:00
parent c74b246443
commit d4b9fd758e
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
apps/dgiot_device/src/dgiot_device.erl
View File

@ -25,7 +25,7 @@
-export([init_ets/0]).
-export([create_device/1, create_device/2, get_sub_device/1, get_sub_device/2, get/2]).
-export([load_device/1, sync_parse/1, post/1, put/1, save/1, save/2, save/3, lookup/1, lookup/2, delete/1, delete/2, save_prod/2, lookup_prod/1, get_online/1]).
-export([encode/1, decode/3, save_subdevice/2, get_subdevice/2, get_file/4]).
-export([encode/1, decode/3, save_subdevice/2, get_subdevice/2, get_file/4, get_acl/1]).
init_ets() ->
dgiot_data:init(?DGIOT_PRODUCT),
@ -89,11 +89,36 @@ save(Device) ->
end,
dgiot_mnesia:insert(DeviceId, {[Status, UpdatedAt, get_acl(Device), DeviceName, Devaddr, ProductId], node()}).
get_acl(Device) ->
get_acl(Device) when is_map(Device) ->
ACL = maps:get(<<"ACL">>, Device, #{}),
lists:foldl(fun(X, Acc) ->
Acc ++ [binary_to_atom(X)]
end, [], maps:keys(ACL)).
end, [], maps:keys(ACL));
get_acl(DeviceId) when is_binary(DeviceId) ->
case lookup(DeviceId) of
{ok, {[_, _, [Acl | _], _, _, _], _}} ->
BinAcl = atom_to_binary(Acl),
#{BinAcl => #{
<<"read">> => true,
<<"write">> => true}
};
_ ->
#{<<"*">> => #{
<<"read">> => true},
<<"role:admin">> => #{
<<"read">> => true,
<<"write">> => true}
}
end;
get_acl(_DeviceId) ->
#{<<"*">> => #{
<<"read">> => true},
<<"role:admin">> => #{
<<"read">> => true,
<<"write">> => true}
}.
save(DeviceId, _Data) ->
case lookup(DeviceId) of
@ -121,7 +146,7 @@ sync_parse(OffLine) ->
_ ->
<<"">>
end,
?MLOG(info, #{<<"clientid">> => DeviceId, <<"devaddr">> => Devaddr, <<"productid">> => ProductId, <<"productname">> => Productname, <<"devicename">> => DeviceName, <<"status">> => <<"下线"/utf8>>}, ['device_statuslog']),
?MLOG(info, #{<<"deviceid">> => DeviceId, <<"devaddr">> => Devaddr, <<"productid">> => ProductId, <<"productname">> => Productname, <<"devicename">> => DeviceName, <<"status">> => <<"下线"/utf8>>}, ['device_statuslog']),
dgiot_umeng:save_devicestatus(DeviceId, <<"OFFLINE">>),
dgiot_mnesia:insert(DeviceId, {[false, Last, Acl, DeviceName, Devaddr, ProductId], Node});
_ ->
@ -138,7 +163,7 @@ sync_parse(OffLine) ->
_ ->
<<"">>
end,
?MLOG(info, #{<<"clientid">> => DeviceId, <<"devaddr">> => Devaddr, <<"productid">> => ProductId, <<"productname">> => Productname, <<"devicename">> => DeviceName, <<"status">> => <<"上线"/utf8>>}, ['device_statuslog']),
?MLOG(info, #{<<"deviceid">> => DeviceId, <<"devaddr">> => Devaddr, <<"productid">> => ProductId, <<"productname">> => Productname, <<"devicename">> => DeviceName, <<"status">> => <<"上线"/utf8>>}, ['device_statuslog']),
dgiot_mnesia:insert(DeviceId, {[true, Last, Acl, DeviceName, Devaddr, ProductId], Node});
_ ->
pass

10
apps/dgiot_parse/src/sever/dgiot_parse_channel.erl
View File

@ -168,7 +168,7 @@ init(?TYPE, Channel, Cfg) ->
%% 初始化池子
handle_init(State) ->
emqx_hooks:add('logger.send', {?MODULE, send, []}),
emqx_hooks:add('mqtt_publish.trace', {dgiot_tracer, check_trace, []}),
emqx_hooks:add('mqtt_publish.trace', {dgiot_tracer, check_trace, [?MODULE, ?LINE]}),
{ok, State}.
handle_message(config, #state{cfg = Cfg} = State) ->
@ -259,13 +259,11 @@ get_body(#{<<"msg">> := Msg, <<"clientid">> := _} = Map) when is_map(Msg) ->
get_body(#{<<"msg">> := Msg} = Map) when is_map(Msg) ->
Devaddr = maps:get(<<"devaddr">>, Msg, <<"">>),
ProductId = maps:get(<<"productid">>, Msg, <<"">>),
DefaultACL = #{<<"role:admin">> => #{
<<"read">> => true,
<<"write">> => true}
},
DeviceId = maps:get(<<"deviceid">>, Msg, <<"">>),
DefaultACL = dgiot_device:get_acl(DeviceId),
ACl = maps:get(<<"ACL">>, Msg, DefaultACL),
NewMsg = maps:without([<<"ACL">>], Msg),
Map#{<<"type">> => <<"json">>, <<"devaddr">> => Devaddr, <<"productid">> => ProductId, <<"ACL">> => ACl, <<"msg">> => jiffy:encode(NewMsg)};
Map#{<<"type">> => <<"json">>, <<"devaddr">> => Devaddr, <<"productid">> => ProductId, <<"deviceid">> => DeviceId, <<"ACL">> => ACl, <<"msg">> => jiffy:encode(NewMsg)};
get_body(Map) ->
Map#{<<"type">> => <<"text">>,
<<"ACL">> => #{<<"role:admin">> => #{