feat: mqtt add notification

dgiot · Apr 22, 2024 · 59d44aa · 59d44aa
1 parent 03e0e99
commit 59d44aa
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -101,6 +101,7 @@ apps/dgiot_12184/
 apps/dgiot_modbusx/
 apps/dgiot_rtsp2ws/
 apps/dgiot_sophon/
+apps/dgiot_open62541/
 node_modules/
 package-lock.json
 erlang_ls.config

diff --git a/apps/dgiot/src/transport/dgiot_mqtt.erl b/apps/dgiot/src/transport/dgiot_mqtt.erl
@@ -73,7 +73,7 @@ subscribe_route_key(Topics, Type, SessionToken) ->
  lists:foldl(fun(X, Acc) ->
  case dgiot_data:get({dlink_client, SessionToken}) of
  not_find ->
- pass;
+ dgiot_mqtt:subscribe_mgmt(SessionToken, X);
  Clients ->
  lists:foldl(fun(Client, _) ->
  dgiot_mqtt:subscribe_mgmt(Client, X)

diff --git a/apps/dgiot_device/src/dgiot_product.erl b/apps/dgiot_device/src/dgiot_product.erl
@@ -80,7 +80,7 @@ save(Product) ->
  save_productSecret(ProductId),
  dgiot_product_channel:save_channel(ProductId),
  dgiot_product_channel:save_tdchannel(ProductId),
-%% dgiot_product_channel:save_taskchannel(ProductId),
+ dgiot_product_channel:save_taskchannel(ProductId),
  save_device_thingtype(ProductId),
  save_product_identifier(ProductId),
  dgiot_product_enum:save_product_enum(ProductId),

diff --git a/apps/dgiot_dlink/src/proctol/dgiot_mqtt_auth.erl b/apps/dgiot_dlink/src/proctol/dgiot_mqtt_auth.erl
@@ -35,6 +35,11 @@ save_client(<<Token:34/binary, _Type/binary>> = ClientId) ->
  dgiot_data:insert({dlink_client, Token}, New_ClientIds)
  end.
 
+sub_notification(ClientId, Roles) ->
+ maps:fold(fun(RoleId, _, _) ->
+ dgiot_mqtt:subscribe_route_key([<<"$dg/user/dashboard/notification/", RoleId/binary, "/#">>], <<"notification">>, ClientId)
+ end, {}, Roles).
+
 check(#{peerhost := PeerHost, username := <<"dgiot">>}, AuthResult, _) when PeerHost == {127, 0, 0, 1} ->
  {ok, AuthResult#{anonymous => false, auth_result => success}};
 
@@ -57,7 +62,9 @@ check(#{username := Username}, AuthResult, _)
 check(#{clientid := <<Token:34/binary, _Type/binary>> = ClientId, username := UserId, password := Token}, AuthResult, #{hash_type := _HashType}) ->
 %% io:format("~s ~p UserId: ~p~n", [?FILE, ?LINE, UserId]),
  case dgiot_auth:get_session(Token) of
- #{<<"objectId">> := UserId} ->
+ #{<<"objectId">> := UserId} = User ->
+%% 登录时订阅告警推送
+ sub_notification(ClientId, maps:get(<<"roles">>, User, #{})),
  save_client(ClientId),
  {stop, AuthResult#{anonymous => false, auth_result => success}};
  _ ->

diff --git a/apps/dgiot_http/src/umeng/dgiot_umeng.erl b/apps/dgiot_http/src/umeng/dgiot_umeng.erl
@@ -630,7 +630,7 @@ sendSubscribe(_O) ->
 %% 推送前端弹框
 send_dashboard(#{<<"_deviceid">> := DeviceId, <<"dgiot_alarmvalue">> := Alarmvalue} = Args) ->
  case dgiot_parse:get_object(<<"Device">>, DeviceId) of
- {ok, #{<<"name">> := DeviceName, <<"product">> := #{<<"objectId">> := ProductId}}} ->
+ {ok, #{<<"ACL">> := ACL, <<"name">> := DeviceName, <<"product">> := #{<<"objectId">> := ProductId}}} ->
  ProductName =
  case dgiot_parse:get_object(<<"Product">>, ProductId) of
  {ok, #{<<"name">> := Name1}} ->
@@ -653,8 +653,11 @@ send_dashboard(#{<<"_deviceid">> := DeviceId, <<"dgiot_alarmvalue">> := Alarmval
  <<"type">> => <<"warn">>,
  <<"description">> => maps:get(<<"description">>, Args, <<>>)
  },
- Pubtopic = <<"$dg/user/dashboard/notification/report">>,
- dgiot_mqtt:publish(DeviceId, Pubtopic, dgiot_json:encode(Data));
+ RoleIds = dgiot_role:get_roleids(maps:keys(ACL)),
+ lists:foldl(fun(RoleId, _) ->
+ Pubtopic = <<"$dg/user/dashboard/notification/", RoleId/binary, "/report">>,
+ dgiot_mqtt:publish(DeviceId, Pubtopic, dgiot_json:encode(Data))
+ end, {}, RoleIds);
  _ ->
  pass
  end;