diff --git a/apps/iot/src/iot_build.erl b/apps/iot/src/iot_build.erl index 9013d50..39bdd3c 100644 --- a/apps/iot/src/iot_build.erl +++ b/apps/iot/src/iot_build.erl @@ -101,7 +101,7 @@ handle_cast({handle_data, DeviceUUID, Fields, Timestamp}, State = #state{build_l {noreply, NewState :: #state{}} | {noreply, NewState :: #state{}, timeout() | hibernate} | {stop, Reason :: term(), NewState :: #state{}}). -handle_info({timeout, _, report_ticker}, State = #state{build_location_code = LocationCode, build_location_code = LocationCode}) -> +handle_info({timeout, _, report_ticker}, State = #state{build_location_code = LocationCode}) -> %% 需要汇报的keys: total_power, total_runtime, use_times; 这几个key的值是可以直接累加的 %% props的格式为:#{key0 => props0, key1 => Props1} diff --git a/apps/iot/src/mnesia/mnesia_build_data.erl b/apps/iot/src/mnesia/mnesia_build_data.erl index 5dce324..85361fa 100644 --- a/apps/iot/src/mnesia/mnesia_build_data.erl +++ b/apps/iot/src/mnesia/mnesia_build_data.erl @@ -26,7 +26,7 @@ create_table() -> ]). -spec insert(LocationCode :: binary(), DeviceUUID :: binary(), Fields :: list(), Timestamp :: integer()) -> ok | {error, Reason :: any()}. -insert(LocationCode, DeviceUUID, Fields, Timestamp) when is_integer(LocationCode), is_integer(DeviceUUID), is_list(Fields), is_integer(Timestamp) -> +insert(LocationCode, DeviceUUID, Fields, Timestamp) when is_binary(LocationCode), is_binary(DeviceUUID), is_list(Fields), is_integer(Timestamp) -> Fun = fun() -> Q = qlc:q([E || E <- mnesia:table(?TAB), E#build_data.location_code =:= LocationCode, E#build_data.device_uuid =:= DeviceUUID]), case qlc:e(Q) of @@ -48,7 +48,7 @@ insert(LocationCode, DeviceUUID, Fields, Timestamp) when is_integer(LocationCode end. -spec get_build_dataset(LocationCode :: binary()) -> [#build_data{}]. -get_build_dataset(LocationCode) when is_integer(LocationCode) -> +get_build_dataset(LocationCode) when is_binary(LocationCode) -> Fun = fun() -> Q = qlc:q([E || E <- mnesia:table(?TAB), E#build_data.location_code =:= LocationCode]), qlc:e(Q)