mirror of
https://gitee.com/dgiiot/dgiot.git
synced 2024-11-29 18:57:41 +08:00
fix: add product failed
This commit is contained in:
jhonliu
parent
456d95e302
commit
59a7efaa1e
40
apps/dgiot/src/transport/tcp_client_sup.erl
Normal file
40
apps/dgiot/src/transport/tcp_client_sup.erl
Normal file
@ -0,0 +1,40 @@
|
||||
%%--------------------------------------------------------------------
|
||||
%% Copyright (c) 2020-2021 DGIOT Technologies Co., Ltd. All Rights Reserved.
|
||||
%%
|
||||
%% Licensed under the Apache License, Version 2.0 (the "License");
|
||||
%% you may not use this file except in compliance with the License.
|
||||
%% You may obtain a copy of the License at
|
||||
%%
|
||||
%% http://www.apache.org/licenses/LICENSE-2.0
|
||||
%%
|
||||
%% Unless required by applicable law or agreed to in writing, software
|
||||
%% distributed under the License is distributed on an "AS IS" BASIS,
|
||||
%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
%% See the License for the specific language governing permissions and
|
||||
%% limitations under the License.
|
||||
%%--------------------------------------------------------------------
|
||||
|
||||
-module(task_sup).
|
||||
|
||||
-include("dgiot_task.hrl").
|
||||
-behaviour(supervisor).
|
||||
|
||||
-export([start_link/1, init/1]).
|
||||
|
||||
start_link(Name) ->
|
||||
supervisor:start_link({local, Name}, ?MODULE, []).
|
||||
|
||||
init([]) ->
|
||||
ChildSpec = [dgiot:child_spec(dgiot_task_worker, worker)],
|
||||
{ok, {{simple_one_for_one, 5, 10}, ChildSpec}}.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,143 +0,0 @@
|
||||
%%--------------------------------------------------------------------
|
||||
%% Copyright (c) 2020-2021 DGIOT Technologies Co., Ltd. All Rights Reserved.
|
||||
%%
|
||||
%% Licensed under the Apache License, Version 2.0 (the "License");
|
||||
%% you may not use this file except in compliance with the License.
|
||||
%% You may obtain a copy of the License at
|
||||
%%
|
||||
%% http://www.apache.org/licenses/LICENSE-2.0
|
||||
%%
|
||||
%% Unless required by applicable law or agreed to in writing, software
|
||||
%% distributed under the License is distributed on an "AS IS" BASIS,
|
||||
%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
%% See the License for the specific language governing permissions and
|
||||
%% limitations under the License.
|
||||
%%--------------------------------------------------------------------
|
||||
|
||||
-module(dgiot_tcpc_worker).
|
||||
-author("johnliu").
|
||||
-include_lib("dgiot/include/dgiot_socket.hrl").
|
||||
-include_lib("dgiot/include/logger.hrl").
|
||||
%% API
|
||||
-export([init/1, handle_info/2, terminate/2]).
|
||||
-export([start_connect/1]).
|
||||
|
||||
-define(MAX_BUFF_SIZE, 10 * 1024).
|
||||
-record(state, {
|
||||
id,
|
||||
productid,
|
||||
devaddr,
|
||||
hb = 10,
|
||||
device = #{}
|
||||
}).
|
||||
|
||||
start_connect(#{
|
||||
<<"channelid">> := ChannelId,
|
||||
<<"auto_reconnect">> := Recon,
|
||||
<<"reconnect_times">> := ReTimes,
|
||||
<<"port">> := Port,
|
||||
<<"ip">> := Ip,
|
||||
<<"productid">> := ProductId,
|
||||
<<"hb">> := HB,
|
||||
<<"devaddr">> := DevAddr
|
||||
}) ->
|
||||
State = #state{
|
||||
id = ChannelId,
|
||||
productid = ProductId,
|
||||
devaddr = DevAddr,
|
||||
hb = HB
|
||||
},
|
||||
dgiot_tcp_client:start_link(DevAddr, ?MODULE, Ip, Port, Recon, ReTimes, State).
|
||||
|
||||
init(TCPState) ->
|
||||
{ok, TCPState}.
|
||||
|
||||
handle_info(connection_ready, #tcp{state = #state{productid = ProductId} = _State} = TCPState) ->
|
||||
rand:seed(exs1024),
|
||||
Time = erlang:round(rand:uniform() * 1 + 1) * 1000,
|
||||
dgiot_tcp_client:send(TCPState, <<"login">>),
|
||||
case do_cmd(ProductId, connection_ready, <<>>, TCPState) of
|
||||
default ->
|
||||
erlang:send_after(Time, self(), login);
|
||||
_ ->
|
||||
pass
|
||||
end,
|
||||
{noreply, TCPState};
|
||||
|
||||
handle_info(#{<<"cmd">> := Cmd, <<"data">> := Data, <<"productId">> := ProductId}, TCPState) ->
|
||||
case do_cmd(ProductId, Cmd, Data, TCPState) of
|
||||
default ->
|
||||
{noreply, TCPState};
|
||||
Result ->
|
||||
Result
|
||||
end;
|
||||
|
||||
handle_info(tcp_closed, #tcp{state = #state{productid = ProductId} = _State} = TCPState) ->
|
||||
case do_cmd(ProductId, tcp_closed, <<>>, TCPState) of
|
||||
default ->
|
||||
{noreply, TCPState};
|
||||
Result ->
|
||||
Result
|
||||
end;
|
||||
|
||||
handle_info({tcp, Buff}, #tcp{buff = Old, state = #state{productid = ProductId} = _State} = TCPState) ->
|
||||
Data = <<Old/binary, Buff/binary>>,
|
||||
case do_cmd(ProductId, tcp, Data, TCPState) of
|
||||
default ->
|
||||
{noreply, TCPState};
|
||||
{noreply, Bin, State} ->
|
||||
{noreply, TCPState#tcp{buff = Bin, state = State}};
|
||||
{stop, Reason, State} ->
|
||||
{stop, Reason, TCPState#tcp{state = State}};
|
||||
Result ->
|
||||
Result
|
||||
end;
|
||||
|
||||
handle_info({deliver, _Topic, Msg}, #tcp{state = State} = TCPState) ->
|
||||
Payload = dgiot_mqtt:get_payload(Msg),
|
||||
?LOG(info, "Client recv from mqtt Payload ~p ~n ~p~n", [Payload, State]),
|
||||
%% Message =
|
||||
%% case jsx:is_json(Payload) of
|
||||
%% true ->
|
||||
%% jsx:decode(Payload, [{labels, binary}, return_maps]);
|
||||
%% false ->
|
||||
%% binary_to_term(Payload)
|
||||
%% end,
|
||||
{noreply, TCPState};
|
||||
|
||||
|
||||
handle_info(login, #tcp{state = #state{productid = ProductId, devaddr = DevAddr, hb = Hb} = _State} = TCPState) ->
|
||||
Topic = <<"mock/", ProductId/binary, "/", DevAddr/binary>>,
|
||||
dgiot_mqtt:subscribe(Topic),
|
||||
erlang:send_after(Hb * 1000, self(), heartbeat),
|
||||
?LOG(info, "~p ", [<<"login">>]),
|
||||
dgiot_tcp_client:send(TCPState, <<"login">>),
|
||||
{noreply, TCPState};
|
||||
|
||||
handle_info(heartbeat, #tcp{state = #state{devaddr = _DevAddr, hb = Hb} = _State} = TCPState) ->
|
||||
erlang:send_after(Hb * 1000, self(), heartbeat),
|
||||
%% ?LOG(info,"~p ",[<<"heartbeat">>]),
|
||||
dgiot_tcp_client:send(TCPState, <<"heartbeat">>),
|
||||
{noreply, TCPState};
|
||||
|
||||
handle_info(_Info, TCPState) ->
|
||||
{noreply, TCPState}.
|
||||
|
||||
terminate(_Reason, _TCPState) ->
|
||||
ok.
|
||||
|
||||
do_cmd(ProductId, Cmd, Data, #tcp{state = #state{id = ChannelId} = State} = TCPState) ->
|
||||
case dgiot_hook:run_hook({tcp, ProductId}, [Cmd, Data, State]) of
|
||||
{ok, NewState} ->
|
||||
{noreply, TCPState#tcp{state = NewState}};
|
||||
{reply, ProductId, Payload, NewState} ->
|
||||
case dgiot_tcp_server:send(TCPState#tcp{state = NewState}, Payload) of
|
||||
ok ->
|
||||
ok;
|
||||
{error, Reason} ->
|
||||
dgiot_bridge:send_log(ChannelId, ProductId, "Send Fail, ~p, CMD:~p", [Cmd, Reason])
|
||||
end,
|
||||
{noreply, TCPState#tcp{state = NewState}};
|
||||
_ ->
|
||||
default
|
||||
end.
|
||||
@ -27,8 +27,8 @@ post('before', _QueryData) ->
|
||||
post('after', #{<<"objectId">> := ProductId, <<"channel">> := Channel} = QueryData) ->
|
||||
TdchannelId = maps:get(<<"tdchannel">>, Channel, <<"">>),
|
||||
TaskchannelId = maps:get(<<"taskchannel">>, Channel, <<"">>),
|
||||
Otherchannel = maps:get(<<"otherchannel">>, Channel, []),
|
||||
dgiot_product:add_product_relation(lists:flatten(Otherchannel) ++ [TdchannelId] ++ [TaskchannelId], ProductId),
|
||||
Otherchannel = maps:get(<<"otherchannel">>, Channel, <<"">>),
|
||||
dgiot_product:add_product_relation(lists:flatten([Otherchannel]) ++ [TdchannelId] ++ [TaskchannelId], ProductId),
|
||||
%% io:format("~s ~p ~p ~n ",[?FILE,?LINE, QueryData]),
|
||||
post('after', maps:without([<<"channel">>], QueryData));
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user