From 43a263e1091b0ea4852302153d82a0f927dcc427 Mon Sep 17 00:00:00 2001
From: anlicheng <244108715@qq.com>
Date: Fri, 26 Sep 2025 14:07:18 +0800
Subject: [PATCH] fix cache

---
 apps/efka/include/efka_service.hrl   | 10 ----------
 apps/efka/include/efka_tables.hrl    |  6 ------
 apps/efka/src/efka_remote_agent.erl  |  2 +-
 apps/efka/src/models/cache_model.erl |  7 +++----
 4 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 apps/efka/include/efka_service.hrl

diff --git a/apps/efka/include/efka_service.hrl b/apps/efka/include/efka_service.hrl
deleted file mode 100644
index 33f7716..0000000
--- a/apps/efka/include/efka_service.hrl
+++ /dev/null
@@ -1,10 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% @author anlicheng
-%%% @copyright (C) 2025, <COMPANY>
-%%% @doc
-%%%
-%%% @end
-%%% Created : 26. 8月 2025 14:42
-%%%-------------------------------------------------------------------
--author("anlicheng").
-
diff --git a/apps/efka/include/efka_tables.hrl b/apps/efka/include/efka_tables.hrl
index d7edb90..4ee566c 100644
--- a/apps/efka/include/efka_tables.hrl
+++ b/apps/efka/include/efka_tables.hrl
@@ -20,12 +20,6 @@
     status = 0
 }).
 
-%% 数据缓存
--record(cache, {
-    id = 0 :: integer(),
-    data :: binary()
-}).
-
 %% 数据缓存
 -record(task_log, {
     task_id = 0 :: integer(),
diff --git a/apps/efka/src/efka_remote_agent.erl b/apps/efka/src/efka_remote_agent.erl
index ced0c7f..b79b1c5 100644
--- a/apps/efka/src/efka_remote_agent.erl
+++ b/apps/efka/src/efka_remote_agent.erl
@@ -226,7 +226,7 @@ handle_event(info, {auth_reply, Reply}, ?STATE_AUTH, State = #state{transport_pi
 %% 将缓存中的数据推送到服务器端
 handle_event(info, flush_cache, ?STATE_ACTIVATED, State = #state{transport_pid = TransportPid}) ->
     case cache_model:fetch_next() of
-        {ok, #cache{id = Id, data = Packet}} ->
+        {ok, {Id, Packet}} ->
             efka_transport:send(TransportPid, Packet),
             cache_model:delete(Id),
             {keep_state, State, [{next_event, info, flush_cache}]};
diff --git a/apps/efka/src/models/cache_model.erl b/apps/efka/src/models/cache_model.erl
index 207e8d0..4f7d7ef 100644
--- a/apps/efka/src/models/cache_model.erl
+++ b/apps/efka/src/models/cache_model.erl
@@ -32,8 +32,7 @@
 
 -spec insert(Data :: binary()) -> ok | {error, Reason :: any()}.
 insert(Data) when is_binary(Data) ->
-    Cache = #cache{id = generate_id(), data = Data},
-    gen_server:call(?SERVER, {insert, Cache}).
+    gen_server:call(?SERVER, {insert, {generate_id(), Data}}).
 
 fetch_next() ->
     gen_server:call(?SERVER, fetch_next).
@@ -41,7 +40,7 @@ fetch_next() ->
 delete(Id) when is_integer(Id) ->
     gen_server:call(?SERVER, {delete, Id}).
 
--spec get_all_cache() -> [#cache{}].
+-spec get_all_cache() -> [binary()].
 get_all_cache() ->
     gen_server:call(?SERVER, get_all_cache).
 
@@ -63,7 +62,7 @@ start_link() ->
 init([]) ->
     {ok, DetsDir} = application:get_env(efka, dets_dir),
     File = DetsDir ++ "cache.dets",
-    {ok, ?TAB} = dets:open_file(?TAB, [{file, File}, {type, bag}, {keypos, 2}]),
+    {ok, ?TAB} = dets:open_file(?TAB, [{file, File}, {type, bag}, {keypos, 1}]),
     {ok, #state{}}.
 
 %% @private