anlicheng/iot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix devices

Browse Source
This commit is contained in:
anlicheng 2023-12-25 23:05:16 +08:00
parent 1977fa5278
commit c00593313e
5 changed files with 26 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
apps/iot/src/iot_database_buffer.erl
View File

@ -1,114 +0,0 @@
%%%-------------------------------------------------------------------
%%% @author aresei
%%% @copyright (C) 2023, <COMPANY>
%%% @doc
%%%
%%% @end
%%% Created : 25. 9月 2023 10:05
%%%-------------------------------------------------------------------
-module(iot_database_buffer).
-author("aresei").
-behaviour(gen_server).
%% API
-export([start_link/0]).
-export([find_device/1]).
%% gen_server callbacks
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
-define(SERVER, ?MODULE).
-record(state, {
devices_map = #{} :: map()
}).
%%%===================================================================
%%% API
%%%===================================================================
-spec find_device(DeviceUUID :: binary()) -> error | {ok, Device :: map()}.
find_device(DeviceUUID) when is_binary(DeviceUUID) ->
gen_server:call(?MODULE, {find_device, DeviceUUID}).
%% @doc Spawns the server and registers the local name (unique)
-spec(start_link() ->
{ok, Pid :: pid()} | ignore | {error, Reason :: term()}).
start_link() ->
gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
%%%===================================================================
%%% gen_server callbacks
%%%===================================================================
%% @private
%% @doc Initializes the server
-spec(init(Args :: term()) ->
{ok, State :: #state{}} | {ok, State :: #state{}, timeout() | hibernate} |
{stop, Reason :: term()} | ignore).
init([]) ->
{ok, Devices} = device_bo:get_all_devices(),
DevicesMap = maps:from_list(lists:map(fun(Device = #{<<"device_uuid">> := DeviceUUID}) -> {DeviceUUID, Device} end, Devices)),
erlang:start_timer(300 * 1000, self(), clean_up),
{ok, #state{devices_map = DevicesMap}}.
%% @private
%% @doc Handling call messages
-spec(handle_call(Request :: term(), From :: {pid(), Tag :: term()},
State :: #state{}) ->
{reply, Reply :: term(), NewState :: #state{}} |
{reply, Reply :: term(), NewState :: #state{}, timeout() | hibernate} |
{noreply, NewState :: #state{}} |
{noreply, NewState :: #state{}, timeout() | hibernate} |
{stop, Reason :: term(), Reply :: term(), NewState :: #state{}} |
{stop, Reason :: term(), NewState :: #state{}}).
handle_call({find_device, DeviceUUID}, _From, State = #state{devices_map = DevicesMap}) ->
case maps:take(DeviceUUID, DevicesMap) of
error ->
{reply, error, State};
{DeviceInfo, NDevicesMap} ->
{reply, {ok, DeviceInfo}, State#state{devices_map = NDevicesMap}}
end.
%% @private
%% @doc Handling cast messages
-spec(handle_cast(Request :: term(), State :: #state{}) ->
{noreply, NewState :: #state{}} |
{noreply, NewState :: #state{}, timeout() | hibernate} |
{stop, Reason :: term(), NewState :: #state{}}).
handle_cast(_Request, State = #state{}) ->
{noreply, State}.
%% @private
%% @doc Handling all non call/cast messages
-spec(handle_info(Info :: timeout() | term(), State :: #state{}) ->
{noreply, NewState :: #state{}} |
{noreply, NewState :: #state{}, timeout() | hibernate} |
{stop, Reason :: term(), NewState :: #state{}}).
handle_info({timeout, _, clean_up}, State = #state{}) ->
{noreply, State#state{devices_map = #{}}}.
%% @private
%% @doc This function is called by a gen_server when it is about to
%% terminate. It should be the opposite of Module:init/1 and do any
%% necessary cleaning up. When it returns, the gen_server terminates
%% with Reason. The return value is ignored.
-spec(terminate(Reason :: (normal | shutdown | {shutdown, term()} | term()),
State :: #state{}) -> term()).
terminate(_Reason, _State = #state{}) ->
ok.
%% @private
%% @doc Convert process state when code is changed
-spec(code_change(OldVsn :: term() | {down, term()}, State :: #state{},
Extra :: term()) ->
{ok, NewState :: #state{}} | {error, Reason :: term()}).
code_change(_OldVsn, State = #state{}, _Extra) ->
{ok, State}.
%%%===================================================================
%%% Internal functions
%%%===================================================================

23
apps/iot/src/iot_device.erl
View File

@ -81,7 +81,9 @@ auth(Pid, Auth) when is_pid(Pid), is_boolean(Auth) ->
%% initialize. To ensure a synchronized start-up procedure, this
%% function does not return until Module:init/1 has returned.
start_link(Name, DeviceUUID) when is_atom(Name), is_binary(DeviceUUID) ->
gen_statem:start_link({local, Name}, ?MODULE, [DeviceUUID], []).
gen_statem:start_link({local, Name}, ?MODULE, [DeviceUUID], []);
start_link(Name, DeviceInfo) when is_atom(Name), is_map(DeviceInfo) ->
gen_statem:start_link({local, Name}, ?MODULE, [DeviceInfo], []).
%%%===================================================================
%%% gen_statem callbacks
@ -92,24 +94,19 @@ start_link(Name, DeviceUUID) when is_atom(Name), is_binary(DeviceUUID) ->
%% gen_statem:start_link/[3,4], this function is called by the new
%% process to initialize.
init([DeviceUUID]) when is_binary(DeviceUUID) ->
DeviceInfo1 = case iot_database_buffer:find_device(DeviceUUID) of
error ->
device_bo:get_device_by_uuid(DeviceUUID);
case device_bo:get_device_by_uuid(DeviceUUID) of
{ok, DeviceInfo} ->
{ok, DeviceInfo}
end,
case DeviceInfo1 of
{ok, #{<<"authorize_status">> := AuthorizeStatus, <<"status">> := Status}} ->
init([DeviceInfo]);
undefined ->
lager:warning("[iot_device] device uuid: ~p, loaded from mysql failed", [DeviceUUID]),
ignore
end;
init([DeviceInfo = #{<<"device_uuid">> := DeviceUUID, <<"authorize_status">> := AuthorizeStatus, <<"status">> := Status}]) when is_map(DeviceInfo) ->
case AuthorizeStatus =:= ?DEVICE_AUTH_AUTHED of
true ->
{ok, ?STATE_ACTIVATED, #state{device_uuid = DeviceUUID, status = Status}};
false ->
{ok, ?STATE_DENIED, #state{device_uuid = DeviceUUID, status = Status}}
end;
undefined ->
lager:warning("[iot_device] device uuid: ~p, loaded from mysql failed", [DeviceUUID]),
ignore
end.
%% @private

14
apps/iot/src/iot_device_sup.erl
View File

@ -15,7 +15,11 @@ start_link() ->
supervisor:start_link({local, ?MODULE}, ?MODULE, []).
init([]) ->
{ok, {#{strategy => one_for_one, intensity => 1000, period => 3600}, []}}.
%% 启动主机相关的devices
{ok, DeviceInfos} = device_bo:get_all_devices(),
Specs = lists:map(fun child_spec/1, DeviceInfos),
{ok, {#{strategy => one_for_one, intensity => 1000, period => 3600}, [Specs]}}.
-spec ensured_device_started(UUID :: binary()) -> {ok, Pid :: pid()} | {error, Reason :: any()}.
ensured_device_started(DeviceUUID) when is_binary(DeviceUUID) ->
@ -45,4 +49,12 @@ child_spec(DeviceUUID) when is_binary(DeviceUUID) ->
restart => permanent,
shutdown => 2000,
type => worker,
modules => ['iot_device']};
child_spec(DeviceInfo = #{<<"device_uuid">> := DeviceUUID}) when is_binary(DeviceUUID) ->
Name = iot_device:get_name(DeviceUUID),
#{id => Name,
start => {iot_device, start_link, [Name, DeviceInfo]},
restart => permanent,
shutdown => 2000,
type => worker,
modules => ['iot_device']}.

4
apps/iot/src/iot_host.erl
View File

@ -197,10 +197,6 @@ init([UUID]) ->
%% 心跳检测机制
erlang:start_timer(?HEARTBEAT_INTERVAL, self(), heartbeat_ticker),
%% 启动主机相关的devices
{ok, Devices} = device_bo:get_host_devices(HostId),
lists:foreach(fun iot_device_sup:ensured_device_started/1, Devices),
StateName = case AuthorizeStatus =:= 1 of
true -> ?STATE_ACTIVATED;
false -> ?STATE_DENIED

9
apps/iot/src/iot_sup.erl
View File

@ -37,15 +37,6 @@ init([]) ->
modules => ['iot_api']
},
#{
id => 'iot_database_buffer',
start => {'iot_database_buffer', start_link, []},
restart => permanent,
shutdown => 2000,
type => supervisor,
modules => ['iot_database_buffer']
},
#{
id => 'iot_device_sup',
start => {'iot_device_sup', start_link, []},