From abb83c4f154172831ac5b663b65de2429ad85e55 Mon Sep 17 00:00:00 2001
From: anlicheng <244108715@qq.com>
Date: Tue, 6 May 2025 11:02:47 +0800
Subject: [PATCH] fix model

---
 apps/efka/src/efka_agent.erl                                  | 4 ++--
 apps/efka/src/efka_app.erl                                    | 2 ++
 apps/efka/src/mnesia/{id_model.erl => id_generator_model.erl} | 2 +-
 apps/efka/src/mnesia/{data_model.erl => micro_data_model.erl} | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename apps/efka/src/mnesia/{id_model.erl => id_generator_model.erl} (95%)
 rename apps/efka/src/mnesia/{data_model.erl => micro_data_model.erl} (92%)

diff --git a/apps/efka/src/efka_agent.erl b/apps/efka/src/efka_agent.erl
index 687a65b..1387ff2 100644
--- a/apps/efka/src/efka_agent.erl
+++ b/apps/efka/src/efka_agent.erl
@@ -85,7 +85,7 @@ handle_call(_Request, _From, State = #state{}) ->
     {noreply, NewState :: #state{}, timeout() | hibernate} |
     {stop, Reason :: term(), NewState :: #state{}}).
 handle_cast({data, ServiceName, DeviceUUID, At, Tags, Fields}, State = #state{status = Status}) ->
-    ok = data_model:insert(#micro_data{
+    ok = micro_data_model:insert(#micro_data{
         device_uuid = DeviceUUID,
         service_name = ServiceName,
         at = At,
@@ -191,7 +191,7 @@ handle_info({server_push_message, PacketId, <<16:8, Directive>>}, State = #state
     {noreply, State};
 
 handle_info(fetch_next, State = #state{status = ?STATE_ACTIVATED, transport_pid = TransportPid}) ->
-    case data_model:fetch_next() of
+    case micro_data_model:fetch_next() of
         error ->
             ok;
         {ok, #micro_data{device_uuid = DeviceUUID, service_name = ServiceName, at = At, tags = Tags, fields = Fields}} ->
diff --git a/apps/efka/src/efka_app.erl b/apps/efka/src/efka_app.erl
index aff922e..ffeca1a 100644
--- a/apps/efka/src/efka_app.erl
+++ b/apps/efka/src/efka_app.erl
@@ -33,5 +33,7 @@ start_mnesia() ->
     Tables = mnesia:system_info(tables),
     lager:debug("[efka_app] tables: ~p", [Tables]),
     %% 创建数据库表
+    not lists:member(id_generator, Tables) andalso id_generator_model:create_table(),
     not lists:member(micro_service, Tables) andalso micro_service_model:create_table(),
+    not lists:member(micro_data, Tables) andalso micro_data_model:create_table(),
     ok.
\ No newline at end of file
diff --git a/apps/efka/src/mnesia/id_model.erl b/apps/efka/src/mnesia/id_generator_model.erl
similarity index 95%
rename from apps/efka/src/mnesia/id_model.erl
rename to apps/efka/src/mnesia/id_generator_model.erl
index 9dc5c3a..464b9a9 100644
--- a/apps/efka/src/mnesia/id_model.erl
+++ b/apps/efka/src/mnesia/id_generator_model.erl
@@ -6,7 +6,7 @@
 %%% @end
 %%% Created : 06. 5月 2025 10:32
 %%%-------------------------------------------------------------------
--module(id_model).
+-module(id_generator_model).
 -author("anlicheng").
 
 %% API
diff --git a/apps/efka/src/mnesia/data_model.erl b/apps/efka/src/mnesia/micro_data_model.erl
similarity index 92%
rename from apps/efka/src/mnesia/data_model.erl
rename to apps/efka/src/mnesia/micro_data_model.erl
index cea0035..51eef76 100644
--- a/apps/efka/src/mnesia/data_model.erl
+++ b/apps/efka/src/mnesia/micro_data_model.erl
@@ -6,7 +6,7 @@
 %%% @end
 %%% Created : 04. 7月 2023 12:31
 %%%-------------------------------------------------------------------
--module(data_model).
+-module(micro_data_model).
 -author("aresei").
 -include("efka_tables.hrl").
 -include_lib("stdlib/include/qlc.hrl").
@@ -28,7 +28,7 @@ create_table() ->
 
 -spec insert(MicroData0 :: #micro_data{}) -> ok | {error, Reason :: any()}.
 insert(MicroData0 = #micro_data{}) ->
-    MicroData = MicroData0#micro_data{id = id_model:next_id(?TAB)},
+    MicroData = MicroData0#micro_data{id = id_generator_model:next_id(?TAB)},
     case mnesia:transaction(fun() -> mnesia:write(?TAB, MicroData, write) end) of
         {'atomic', ok} ->
             ok;