test/dgiot
1
0
Fork 0
mirror of https://gitee.com/dgiiot/dgiot.git synced 2024-12-01 19:58:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add dgiot_client

Browse Source
This commit is contained in:
jhonliu 2022-05-23 10:40:43 +08:00
parent 59a7efaa1e
commit b3bb039c1b
21 changed files with 538 additions and 712 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/dgiot/include/dgiot.hrl
View File

@ -18,7 +18,6 @@
-define(GLOBAL_TOPIC, <<"global/dgiot">>).
-define(DCACHE, dgiotdiskcache).
-define(DEFREGISTRY, dgiot_global).
-define(DGIOT_CLIENT(Id), binary_to_atom(<<"dgiot_client_", Id/binary>>)).
-define(CHILD(I, Type, Args), {I, {I, start_link, Args}, permanent, 5000, Type, [I]}).
-define(CHILD2(I, Mod, Type, Args), {I, {Mod, start_link, Args}, permanent, 5000, Type, [Mod]}).

39
apps/dgiot/include/dgiot_client.hrl Normal file
View File

@ -0,0 +1,39 @@
%%--------------------------------------------------------------------
%% 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.
%%--------------------------------------------------------------------
-author("johnliu").
-record(dclock, {
nexttime :: non_neg_integer(), %% 下一次闹铃执行时间
endtime :: non_neg_integer(), %% 闹铃结束时间
freq :: non_neg_integer(), %% 周期闹铃提醒频率单位为秒
round :: non_neg_integer(), %% 闹铃总计执行轮次
rand :: boolean() %% 闹铃任务启动是否随机错峰处理, 防止所有客户端在同一个时刻启动任务
}).
-record(dclient, {
channel :: atom(), %% 客户端的用户管理通道
client :: binary(), %% 客户端地址
status :: integer(), %% client的状态值
clock :: #dclock{}, %% client的闹铃
userdata %% 用户自定义参数
}).
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% dclient的状态字
-define(DCLIENT_SUCCESS, 0). % CLIENT运行正常
-define(DCLIENT_INTIALIZED, 1). % CLIENT初始化状态

180
apps/dgiot/src/channel/dgiot_client.erl
View File

@ -1,5 +1,5 @@
%%--------------------------------------------------------------------
%% Copyright (c) 2020-2021 DGIOT Technologies Co., Ltd. All Rights Reserved.
%% Copyright (c) 2021-2022 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.
@ -15,15 +15,21 @@
%%--------------------------------------------------------------------
-module(dgiot_client).
-author("kenneth").
-author("johnliu").
-include("dgiot.hrl").
-include_lib("dgiot/include/logger.hrl").
%% API
-export([register/3, start_link/2, start/2, stop/1, stop/2, get/2, restart/2, save/2, notify/3, set_consumer/2, get_consumer/1]).
-export([register/3, start_link/2, add_clock/3, notify/3, add/2, set_consumer/2, get_consumer/1]).
-export([start/2, start/3, stop/1, stop/2, stop/3, restart/2, get/2, send/4]).
-export([get_nexttime/2, send_after/4]).
-export([add_clock/3]).
-type(result() :: any()). %% todo 目前只做参数检查，不做结果检查
%% @doc 注册client的通道管理池子
-spec register(atom() | binary(), atom(), map()) -> result().
register(ChannelId, Sup, State) when is_binary(ChannelId) ->
register(binary_to_atom(ChannelId), Sup, State);
register(ChannelId, Sup, State) ->
case dgiot_data:get({client, ChannelId}) of
not_find ->
@ -32,29 +38,69 @@ register(ChannelId, Sup, State) ->
pass
end,
set_consumer(ChannelId, 100),
dgiot_data:init(?DGIOT_CLIENT(ChannelId)),
dgiot_data:init(ChannelId),
dgiot_data:delete({start_client, ChannelId}),
dgiot_data:delete({stop_client, ChannelId}),
ChildSpec = dgiot:child_spec(Sup, supervisor, [?DGIOT_CLIENT(ChannelId)]),
ChildSpec = dgiot:child_spec(Sup, supervisor, [ChannelId]),
[ChildSpec].
save(ChannelId, ClientId) ->
dgiot_data:insert(?DGIOT_CLIENT(ChannelId), ClientId, self()).
%% @doc 在通道管理池子中增加client的Pid号
-spec add(atom() | binary(), binary()) -> result().
add(ChannelId, ClientId) when is_binary(ChannelId) ->
add(binary_to_atom(ChannelId), ClientId);
add(ChannelId, ClientId) ->
dgiot_data:insert(ChannelId, ClientId, self()).
%% @doc 启动client
-spec start(atom() | binary(), binary()) -> result().
start(ChannelId, ClientId) when is_binary(ChannelId) ->
start(binary_to_atom(ChannelId), ClientId);
start(ChannelId, ClientId) ->
start(ChannelId, ClientId, #{}).
%% @doc 启动client, 自定义启动参数
-spec start(atom() | binary(), binary(), map()) -> result().
start(ChannelId, ClientId, Args) when is_binary(ChannelId) ->
start(binary_to_atom(ChannelId), ClientId, Args);
start(ChannelId, ClientId, Args) ->
case dgiot_data:get({client, ChannelId}) of
State when is_map(State) ->
supervisor:start_child(?DGIOT_CLIENT(ChannelId), [State#{<<"client">> => ClientId}]);
supervisor:start_child(ChannelId, [maps:merge(State#{<<"client">> => ClientId}, Args)]);
_ ->
pass
end.
%% @doc 停止通道下所有的client
-spec stop(atom() | binary()) -> result().
stop(ChannelId) when is_binary(ChannelId) ->
stop(binary_to_atom(ChannelId));
stop(ChannelId) ->
case ets:info(ChannelId) of
undefined ->
pass;
_ ->
Fun =
fun
({_Key, Pid}) when is_pid(Pid) ->
supervisor:terminate_child(ChannelId, Pid);
(_) ->
pass
end,
dgiot_data:loop(ChannelId, Fun),
dgiot_data:clear(ChannelId)
end.
%% @doc stop client
-spec stop(atom() | binary(), binary()) -> result().
stop(ChannelId, ClientId) when is_binary(ChannelId) ->
stop(binary_to_atom(ChannelId), ClientId);
stop(ChannelId, ClientId) ->
case dgiot_data:get(?DGIOT_CLIENT(ChannelId), ClientId) of
case dgiot_data:get(ChannelId, ClientId) of
Pid when is_pid(Pid) ->
case is_process_alive(Pid) of
true ->
supervisor:terminate_child(?DGIOT_CLIENT(ChannelId), Pid);
io:format("~s ~p DtuId = ~p. Pid ~p ~n", [?FILE, ?LINE, ChannelId,Pid]),
supervisor:terminate_child(ChannelId, Pid);
_ ->
pass
end;
@ -62,25 +108,23 @@ stop(ChannelId, ClientId) ->
pass
end.
%% 停止通道下所有的client
stop(ChannelId) ->
case ets:info(?DGIOT_CLIENT(ChannelId)) of
undefined ->
pass;
_ ->
Fun =
fun
({_Key, Pid}) when is_pid(Pid) ->
supervisor:terminate_child(?DGIOT_CLIENT(ChannelId), Pid);
(_) ->
pass
end,
dgiot_data:loop(?DGIOT_CLIENT(ChannelId), Fun),
dgiot_data:clear(?DGIOT_CLIENT(ChannelId))
%% @doc stop client
-spec stop(atom() | binary(), binary(), non_neg_integer()) -> result().
stop(ChannelId, ClientId, EndTime) when is_binary(ChannelId) ->
stop(binary_to_atom(ChannelId), ClientId, EndTime);
stop(ChannelId, ClientId, EndTime) ->
NowTime = dgiot_datetime:nowstamp(),
case NowTime > EndTime of
true ->
stop(ChannelId, ClientId)
end.
%% @doc restart client
-spec restart(atom() | binary(), binary()) -> result().
restart(ChannelId, ClientId) when is_binary(ChannelId) ->
restart(binary_to_atom(ChannelId), ClientId);
restart(ChannelId, ClientId) ->
case dgiot_data:get(?DGIOT_CLIENT(ChannelId), ClientId) of
case dgiot_data:get(ChannelId, ClientId) of
Pid when is_pid(Pid) ->
case is_process_alive(Pid) of
true ->
@ -93,8 +137,12 @@ restart(ChannelId, ClientId) ->
start(ChannelId, ClientId)
end.
%% @doc get client info
-spec get(atom() | binary(), binary()) -> result().
get(ChannelId, ClientId) when is_binary(ChannelId) ->
get(binary_to_atom(ChannelId), ClientId);
get(ChannelId, ClientId) ->
case dgiot_data:get(?DGIOT_CLIENT(ChannelId), ClientId) of
case dgiot_data:get(ChannelId, ClientId) of
Pid when is_pid(Pid) ->
case is_process_alive(Pid) of
true ->
@ -106,8 +154,28 @@ get(ChannelId, ClientId) ->
offline
end.
%% @doc send message to client
-spec send(atom() | binary(), binary(), binary(), binary() | map()) -> result().
send(ChannelId, ClientId, Topic, Payload) when is_binary(ChannelId) ->
send(binary_to_atom(ChannelId), ClientId, Topic, Payload);
send(ChannelId, ClientId, Topic, Payload) ->
case dgiot_data:get(ChannelId, ClientId) of
Pid when is_pid(Pid) ->
case is_process_alive(Pid) of
true ->
Pid ! {dclient_ack, Topic, Payload},
ok;
false ->
fasle
end;
_ ->
fasle
end.
%% @doc client start_link
-spec start_link(atom(), map()) -> result().
start_link(Module, #{<<"channel">> := ChannelId, <<"client">> := Client} = State) ->
case dgiot_data:lookup(?DGIOT_CLIENT(ChannelId), Client) of
case dgiot_data:lookup(dgiot_utils:to_atom(ChannelId), Client) of
{ok, Pid} when is_pid(Pid) ->
case is_process_alive(Pid) of
true ->
@ -119,20 +187,58 @@ start_link(Module, #{<<"channel">> := ChannelId, <<"client">> := Client} = State
gen_server:start_link(Module, [State], [])
end.
%% @doc 做一下全局的错峰处理
-spec send_after(integer(), integer(), boolean(), any()) -> result().
send_after(RetryTime, Freq, true, Msg) ->
Seed = Freq * 200, % 默认用采样周期的20%的时间来做随机
Rand = rand:uniform(Seed),
erlang:send_after(RetryTime * 1000 + Rand, self(), Msg);
send_after(RetryTime, _Freq, _, Msg) ->
erlang:send_after(RetryTime * 1000, self(), Msg).
get_nexttime(NextTime, Freq) ->
NowTime = dgiot_datetime:nowstamp(),
get_nexttime(NowTime, Freq, NextTime).
get_nexttime(NowTime, Freq, NextTime) when (NextTime > NowTime) ->
RetryTime = NextTime - NowTime,
erlang:send_after(RetryTime * 1000, self(), next_time),
NextTime + Freq;
get_nexttime(NowTime, Freq, NextTime) ->
get_nexttime(NowTime, Freq, NextTime + Freq).
%% @doc 设置消费组大小
-spec set_consumer(binary() | atom(), integer()) -> result().
set_consumer(ChannelId, PoolSize) when is_binary(ChannelId) ->
set_consumer(binary_to_atom(ChannelId), PoolSize);
set_consumer(ChannelId, PoolSize) ->
dgiot_data:set_consumer(?DGIOT_CLIENT(ChannelId), PoolSize).
dgiot_data:set_consumer(ChannelId, PoolSize).
%% @doc 获取消费组值
-spec get_consumer(binary() | atom()) -> result().
get_consumer(ChannelId) when is_binary(ChannelId) ->
get_consumer(binary_to_atom(ChannelId));
get_consumer(ChannelId) ->
dgiot_data:get_consumer(?DGIOT_CLIENT(ChannelId), 1).
dgiot_data:get_consumer(ChannelId, 1).
%% 定时检查启动, 10s 检查一次
%% 定时检查启动, 10s
%% @doc 添加闹铃
-spec add_clock(binary() | atom(), binary(), binary()) -> result().
add_clock(Channel, Start_time, End_time) when is_binary(Channel) ->
add_clock(dgiot_utils:to_atom(Channel), Start_time, End_time);
add_clock(Channel, Start_time, End_time) ->
io:format("Channel ~p, Start_time ~p, End_time ~p",[Channel, Start_time, End_time]),
dgiot_cron:push(Channel, dgiot_datetime:to_localtime(Start_time), {?MODULE, notify, [Channel, start_client]}),
dgiot_cron:push(<<Channel/binary,"_stop">>, dgiot_datetime:to_localtime(End_time), {?MODULE, notify, [Channel, stop_client]}).
BinChannel = dgiot_utils:to_binary(Channel),
dgiot_cron:push(BinChannel, dgiot_datetime:to_localtime(Start_time), {?MODULE, notify, [Channel, start_client]}),
dgiot_cron:push(<<BinChannel/binary, "_stop">>, dgiot_datetime:to_localtime(End_time), {?MODULE, notify, [Channel, stop_client]}).
%% 定时检查启动, 10s
%% @doc 闹铃通知回调函数
-spec notify(any(), binary() | atom(), atom()) -> result().
notify(_Task, Channel, Type) when is_binary(Channel) ->
notify(_Task, binary_to_atom(Channel), Type);
notify(_Task, Channel, Type) ->
dgiot_channelx:do_message(Channel, Type),
dgiot_channelx:do_message(atom_to_binary(Channel), Type),
timer:sleep(50),
dgiot_data:insert({Type,Channel}, Type).
dgiot_data:insert({Type, Channel}, Type).

4
apps/dgiot/src/transport/dgiot_mqtt.erl
View File

@ -28,6 +28,7 @@
, unsubscribe/1
, publish/3
, publish/4
, message/3
, shared_sub/3
, shared_unsub/3
, get_payload/1
@ -65,6 +66,9 @@ publish(Client, Topic, Payload, check_route) ->
publish(Client, Topic, Payload, _) ->
publish(Client, Topic, Payload).
message(Client, Topic, Payload) ->
emqx_message:make(dgiot_utils:to_binary(Client), 0, Topic, Payload).
shared_sub(Group, Topic, SubPid) ->
emqx_shared_sub:subscribe(Group, Topic, SubPid).

39
apps/dgiot/src/transport/dgiot_tcp_client.erl
View File

@ -20,28 +20,21 @@
-include_lib("dgiot/include/logger.hrl").
-behaviour(gen_server).
%% API
-export([start_link/6, start_link/4, start_link/5, start_link/3, start_link/7, send/2]).
-export([start_link/1, send/2]).
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
-record(state, {host, port, child = #tcp{}, mod, reconnect_times, reconnect_sleep = 30}).
-define(TIMEOUT, 10000).
-define(TCP_OPTIONS, [binary, {active, once}, {packet, raw}, {reuseaddr, false}, {send_timeout, ?TIMEOUT}]).
start_link(Args) ->
dgiot_client:start_link(?MODULE, Args).
start_link(Mod, Host, Port) ->
start_link(Mod, Host, Port, undefined).
start_link(Mod, Host, Port, Args) ->
start_link(Mod, Host, Port, max, 30, Args).
start_link(Name, Mod, Host, Port, Args) ->
start_link(Name, Mod, Host, Port, max, 30, Args).
start_link(Mod, Host, Port, ReconnectTimes, ReconnectSleep, Args) ->
start_link(undefined, Mod, Host, Port, ReconnectTimes, ReconnectSleep, Args).
start_link(Name, Mod, Host, Port, ReconnectTimes, ReconnectSleep, Args) ->
init([#{<<"host">> := Host, <<"port">> := Port, <<"mod">> := Mod, <<"child">> := ChildState} = Args]) ->
io:format("~s ~p ~p ~n", [?FILE, ?LINE, ChildState]),
Ip = dgiot_utils:to_list(Host),
Port1 = dgiot_utils:to_int(Port),
ReconnectTimes = maps:get(<<"reconnect_times">>, Args, max),
ReconnectSleep = maps:get(<<"reconnect_sleep">>, Args, 30),
State = #state{
mod = Mod,
host = Ip,
@ -49,19 +42,9 @@ start_link(Name, Mod, Host, Port, ReconnectTimes, ReconnectSleep, Args) ->
reconnect_times = ReconnectTimes, %% 重连次数
reconnect_sleep = ReconnectSleep %% 重连间隔
},
case Name of
undefined ->
gen_server:start_link(?MODULE, [State, Args], []);
_ ->
gen_server:start_link({local, list_to_atom(dgiot_utils:to_list(Name))}, ?MODULE, [State, Args], [])
end.
init([#state{mod = Mod} = State, Args]) ->
?LOG(info,"Mod ~p Args ~p ",[Mod, Args]),
Transport = gen_tcp,
Child = #tcp{transport = Transport, socket = undefined},
case Mod:init(Child#tcp{state = Args}) of
case Mod:init(Child#tcp{state = ChildState}) of
{ok, ChildState} ->
NewState = State#state{
child = ChildState
@ -98,17 +81,17 @@ handle_cast(Msg, #state{mod = Mod, child = ChildState} = State) ->
%% 连接次数为0了
handle_info(do_connect, State) ->
?LOG(info,"CONNECT CLOSE ~s:~p", [State#state.host, State#state.port]),
?LOG(info, "CONNECT CLOSE ~s:~p", [State#state.host, State#state.port]),
{stop, normal, State};
%% 连接次数为0了
handle_info(connect_stop, State) ->
?LOG(info,"CONNECT CLOSE ~s:~p", [State#state.host, State#state.port]),
?LOG(info, "CONNECT CLOSE ~s:~p", [State#state.host, State#state.port]),
{stop, normal, State};
handle_info({connection_ready, Socket}, #state{mod = Mod, child = ChildState} = State) ->
NewChildState = ChildState#tcp{socket = Socket},
?LOG(info,"connection_ready ~p~n", [Socket]),
?LOG(info, "connection_ready ~p~n", [Socket]),
case Mod:handle_info(connection_ready, NewChildState) of
{noreply, NewChildState1} ->
inet:setopts(Socket, [{active, once}]),

11
apps/dgiot/src/transport/tcp_client_sup.erl
View File

@ -14,9 +14,8 @@
%% limitations under the License.
%%--------------------------------------------------------------------
-module(task_sup).
-module(tcp_client_sup).
-include("dgiot_task.hrl").
-behaviour(supervisor).
-export([start_link/1, init/1]).
@ -25,16 +24,10 @@ start_link(Name) ->
supervisor:start_link({local, Name}, ?MODULE, []).
init([]) ->
ChildSpec = [dgiot:child_spec(dgiot_task_worker, worker)],
ChildSpec = [dgiot:child_spec(dgiot_tcp_client, worker)],
{ok, {{simple_one_for_one, 5, 10}, ChildSpec}}.

6
apps/dgiot_bamis/include/dgiot_bamis.hrl
View File

@ -17,11 +17,7 @@
-define(AMIS, <<"AMIS">>).
-record(state, {
id,
env = #{},
dtuaddr = <<>>,
step = login,
ref = undefined,
search = <<"quick">>
env = #{}
}).
-record(task, {oldque = [], newque = [], freq = 0, heart = 0, dashboardId = <<>>, sessiontoken = <<>>}).

55
apps/dgiot_bamis/src/dgiot_bamis_channel.erl
View File

@ -44,18 +44,6 @@
}).
%% 注册通道参数
-params(#{
<<"port">> => #{
order => 1,
type => integer,
required => true,
default => 61888,
title => #{
zh => <<"端口"/utf8>>
},
description => #{
zh => <<"侦听端口"/utf8>>
}
},
<<"ico">> => #{
order => 102,
type => string,
@ -76,27 +64,10 @@
start(ChannelId, ChannelArgs) ->
dgiot_channelx:add(?TYPE, ChannelId, ?MODULE, ChannelArgs).
%% 通道初始化
init(?TYPE, ChannelId, #{
<<"product">> := Products,
<<"search">> := Search}) ->
lists:map(fun(X) ->
case X of
{ProductId, #{<<"ACL">> := Acl, <<"nodeType">> := 1,<<"thing">> := Thing}} ->
dgiot_data:insert({amis, ChannelId}, {ProductId, Acl, maps:get(<<"properties">>,Thing,[])});
_ ->
?LOG(info,"X ~p", [X]),
pass
end
end, Products),
dgiot_data:set_consumer(ChannelId, 20),
State = #state{
id = ChannelId,
search = Search
},
{ok, State, []};
init(?TYPE, _ChannelId, _Args) ->
init(?TYPE, ChannelId, _Args) ->
dgiot_parse_hook:subscribe(<<"View">>, post, ChannelId),
dgiot_parse_hook:subscribe(<<"View/*">>, put, ChannelId, [<<"isEnable">>]),
dgiot_parse_hook:subscribe(<<"View/*">>, delete, ChannelId),
{ok, #{}, #{}}.
handle_init(State) ->
@ -106,19 +77,19 @@ handle_init(State) ->
handle_event(_EventId, _Event, State) ->
{ok, State}.
% SELECT clientid, payload, topic FROM "meter"
% SELECT clientid, disconnected_at FROM "$events/client_disconnected" WHERE username = 'dgiot'
% SELECT clientid, connected_at FROM "$events/client_connected" WHERE username = 'dgiot'
handle_message({rule, #{clientid := DtuAddr, connected_at := _ConnectedAt}, #{peername := PeerName} = _Context}, #state{id = _ChannelId} = State) ->
?LOG(error,"DtuAddr ~p PeerName ~p",[DtuAddr,PeerName] ),
handle_message({sync_parse, Pid, 'after', post, _Token, <<"View">>, QueryData}, State) ->
io:format("~s ~p ~p ~p ~n", [?FILE, ?LINE, Pid, QueryData]),
dgiot_bamis_view:post('after', QueryData),
{ok, State};
handle_message({rule, #{clientid := DevAddr, disconnected_at := _DisconnectedAt}, _Context}, State) ->
?LOG(error,"DevAddr ~p ",[DevAddr] ),
handle_message({sync_parse, _Pid, 'after', put, _Token, <<"View">>, QueryData}, State) ->
%% io:format("~s ~p ~p ~p ~n", [?FILE, ?LINE, Pid, QueryData]),
dgiot_bamis_view:put('after', QueryData),
{ok, State};
handle_message({rule, #{clientid := DevAddr, payload := Payload, topic := _Topic}, _Msg}, #state{id = ChannelId} = State) ->
?LOG(error,"DevAddr ~p Payload ~p ChannelId ~p",[DevAddr,Payload,ChannelId] ),
handle_message({sync_parse, _Pid, 'after', delete, _Token, <<"View">>, ObjectId}, State) ->
%% io:format("~s ~p ~p ~p ~n", [?FILE, ?LINE, Pid, ObjectId]),
dgiot_bamis_view:delete('after', ObjectId),
{ok, State};
handle_message(_Message, State) ->

48
apps/dgiot_bamis/src/dgiot_bamis_view.erl Normal file
View File

@ -0,0 +1,48 @@
%%--------------------------------------------------------------------
%% Copyright (c) 2020 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.
%%--------------------------------------------------------------------
%% @doc dgiot_bamis Protocol
-module(dgiot_bamis_view).
-include("dgiot_bamis.hrl").
-include_lib("dgiot/include/logger.hrl").
-dgiot_swagger(<<"amis">>).
-export([
post/2,
put/2,
delete/2
]).
post('before', Args) ->
%% io:format("~s ~p ~p ~p~n", [?FILE, ?LINE, Args, Id]),
Args;
post('after', Data) ->
%% io:format("~s ~p ~p~n", [?FILE, ?LINE, Data]),
Data.
put('before', Args) ->
%% io:format("~s ~p ~p ~p~n", [?FILE, ?LINE, Args, Id]),
Args;
put('after', Data) ->
%% io:format("~s ~p ~p~n", [?FILE, ?LINE, Data]),
Data.
delete('before', Args) ->
%% io:format("~s ~p ~p ~p ~n", [?FILE, ?LINE, Args, Id]),
Args;
delete('after', Data) ->
Data.

177
apps/dgiot_bridge/src/channel/dgiot_tcpc_channel.erl
View File

@ -17,6 +17,7 @@
-behavior(dgiot_channelx).
-include("dgiot_bridge.hrl").
-include_lib("dgiot/include/logger.hrl").
-include_lib("dgiot/include/dgiot_socket.hrl").
-define(TYPE, <<"TCPC">>).
-record(state, {id, env}).
%% API
@ -27,6 +28,10 @@
%% Channel callback
-export([init/3, handle_init/1, handle_event/3, handle_message/2, stop/3]).
%% tcp client callback
-define(MAX_BUFF_SIZE, 10 * 1024).
-export([init/1, handle_info/2, terminate/2]).
-channel(?TYPE).
-channel_type(#{
cType => ?TYPE,
@ -64,42 +69,6 @@
zh => <<"端口"/utf8>>
}
},
<<"page_index">> => #{
order => 3,
type => integer,
required => false,
default => 1,
title => #{
zh => <<"起始记录号"/utf8>>
},
description => #{
zh => <<"起始记录号"/utf8>>
}
},
<<"page_size">> => #{
order => 4,
type => integer,
required => false,
default => 1,
title => #{
zh => <<"每页记录数"/utf8>>
},
description => #{
zh => <<"每页记录数"/utf8>>
}
},
<<"total">> => #{
order => 5,
type => integer,
required => false,
default => 1,
title => #{
zh => <<"总计页数"/utf8>>
},
description => #{
zh => <<"总计页数"/utf8>>
}
},
<<"ico">> => #{
order => 102,
type => string,
@ -121,18 +90,13 @@ start(ChannelId, ChannelArgs) ->
%% 通道初始化
init(?TYPE, ChannelId, Args) ->
State = #state{
id = ChannelId,
env = Args
},
{ok, State, []}.
init(?TYPE, ChannelId,
#{<<"ip">> := Ip, <<"port">> := Port} = Args) ->
State = #state{id = ChannelId, env = Args},
NewArgs = #{<<"ip">> => Ip, <<"port">> => Port, <<"mod">> => ?MODULE, <<"child">> => #{}},
{ok, State, dgiot_client:register(ChannelId, tcp_client_sup, NewArgs)}.
handle_init(#state{ id = ChannelId, env = Args} = State) ->
#{<<"product">> := Products, <<"ip">> := Ip, <<"port">> := Port} = Args,
lists:map(fun({ProductId, _Opt}) ->
start_client(ChannelId, ProductId, Ip, Port, Args)
end, Products),
handle_init(State) ->
{ok, State}.
%% 通道消息处理,注意：进程池调用
@ -147,28 +111,97 @@ stop(ChannelType, ChannelId, _State) ->
?LOG(warning, "channel stop ~p,~p", [ChannelType, ChannelId]),
ok.
start_client(ChannelId, ProductId, Ip, Port,
#{<<"page_index">> := PageIndex, <<"page_size">> := PageSize, <<"total">> := Total}) ->
Success = fun(Page) ->
lists:map(fun(X) ->
case X of
#{<<"devaddr">> := DevAddr} ->
dgiot_tcpc_worker:start_connect(#{
<<"channelid">> => ChannelId,
<<"auto_reconnect">> => 10,
<<"reconnect_times">> => 3,
<<"ip">> => Ip,
<<"port">> => Port,
<<"productid">> => ProductId,
<<"hb">> => 60,
<<"devaddr">> => DevAddr
});
_ ->
ok
end
end, Page)
end,
Query = #{
<<"where">> => #{<<"product">> => ProductId}
},
dgiot_parse_loader:start(<<"Device">>, Query, PageIndex, PageSize, Total, Success).
%% tcp client callback
init(TCPState) ->
{ok, TCPState}.
handle_info(connection_ready, #tcp{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 = #{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 = #{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 = #{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 = #{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 = #{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.

2
apps/dgiot_device/src/dgiot_product_hook.erl
View File

@ -29,7 +29,7 @@ post('after', #{<<"objectId">> := ProductId, <<"channel">> := Channel} = QueryDa
TaskchannelId = maps:get(<<"taskchannel">>, Channel, <<"">>),
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]),
%% io:format("~s ~p ~p ~n ",[?FILE,?LINE, QueryData]),
post('after', maps:without([<<"channel">>], QueryData));
post('after', #{<<"objectId">> := ProductId, <<"producttemplet">> := #{<<"objectId">> := ProducttempletId}} = _QueryData) ->

30
apps/dgiot_ffmpeg/src/dgiot_ffmpeg.erl
View File

@ -194,7 +194,7 @@ create_scr_device(#{
SCREENADDR = <<"SCR_", GWAddr/binary>>,
{_, #{<<"objectId">> := ProductId}} =
scan_ipc(Env#{<<"IPCMAC">> => SCREENADDR}),
{_, #{<<"objectId">> := DeviceId1}} = dgiot_device:create_device(#{
dgiot_device:create_device(#{
<<"status">> => <<"ONLINE">>,
<<"devaddr">> => SCREENADDR,
<<"name">> => SCREENADDR,
@ -208,8 +208,7 @@ create_scr_device(#{
<<"className">> => <<"Device">>,
<<"objectId">> => GwDeviceId
}
}),
create_instruct(Acl, ProductId, DeviceId1, SCREENADDR).
}).
create_ipc_device(#{
<<"IPCMAC">> := Mac,
@ -229,7 +228,7 @@ create_ipc_device(#{
DevAddr = <<"IPC_", IPCMAC/binary>>,
{_, #{<<"objectId">> := ProductId}} =
scan_ipc(Env#{<<"IPCMAC">> => DevAddr}),
{_, #{<<"objectId">> := DeviceId}} =
{_, #{<<"objectId">> := _DeviceId}} =
dgiot_device:create_device(#{
<<"status">> => <<"ONLINE">>,
<<"devaddr">> => DevAddr,
@ -246,7 +245,6 @@ create_ipc_device(#{
<<"objectId">> => GwDeviceId
}
}),
create_instruct(Acl, ProductId, DeviceId, DevAddr),
Acc#{DevAddr => IPCIP}
end
end, #{}, MacList).
@ -261,28 +259,6 @@ get_ipc(DtuAddr) ->
end
end, #{}, dgiot_device:get_sub_device(DtuAddr)).
create_instruct(ACL, ProductId, DeviceId, DevAddr) ->
case dgiot_product:lookup_prod(ProductId) of
{ok, #{<<"thing">> := Thing}} ->
#{<<"properties">> := Props} = Thing,
NewProps =
lists:foldl(fun(X, Acc) ->
case X of
#{<<"name">> := <<"点播地址"/utf8>>,
<<"dataForm">> := DataForm} ->
#{<<"dataForm">> := DataForm} = X,
Acc ++ [X#{<<"dataForm">> => DataForm#{<<"address">> => <<DevAddr/binary, "/VIDEO">>}}];
_ -> Acc
end
end, [], Props),
Pn = <<DevAddr/binary, "/FFMPEG">>,
Topic = <<"thing/", ProductId/binary, "/", DevAddr/binary, "/", Pn/binary>>,
dgiot_mqtt:subscribe(Topic),
dgiot_instruct:create(ProductId, DeviceId, Pn, ACL, <<"all">>, Thing#{
<<"properties">> => NewProps
});
_ -> pass
end.
get_path(DevAddr) ->
{file, Here} = code:is_loaded(?MODULE),

24
apps/dgiot_modbus/src/dgiot_modbus_tcp.erl
View File

@ -173,8 +173,7 @@ create_device(DeviceId, ProductId, DTUMAC, DTUIP, Dtutype) ->
case dgiot_parse:get_object(<<"Device">>, DeviceId) of
{ok, #{<<"devaddr">> := _GWAddr}} ->
dgiot_parse:update_object(<<"Device">>, DeviceId, #{<<"ip">> => DTUIP, <<"status">> => <<"ONLINE">>}),
dgiot_task:save_pnque(ProductId, DTUMAC, ProductId, DTUMAC),
create_instruct(Acl, ProductId, DeviceId);
dgiot_task:save_pnque(ProductId, DTUMAC, ProductId, DTUMAC);
_ ->
dgiot_device:create_device(#{
<<"devaddr">> => DTUMAC,
@ -188,8 +187,7 @@ create_device(DeviceId, ProductId, DTUMAC, DTUIP, Dtutype) ->
<<"brand">> => Dtutype,
<<"devModel">> => DevType
}),
dgiot_task:save_pnque(ProductId, DTUMAC, ProductId, DTUMAC),
create_instruct(Acl, ProductId, DeviceId)
dgiot_task:save_pnque(ProductId, DTUMAC, ProductId, DTUMAC)
end,
Productname =
case dgiot_parse:get_object(<<"Product">>, ProductId) of
@ -204,21 +202,3 @@ create_device(DeviceId, ProductId, DTUMAC, DTUIP, Dtutype) ->
%% ?LOG(info, "Error2 ~p ", [Error2]),
{<<>>, <<>>}
end.
create_instruct(ACL, DtuProductId, DtuDevId) ->
case dgiot_product:lookup_prod(DtuProductId) of
{ok, #{<<"thing">> := #{<<"properties">> := Properties}}} ->
lists:map(fun(Y) ->
case Y of
#{<<"dataSource">> := #{<<"slaveid">> := 256}} -> %%不做指令
pass;
#{<<"dataSource">> := #{<<"slaveid">> := SlaveId}} ->
Pn = dgiot_utils:to_binary(SlaveId),
%% ?LOG(info,"DtuProductId ~p DtuDevId ~p Pn ~p ACL ~p", [DtuProductId, DtuDevId, Pn, ACL]),
%% ?LOG(info,"Y ~p", [Y]),
dgiot_instruct:create(DtuProductId, DtuDevId, Pn, ACL, <<"all">>, #{<<"properties">> => [Y]});
_ -> pass
end
end, Properties);
_ -> pass
end.

26
apps/dgiot_modbus/src/dgiot_modbusc_channel.erl
View File

@ -100,7 +100,7 @@ init(?TYPE, ChannelId, #{
<<"ip">> := Ip,
<<"port">> := Port
} = Args) ->
{FileName, MinAddr, MaxAddr} =
{_FileName, _MinAddr, _MaxAddr} =
case maps:find(<<"file">>, Args) of
{ok, FileName1} ->
{MinAddr1, MaxAddr1} = dgiot_product_csv:read_csv(ChannelId, FileName1),
@ -109,18 +109,18 @@ init(?TYPE, ChannelId, #{
_ ->
{<<>>, 0, 100}
end,
dgiot_modbusc_tcp:start_connect(#{
<<"auto_reconnect">> => 10,
<<"reconnect_times">> => 3,
<<"ip">> => Ip,
<<"port">> => Port,
<<"channelid">> => ChannelId,
<<"hb">> => 10,
<<"filename">> => FileName,
<<"minaddr">> => MinAddr,
<<"maxaddr">> => MaxAddr
}),
{ok, #state{id = ChannelId}, []}.
%% dgiot_modbusc_tcp:start_connect(#{
%% <<"auto_reconnect">> => 10,
%% <<"reconnect_times">> => 3,
%% <<"ip">> => Ip,
%% <<"port">> => Port,
%% <<"channelid">> => ChannelId,
%% <<"hb">> => 10,
%% <<"filename">> => FileName,
%% <<"minaddr">> => MinAddr,
%% <<"maxaddr">> => MaxAddr
%% }),
{ok, #state{id = ChannelId}, dgiot_client:register(ChannelId, tcp_client_sup, #{<<"ip">> => Ip, <<"port">> => Port})}.
handle_init(State) ->
{ok, State}.

25
apps/dgiot_modbus/src/dgiot_modbusc_tcp.erl
View File

@ -18,36 +18,11 @@
-include_lib("dgiot/include/dgiot_socket.hrl").
%% API
-export([init/1, handle_info/2, terminate/2]).
-export([start_connect/1]).
-include("dgiot_modbus.hrl").
-include_lib("dgiot/include/dgiot.hrl").
-define(MAX_BUFF_SIZE, 10 * 1024).
-include_lib("dgiot/include/logger.hrl").
start_connect(_Opts =
#{
<<"auto_reconnect">> := Recon,
<<"reconnect_times">> := ReTimes,
<<"ip">> := Ip,
<<"port">> := Port,
<<"channelid">> := ChannelId,
<<"hb">> := HB,
<<"filename">> := FileName,
<<"minaddr">> := MinAddr,
<<"maxaddr">> := Maxaddr
}) ->
State = #state{
id = ChannelId,
hb = HB,
env = #{
data => <<>>,
filename => FileName,
minaddr => MinAddr,
maxaddr => Maxaddr
}
},
dgiot_tcp_client:start_link(?MODULE, Ip, Port, Recon, ReTimes, State).
init(TCPState) ->
{ok, TCPState}.

2
apps/dgiot_task/include/dgiot_task.hrl
View File

@ -15,7 +15,7 @@
%%--------------------------------------------------------------------
-author("johnliu").
-define(TYPE, <<"INSTRUCT">>).
-define(DGIOT_TASK, dgiot_task).
-define(DGIOT_PNQUE, dgiot_pnque).
-define(DGIOT_DATA_CACHE, dgiot_data_cache).

273
apps/dgiot_task/src/dgiot_instruct.erl
View File

@ -1,273 +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_instruct).
-author("jonhl").
-include("dgiot_task.hrl").
-include_lib("dgiot/include/logger.hrl").
%% API
-export([
createsub/6,
create/6,
create_group/7,
get_instruct/4,
get_child_instruct/3
]).
createsub(ProductId, DeviceId, DtuAddr, ACL, Rotation, #{<<"parentDtu">> := ParentDtu}) ->
lists:map(fun(X) ->
#{
<<"route">> := #{DtuAddr := Pn},
<<"ACL">> := ACL,
<<"product">> := #{<<"thing">> := Thing}
} = X,
NewPn = <<DtuAddr/binary, "/", Pn/binary>>,
create(ProductId, DeviceId, NewPn, ACL, Rotation, Thing#{<<"parentDtu">> => ParentDtu})
end, dgiot_device:get_sub_device(DtuAddr)),
ok.
create(ProductId, DeviceId, Pn, ACL, Rotation, #{<<"properties">> := Props}) ->
lists:map(fun(X) ->
case X of
#{<<"dataForm">> := #{<<"strategy">> := <<"计算值"/utf8>>}} ->
pass;
#{<<"dataForm">> := #{<<"strategy">> := <<"主动上报"/utf8>>}} ->
pass;
#{<<"accessMode">> := Op, <<"dataForm">> := #{<<"address">> := Di, <<"order">> := Order} = DataForm,
<<"name">> := Name, <<"identifier">> := Identifier, <<"required">> := Enable} ->
case Di of
<<"">> -> pass;
_ ->
ObjectId = dgiot_parse_id:get_instructid(DeviceId, Pn, Di),
case dgiot_parse:get_object(<<"Instruct">>, ObjectId) of
{ok, _} ->
pass;
_ ->
Map = #{<<"ACL">> => ACL, <<"enable">> => Enable,
<<"product">> => #{
<<"__type">> => <<"Pointer">>,
<<"className">> => <<"Product">>,
<<"objectId">> => ProductId
},
<<"device">> => #{
<<"__type">> => <<"Pointer">>,
<<"className">> => <<"Device">>,
<<"objectId">> => DeviceId
},
<<"name">> => Name, <<"order">> => dgiot_utils:to_binary(Order),
<<"pn">> => Pn, <<"di">> => Di,
<<"op">> => Op, <<"interval">> => 20,
<<"duration">> => 5, <<"rotation">> => Rotation,
<<"other">> => DataForm#{<<"identifier">> => Identifier}
},
dgiot_parse:create_object(<<"Instruct">>, Map)
end
end;
Other ->
?LOG(info, "Other ~p", [Other]),
pass
end
end, Props).
create_group(ProductId, DeviceId, Group, Pn, ACL, Rotation, #{<<"properties">> := Props} = Thing) ->
lists:map(fun(X) ->
#{
<<"accessMode">> := Op,
<<"dataForm">> := #{
<<"address">> := Di
},
<<"name">> := Name,
<<"identifier">> := Identifier,
<<"required">> := Enable
} = X,
case Di of
<<"">> -> pass;
_ -> case dgiot_parse:query_object(<<"Instruct">>, #{<<"where">> => #{
<<"product">> => ProductId,
<<"device">> => DeviceId,
<<"pn">> => Pn,
<<"di">> => Di}}) of
{ok, #{<<"results">> := []}} ->
Other = maps:without([<<"properties">>], Thing),
Map = #{
<<"ACL">> => ACL,
<<"enable">> => Enable,
<<"product">> => #{
<<"__type">> => <<"Pointer">>,
<<"className">> => <<"Product">>,
<<"objectId">> => ProductId
},
<<"device">> => #{
<<"__type">> => <<"Pointer">>,
<<"className">> => <<"Device">>,
<<"objectId">> => DeviceId
},
<<"name">> => Name,
<<"order">> => Group,
<<"pn">> => Pn,
<<"di">> => Di,
<<"op">> => Op,
<<"interval">> => 30,
<<"duration">> => 5,
<<"rotation">> => Rotation,
<<"other">> => Other#{<<"identifier">> => Identifier}
},
dgiot_parse:create_object(<<"Instruct">>, Map);
_ ->
pass
end
end
end, Props).
init_que(DeviceId, Round) ->
case dgiot_parse:query_object(<<"Instruct">>, #{<<"order">> => <<"-order">>, <<"where">> => #{<<"device">> => DeviceId}}) of
{ok, #{<<"results">> := []}} ->
[];
{ok, #{<<"results">> := List}} ->
NewList = lists:foldl(
fun(X, Acc) ->
case X of
#{<<"enable">> := true, <<"op">> := Op, <<"order">> := Order, <<"pn">> := Pn, <<"di">> := Di,
<<"interval">> := Interval, <<"other">> := DataForm} ->
Identifier = maps:get(<<"accessMode">>, DataForm, <<"">>),
AccessMode = maps:get(<<"accessMode">>, DataForm, Op),
Address = maps:get(<<"address">>, DataForm, Di),
Protocol = maps:get(<<"protocol">>, DataForm, <<"">>),
ThingRound = maps:get(<<"round">>, DataForm, <<"all">>),
InstructOrder = maps:get(<<"order">>, DataForm, Order),
Data = maps:get(<<"data">>, DataForm, <<"null">>),
Control = maps:get(<<"control">>, DataForm, "%d"),
NewData = dgiot_task:get_control(Round, Data, Control),
Strategy = dgiot_utils:to_int(maps:get(<<"strategy">>, DataForm, Interval)),
case ThingRound of
<<"all">> ->
Acc ++ [{Order, {InstructOrder, Strategy, Identifier, Pn, Address, AccessMode, NewData, Protocol, ThingRound}}];
Round ->
Acc ++ [{Order, {InstructOrder, Strategy, Identifier, Pn, Address, AccessMode, NewData, Protocol, ThingRound}}];
RoundList ->
case lists:member(Round, RoundList) of
true ->
Acc ++ [{Order, {InstructOrder, Strategy, Identifier, Pn, Address, AccessMode, NewData, Protocol, ThingRound}}];
false ->
Acc
end
end;
_ -> Acc
end
end, [], List),
lists:foldl(fun(X, Acc1) ->
{_, Y} = X,
Acc1 ++ [Y]
end, [], lists:keysort(1, NewList));
_ -> []
end.
get_instruct(ProductId, _DeviceId, Round, thing) ->
get_instruct(ProductId, Round);
get_instruct(ProductId, DeviceId, Round, instruct) ->
get_que(ProductId, DeviceId, Round).
get_instruct(ProductId, Round) ->
case dgiot_product:lookup_prod(ProductId) of
{ok, #{<<"thing">> := #{<<"properties">> := Props}}} when length(Props) > 0 ->
{_, NewList} = lists:foldl(fun(X, Acc) ->
{Order, List} = Acc,
case X of
#{<<"dataForm">> := #{<<"strategy">> := <<"计算值"/utf8>>}} ->
Acc;
#{<<"dataForm">> := #{<<"strategy">> := <<"主动上报"/utf8>>}} ->
Acc;
#{<<"accessMode">> := AccessMode,
<<"identifier">> := Identifier,
<<"dataType">> := #{<<"specs">> := #{<<"min">> := Min}},
<<"dataForm">> := DataForm,
<<"dataSource">> := DataSource} ->
Protocol = maps:get(<<"protocol">>, DataForm, <<"">>),
NewDataSource = dgiot_task_data:get_datasource(Protocol, DataSource),
ThingRound = maps:get(<<"round">>, DataForm, <<"all">>),
InstructOrder = maps:get(<<"order">>, DataForm, Order),
Control = maps:get(<<"control">>, DataForm, "%d"),
NewData = dgiot_task:get_control(Round, Min, Control),
Strategy = dgiot_utils:to_int(maps:get(<<"strategy">>, DataForm, 20)),
BinRound = dgiot_utils:to_binary(Round),
case ThingRound of
<<"all">> ->
{Order + 1, List ++ [{InstructOrder, Strategy, Identifier, AccessMode, NewData, Protocol, NewDataSource, ThingRound}]};
BinRound ->
{Order + 1, List ++ [{InstructOrder, Strategy, Identifier, AccessMode, NewData, Protocol, NewDataSource, ThingRound}]};
Rounds ->
RoundList = binary:split(Rounds, <<",">>, [global]),
case lists:member(BinRound, RoundList) of
true ->
{Order + 1, List ++ [{InstructOrder, Strategy, Identifier, AccessMode, NewData, Protocol, NewDataSource, ThingRound}]};
false ->
Acc
end
end;
_ ->
Acc
end
end, {1, []}, Props),
lists:keysort(1, NewList);
_ ->
[]
end.
get_child_instruct(DeviceId, Round, thing) ->
case dgiot_parse:query_object(<<"Device">>, #{<<"where">> => #{<<"parentId">> => DeviceId}}) of
{ok, #{<<"results">> := ChildDevices}} ->
lists:foldl(fun(#{<<"product">> := #{<<"objectId">> := ProductId}}, Acc) ->
Acc ++ dgiot_instruct:get_instruct(ProductId, DeviceId, Round, thing)
end, [], ChildDevices);
_ ->
[]
end.
get_que(_ProductId, DeviceId, Round) ->
case dgiot_data:get({instuct, DeviceId}) of
not_find ->
Que = init_que(DeviceId, Round),
dgiot_data:insert({instuct, DeviceId}, Que),
Que;
Que ->
NewQue = get_que_(Que, Round),
dgiot_data:insert({instuct, DeviceId}, NewQue),
NewQue
end.
get_que_(Que, Round) ->
lists:foldl(fun(X, Acc) ->
case X of
{InstructOrder, Strategy, Identifier, Address, AccessMode, NewData, Protocol, ThingRound} ->
case ThingRound of
<<"all">> ->
Acc ++ [{InstructOrder, Strategy, Identifier, Address, AccessMode, NewData, Protocol, ThingRound}];
Round ->
Acc ++ [{InstructOrder, Strategy, Identifier, Address, AccessMode, NewData, Protocol, ThingRound}];
RoundList ->
case lists:member(Round, RoundList) of
true ->
Acc ++ [{InstructOrder, Strategy, Identifier, Address, AccessMode, NewData, Protocol, ThingRound}];
false ->
Acc
end
end;
_ ->
Acc
end
end, [], Que).

67
apps/dgiot_task/src/dgiot_task.erl
View File

@ -19,8 +19,8 @@
-include_lib("dgiot/include/logger.hrl").
-include_lib("dgiot_bridge/include/dgiot_bridge.hrl").
-export([start/1, start/2, save_pnque/4, get_pnque/1, del_pnque/1, save_td/4]).
-export([get_control/3, get_collection/4, get_calculated/2, string2value/2, string2value/3]).
-export([start/1, start/2, send/3, get_pnque_len/1, save_pnque/4, get_pnque/1, del_pnque/1, save_td/4]).
-export([get_control/3, get_collection/4, get_calculated/2, get_instruct/2, string2value/2, string2value/3]).
start(ChannelId) ->
lists:map(fun(Y) ->
@ -35,6 +35,15 @@ start(ChannelId) ->
start(ChannelId, ClientId) ->
dgiot_client:start(ChannelId, ClientId).
send(ProductId, DevAddr, Payload) ->
case dgiot_data:get({?TYPE, ProductId}) of
not_find ->
pass;
ChannelId ->
Topic = <<"$dg/thing/", ProductId/binary, "/", DevAddr/binary, "/properties/report">>,
dgiot_client:send(ChannelId, DevAddr, Topic, Payload)
end.
%%获取计算值，必须返回物模型里面的数据表示，不能用寄存器地址
get_calculated(ProductId, Ack) ->
case dgiot_product:lookup_prod(ProductId) of
@ -126,6 +135,52 @@ get_control(Round, Data, Control) ->
dgiot_task:string2value(Str1, <<"type">>)
end.
get_instruct(ProductId, Round) ->
case dgiot_product:lookup_prod(ProductId) of
{ok, #{<<"thing">> := #{<<"properties">> := Props}}} when length(Props) > 0 ->
{_, NewList} = lists:foldl(fun(X, Acc) ->
{Seq, List} = Acc,
case X of
#{<<"dataForm">> := #{<<"strategy">> := <<"计算值"/utf8>>}} -> %% 计算值加入采集指令队列
Acc;
#{<<"dataForm">> := #{<<"strategy">> := <<"主动上报"/utf8>>}} -> %% 主动上报值加入采集指令队列
Acc;
#{<<"accessMode">> := AccessMode,
<<"identifier">> := Identifier,
<<"dataType">> := #{<<"specs">> := #{<<"min">> := Min}},
<<"dataForm">> := DataForm,
<<"dataSource">> := DataSource} ->
Protocol = maps:get(<<"protocol">>, DataForm, <<"Dlink">>),
NewDataSource = dgiot_task_data:get_datasource(Protocol, DataSource), %% 根据协议类型生成采集数据格式
Order = maps:get(<<"order">>, DataForm, Seq), %% 指令顺序
Control = maps:get(<<"control">>, DataForm, "%d"), %% 控制参数
Data = dgiot_task:get_control(Round, Min, Control), %% 控制参数的初始值，可以根据轮次进行计算
Interval = dgiot_utils:to_int(maps:get(<<"strategy">>, DataForm, 20)), %% 下一个指令的采集间隔
ThingRound = maps:get(<<"round">>, DataForm, <<"all">>), %% 物模型中的指令轮次规则
BinRound = dgiot_utils:to_binary(Round), %% 判断本轮是否需要加入采集指令队列
case ThingRound of
<<"all">> -> %% 所有轮次
{Seq + 1, List ++ [{Order, Interval, Identifier, AccessMode, Data, NewDataSource}]};
BinRound ->
{Seq + 1, List ++ [{Order, Interval, Identifier, AccessMode, Data, NewDataSource}]};
Rounds ->
RoundList = binary:split(Rounds, <<",">>, [global]),
case lists:member(BinRound, RoundList) of
true ->
{Seq + 1, List ++ [{Order, Interval, Identifier, AccessMode, Data, NewDataSource}]};
false ->
Acc
end
end;
_ ->
Acc
end
end, {1, []}, Props),
lists:keysort(1, NewList);
_ ->
[]
end.
string2value(Str, <<"TEXT">>) when is_list(Str) ->
%% eralng语法中. 表示事务结束
case string:find(Str, "%%") of
@ -186,6 +241,14 @@ save_pnque(DtuProductId, DtuAddr, ProductId, DevAddr) ->
supervisor:start_child(?TASK_SUP(Channel), [Args#{<<"dtuid">> => DtuId}])
end.
get_pnque_len(DtuId) ->
case dgiot_data:get(?DGIOT_PNQUE, DtuId) of
not_find ->
0;
PnQue ->
length(PnQue)
end.
get_pnque(DtuId) ->
case dgiot_data:get(?DGIOT_PNQUE, DtuId) of
not_find ->

40
apps/dgiot_task/src/dgiot_task_channel.erl
View File

@ -20,7 +20,6 @@
-include_lib("dgiot_bridge/include/dgiot_bridge.hrl").
-include("dgiot_task.hrl").
-include_lib("dgiot/include/logger.hrl").
-define(TYPE, <<"INSTRUCT">>).
-record(state, {id, mod, product, env = #{}}).
-dgiot_data("ets").
@ -33,7 +32,6 @@
%% 注册通道类型
-channel_type(#{
cType => ?TYPE,
type => ?BRIDGE_CHL,
title => #{
@ -45,24 +43,8 @@
}).
%% 注册通道参数
-params(#{
<<"mode">> => #{
order => 1,
type => enum,
required => false,
default => <<"物模型指令模式"/utf8>>,
enum => [
#{<<"value">> => <<"thing">>, <<"label">> => <<"物模型指令模式"/utf8>>},
#{<<"value">> => <<"instruct">>, <<"label">> => <<"设备指令模式"/utf8>>}
],
title => #{
zh => <<"指令模式"/utf8>>
},
description => #{
zh => <<"物模型指令模式:用产品物模型来生成采集指令;设备指令模式:设备配置的独立的指令"/utf8>>
}
},
<<"freq">> => #{
order => 2,
order => 1,
type => integer,
required => false,
default => 180,
@ -74,7 +56,7 @@
}
},
<<"start_time">> => #{
order => 3,
order => 2,
type => string,
required => false,
default => <<"2020-03-26 10:35:10"/utf8>>,
@ -86,7 +68,7 @@
}
},
<<"end_time">> => #{
order => 4,
order => 3,
type => string,
required => false,
default => <<"2025-05-28 10:35:10"/utf8>>,
@ -123,11 +105,15 @@ start(ChannelId, ChannelArgs) ->
%% 通道初始化
init(?TYPE, ChannelId, Args) ->
NewArgs = maps:with([<<"freq">>, <<"mode">>], Args),
#{<<"start_time">> := Start_time, <<"end_time">> := End_time} = Args,
#{<<"freq">> := Freq, <<"start_time">> := Start_time, <<"end_time">> := End_time} = Args,
dgiot_client:add_clock(ChannelId, Start_time, End_time),
State = #state{id = ChannelId},
{ok, State, dgiot_client:register(ChannelId, task_sup, NewArgs#{<<"channel">> => ChannelId, <<"app">> => #{}})}.
{ok, State, dgiot_client:register(ChannelId, task_sup, #{
<<"channel">> => ChannelId,
<<"starttime">> => dgiot_datetime:localtime_to_unixtime(dgiot_datetime:to_localtime(Start_time)),
<<"endtime">> => dgiot_datetime:localtime_to_unixtime(dgiot_datetime:to_localtime(End_time)),
<<"freq">> => Freq
})}.
handle_init(State) ->
{ok, State}.
@ -151,7 +137,7 @@ handle_message(start_client, #state{id = ChannelId} = State) ->
handle_message(stop_client, #state{id = ChannelId} = State) ->
io:format("~s ~p ChannelId =~p.~n", [?FILE, ?LINE, ChannelId]),
case dgiot_data:get({stop_client, ChannelId}) of
case dgiot_data:get({stop_client, binary_to_atom(ChannelId)}) of
not_find ->
dgiot_client:stop(ChannelId);
_ ->
@ -160,8 +146,8 @@ handle_message(stop_client, #state{id = ChannelId} = State) ->
{ok, State};
handle_message(check_client, #state{id = ChannelId} = State) ->
io:format("~s ~p ChannelId =~p.~n", [?FILE, ?LINE, ChannelId]),
case dgiot_data:get({stop_client, ChannelId}) of
%% io:format("~s ~p ChannelId =~p.~n", [?FILE, ?LINE, ChannelId]),
case dgiot_data:get({stop_client, binary_to_atom(ChannelId)}) of
not_find ->
dgiot_task:start(ChannelId),
erlang:send_after(1000 * 60 * 1, self(), check_client);

14
apps/dgiot_task/src/dgiot_task_data.erl
View File

@ -18,7 +18,7 @@
-include("dgiot_task.hrl").
-include_lib("dgiot/include/logger.hrl").
-include_lib("dgiot_bridge/include/dgiot_bridge.hrl").
-export([get_userdata/6, get_datasource/2]).
-export([get_userdata/6, get_datasource/2, get_ack/4]).
get_userdata(ProductId, Identifier, _DataForm, #{<<"type">> := <<"geopoint">>}, Payload, Acc) ->
case maps:find(Identifier, Payload) of
@ -59,6 +59,18 @@ get_userdata(_ProductId, Identifier, #{<<"collection">> := Collection} = DataFor
end.
get_ack(ProductId, Payload, Dis, Ack) ->
NewPayload =
maps:fold(fun(K, V, Acc) ->
case dgiot_data:get({protocol, K, ProductId}) of
not_find ->
Acc#{K => V};
Identifier ->
Acc#{Identifier => V}
end
end, #{}, Payload),
dgiot_task:get_collection(ProductId, Dis, NewPayload, maps:merge(Ack, NewPayload)).
get_datasource(Protocol, DataSource) ->
case catch dgiot_hook:run_hook({datasource, Protocol}, DataSource) of
{ok, [Rtn | _]} ->

187
apps/dgiot_task/src/dgiot_task_worker.erl
View File

@ -17,42 +17,39 @@
-module(dgiot_task_worker).
-author("johnliu").
-include("dgiot_task.hrl").
-include_lib("dgiot/include/dgiot_client.hrl").
-include_lib("dgiot/include/logger.hrl").
-behaviour(gen_server).
%% gen_server callbacks
-export([start_link/1, init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
-record(task, {mode = thing, tid, firstid, dtuid, product, devaddr, dis = [], que, round, ref, ack = #{}, appdata = #{}, ts = 0, freq = 0, interval = 5}).
-record(device_task, {
pnque_len = 0 :: integer(), %% 本轮任务剩余的设备队列数
product :: atom(), %% 当前任务网关设备或者网关子设备的产品ID
devaddr :: binary(), %% 当前任务网关设备或者网关子设备的设备地址
dique = [] :: list(), %% 当前任务网关设备或者网关子设备下的指令队列
interval = 3 :: integer(), %% 指令队列的间隔，
appdata = #{} :: map() %% 用户自定义的一些控制参数
}).
-define(CHILD(I, Type, Args), {I, {I, start_link, Args}, permanent, 5000, Type, [I]}).
%%%===================================================================a
%%% APIa
%%%===================================================================
%%% API
%%%===================================================================
start_link(State) ->
dgiot_client:start_link(?MODULE, State).
start_link(Args) ->
dgiot_client:start_link(?MODULE, Args).
%%%===================================================================
%%% gen_server callbacks
%%%===================================================================
init([#{<<"channel">> := ChannelId, <<"client">> := DtuId, <<"mode">> := Mode, <<"freq">> := Freq} = State]) ->
case dgiot_task:get_pnque(DtuId) of
not_find ->
io:format("~s ~p State ~p ~n", [?FILE, ?LINE, State]),
{stop, normal, State};
{ProductId, DevAddr} ->
DeviceId = dgiot_parse_id:get_deviceid(ProductId, DevAddr),
Que = dgiot_instruct:get_instruct(ProductId, DeviceId, 1, dgiot_utils:to_atom(Mode)),
%% ChildQue = dgiot_instruct:get_child_instruct(DeviceId, 1, dgiot_utils:to_atom(Mode)),
Nowstamp = dgiot_datetime:nowstamp(),
erlang:send_after(1000, self(), init),
Topic = <<"$dg/thing/", ProductId/binary, "/", DevAddr/binary, "/properties/report">>,
dgiot_mqtt:subscribe(Topic),
dgiot_metrics:inc(dgiot_task, <<"task">>, 1),
dgiot_client:save(ChannelId, DtuId),
{ok, #task{mode = dgiot_utils:to_atom(Mode), dtuid = DtuId, product = ProductId, devaddr = DevAddr,
tid = ChannelId, firstid = DeviceId, que = Que, round = 1, ts = Nowstamp, freq = Freq}}
end;
init([#{<<"channel">> := ChannelId, <<"client">> := ClientId, <<"starttime">> := StartTime, <<"endtime">> := EndTime, <<"freq">> := Freq}]) ->
dgiot_client:add(ChannelId, ClientId),
erlang:send_after(20, self(), init),
dgiot_metrics:inc(dgiot_task, <<"task">>, 1),
NextTime = dgiot_client:get_nexttime(StartTime, Freq),
io:format("~s ~p DtuId = ~p.~n", [?FILE, ?LINE, NextTime]),
Dclient = #dclient{channel = ChannelId, client = ClientId, status = ?DCLIENT_INTIALIZED, clock = #dclock{nexttime = NextTime, endtime = EndTime, freq = Freq, round = 0}},
{ok, Dclient};
init(A) ->
?LOG(error, "A ~p ", [A]).
@ -75,72 +72,45 @@ handle_info(stop, State) ->
erlang:garbage_collect(self()),
{stop, normal, State};
handle_info(init, #task{dtuid = DtuId, mode = Mode, round = Round} = State) ->
%% io:format("~s ~p DtuId = ~p.~n", [?FILE, ?LINE, DtuId]),
case dgiot_task:get_pnque(DtuId) of
%% 动态修改任务启动时间和周期
handle_info({change_clock, NextTime, EndTime, Freq}, #dclient{clock = Clock} = Dclient) ->
{noreply, Dclient#dclient{clock = Clock#dclock{nexttime = NextTime, endtime = EndTime, freq = Freq}}};
%% 定时触发网关及网关任务, 在单个任务轮次中，要将任务在全局上做一下错峰操作
handle_info(next_time, #dclient{ channel = Channel, client = Client, userdata = UserData,
clock = #dclock{round = Round, nexttime = NextTime, endtime = EndTime, freq = Freq, rand = Rand} = Clock} = Dclient) ->
io:format("~s ~p DtuId = ~p.~n", [?FILE, ?LINE, Client]),
dgiot_client:stop(Channel, Client, EndTime), %% 检查是否需要停止任务
NewNextTime = dgiot_client:get_nexttime(NextTime, Freq),
case dgiot_task:get_pnque(Client) of
not_find ->
?LOG(info, "DtuId ~p", [DtuId]),
{noreply, State};
{noreply, Dclient#dclient{clock = Clock#dclock{ nexttime = NewNextTime}}};
{ProductId, DevAddr} ->
DeviceId = dgiot_parse_id:get_deviceid(ProductId, DevAddr),
NewRound = Round + 1,
Que = dgiot_instruct:get_instruct(ProductId, DeviceId, NewRound, dgiot_utils:to_atom(Mode)),
erlang:send_after(1000, self(), retry),
{noreply, State#task{product = ProductId, devaddr = DevAddr, round = NewRound, firstid = DeviceId, que = Que}}
PnQueLen = dgiot_task:get_pnque_len(Client),
DiQue = dgiot_task:get_instruct(ProductId, NewRound),
dgiot_client:send_after(10, Freq, Rand, read), % 每轮任务开始时，做一下随机开始
{noreply, Dclient#dclient{userdata = UserData#device_task{product = ProductId, devaddr = DevAddr, pnque_len = PnQueLen, dique = DiQue},
clock = Clock#dclock{nexttime = NewNextTime, round = NewRound}}}
end;
%% 定时触发抄表指令
%% 开始采集下一个子设备的指令集
handle_info(read, #dclient{userdata = #device_task{dique = DiQue} } = State) when length(DiQue) == 0 ->
{noreply, get_next_pn(State)};
%% 发送采集指令
handle_info(retry, State) ->
{noreply, send_msg(State)};
%% 任务结束
handle_info({deliver, _, Msg}, #task{tid = Channel, dis = Dis, product = _ProductId1, devaddr = _DevAddr1, ack = Ack, que = Que} = State) when length(Que) == 0 ->
Payload = jsx:decode(dgiot_mqtt:get_payload(Msg), [return_maps]),
case binary:split(dgiot_mqtt:get_topic(Msg), <<$/>>, [global, trim]) of
[<<"$dg">>, <<"thing">>, ProductId, DevAddr, <<"properties">>, <<"report">>] ->
dgiot_bridge:send_log(Channel, ProductId, DevAddr, "~s ~p ~ts: ~ts ", [?FILE, ?LINE, unicode:characters_to_list(dgiot_mqtt:get_topic(Msg)), unicode:characters_to_list(dgiot_mqtt:get_payload(Msg))]),
NewPayload =
maps:fold(fun(K, V, Acc) ->
case dgiot_data:get({protocol, K, ProductId}) of
not_find ->
Acc#{K => V};
Identifier ->
Acc#{Identifier => V}
end
end, #{}, Payload),
NewAck = dgiot_task:get_collection(ProductId, Dis, NewPayload, maps:merge(Ack, NewPayload)),
dgiot_metrics:inc(dgiot_task, <<"task_recv">>, 1),
{noreply, get_next_pn(State#task{ack = NewAck, product = ProductId, devaddr = DevAddr})};
[<<"$dg">>, <<"thing">>, _ProductId, _DevAddr, <<"events">>] -> % todo
{noreply, get_next_pn(State#task{ack = Ack})};
_ ->
{noreply, get_next_pn(State#task{ack = Ack})}
end;
%% ACK消息触发抄表指令
handle_info({deliver, _, Msg}, #task{tid = Channel, dis = Dis, product = _ProductId1, devaddr = _DevAddr1, ack = Ack} = State) ->
Payload = jsx:decode(dgiot_mqtt:get_payload(Msg), [return_maps]),
%% ACK消息触发进行新的指令发送
handle_info({dclient_ack, Topic, Payload}, #dclient{userdata = Usedata} = State) ->
dgiot_metrics:inc(dgiot_task, <<"task_recv">>, 1),
case binary:split(dgiot_mqtt:get_topic(Msg), <<$/>>, [global, trim]) of
case binary:split(Topic, <<$/>>, [global, trim]) of
[<<"$dg">>, <<"thing">>, ProductId, DevAddr, <<"properties">>, <<"report">>] ->
dgiot_bridge:send_log(Channel, ProductId, DevAddr, "~s ~p ~ts: ~ts ",
[?FILE, ?LINE, unicode:characters_to_list(dgiot_mqtt:get_topic(Msg)), unicode:characters_to_list(dgiot_mqtt:get_payload(Msg))]),
NewPayload =
maps:fold(fun(K, V, Acc) ->
case dgiot_data:get({protocol, K, ProductId}) of
not_find ->
Acc#{K => V};
Identifier ->
Acc#{Identifier => V}
end
end, #{}, Payload),
NewAck = dgiot_task:get_collection(ProductId, Dis, NewPayload, maps:merge(Ack, NewPayload)),
{noreply, send_msg(State#task{ack = NewAck, product = ProductId, devaddr = DevAddr})};
[<<"$dg">>, <<"thing">>, _ProductId, _DevAddr, <<"events">>] -> % todo
{noreply, get_next_pn(State#task{ack = Ack})};
dgiot_task:save_td(ProductId, DevAddr, Payload, #{}),
{noreply, send_msg(State#dclient{userdata = Usedata#device_task{product = ProductId, devaddr = DevAddr}})};
_ ->
{noreply, send_msg(State#task{ack = Ack})}
{noreply, send_msg(State)}
end;
handle_info(_Msg, State) ->
@ -153,17 +123,9 @@ terminate(_Reason, _State) ->
code_change(_OldVsn, State, _Extra) ->
{ok, State}.
send_msg(#task{ref = Ref, que = Que} = State) when length(Que) == 0 ->
case Ref of
undefined ->
pass;
_ -> erlang:cancel_timer(Ref)
end,
get_next_pn(State);
send_msg(#task{tid = Channel, product = Product, devaddr = DevAddr, ref = Ref, que = Que} = State) ->
{InstructOrder, Interval, _, _, _, Protocol, _, _} = lists:nth(1, Que),
{NewCount, _Payload, Dis} =
send_msg(#dclient{channel = Channel, userdata = #device_task{product = Product, devaddr = DevAddr, dique = DisQue} = UserData} = State) ->
{InstructOrder, Interval, _, _, _, Protocol, _, _} = lists:nth(1, DisQue),
{NewCount, _Payload, _Dis} =
lists:foldl(fun(X, {Count, Acc, Acc1}) ->
case X of
{InstructOrder, _, _, _, error, _, _, _} ->
@ -177,41 +139,14 @@ send_msg(#task{tid = Channel, product = Product, devaddr = DevAddr, ref = Ref, q
_ ->
{Count, Acc, Acc1}
end
end, {0, [], []}, Que),
%% 在超时期限内，回报文，就取消超时定时器
case Ref of
undefined ->
pass;
_ -> erlang:cancel_timer(Ref)
end,
NewQue = lists:nthtail(NewCount, Que),
end, {0, [], []}, DisQue),
NewDisQue = lists:nthtail(NewCount, DisQue),
dgiot_metrics:inc(dgiot_task, <<"task_send">>, 1),
State#task{que = NewQue, dis = Dis, ref = erlang:send_after(Interval * 1000, self(), retry), interval = Interval}.
get_next_pn(#task{tid = _Channel, mode = Mode, dtuid = DtuId, firstid = DeviceId, product = _ProductId, devaddr = _DevAddr, round = Round, ref = Ref, interval = Interval} = State) ->
save_td(State),
{NextProductId, NextDevAddr} = dgiot_task:get_pnque(DtuId),
NextDeviceId = dgiot_parse_id:get_deviceid(NextProductId, NextDevAddr),
Que = dgiot_instruct:get_instruct(NextProductId, NextDeviceId, Round, Mode),
%% dgiot_bridge:send_log(Channel, NextProductId, NextDevAddr, "to_dev=> ~s ~p NextProductId ~p NextDevAddr ~p NextDeviceId ~p", [?FILE, ?LINE, NextProductId, NextDevAddr, NextDeviceId]),
NextTopic = <<"$dg/device/", NextProductId/binary, "/", NextDevAddr/binary, "/properties/report">>,
dgiot_mqtt:subscribe(NextTopic),
case Ref of
undefined ->
pass;
_ -> erlang:cancel_timer(Ref)
end,
timer:sleep(20),
NewRef =
case NextDeviceId of
DeviceId ->
erlang:send_after(1000, self(), init);
_ ->
erlang:send_after(Interval * 1000 - 20, self(), retry)
end,
State#task{product = NextProductId, devaddr = NextDevAddr, que = Que, dis = [], ack = #{}, ref = NewRef}.
save_td(#task{tid = Channel, product = ProductId, devaddr = DevAddr, ack = Ack, appdata = AppData}) ->
Data = dgiot_task:save_td(ProductId, DevAddr, Ack, AppData),
dgiot_bridge:send_log(Channel, ProductId, DevAddr, "save_td=> ~s ~p ProductId ~p DevAddr ~p : ~ts ", [?FILE, ?LINE, ProductId, DevAddr, unicode:characters_to_list(jsx:encode(Data))]).
erlang:send_after(Interval * 1000, self(), retry),
State#dclient{userdata = UserData#device_task{dique = NewDisQue, interval = Interval}}.
get_next_pn(#dclient{client = CLient, clock = #dclock{round = Round}, userdata = UserData} = State) ->
{NextProductId, NextDevAddr} = dgiot_task:get_pnque(CLient),
DisQue = dgiot_task:get_instruct(NextProductId, Round),
NewState = State#dclient{ userdata = UserData#device_task{product = NextProductId, devaddr = NextDevAddr, dique = DisQue}},
send_msg(NewState).