Merge branch 'feature/optimize-super-magic' into merge/optimize-super-magic-master-01

Author: liaobw

backend/magic-service/app/Application/Chat/Service/MagicChatMessageAppService.php

@@ -155,7 +155,21 @@ public function pullRecentMessage(MagicUserAuthorization $userAuthorization, Mes
     public function getConversations(MagicUserAuthorization $userAuthorization, ConversationListQueryDTO $queryDTO): ConversationsPageResponseDTO
     {
         $dataIsolation = $this->createDataIsolation($userAuthorization);
-        return $this->magicConversationDomainService->getConversations($dataIsolation, $queryDTO);
+        $result = $this->magicConversationDomainService->getConversations($dataIsolation, $queryDTO);
+        $filterAccountEntity = $this->magicUserDomainService->getByAiCode($dataIsolation, 'SUPER_MAGIC');
+        if (! empty($filterAccountEntity) && count($result->getItems()) > 0) {
+            $filterItems = [];
+            foreach ($result->getItems() as $item) {
+                /**
+                 * @var MagicConversationEntity $item
+                 */
+                if ($item->getReceiveId() !== $filterAccountEntity->getUserId()) {
+                    $filterItems[] = $item;
+                }
+            }
+            $result->setItems($filterItems);
+        }
+        return $result;
     }
 
     public function getUserGroupConversation(UserGroupConversationQueryDTO $queryDTO): ?MagicConversationEntity

backend/super-magic-module/migrations/2025_05_15_000001_add_is_hidden_to_magic_super_agent_task_files_table.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Copyright (c) The Magic , Distributed under the software license
+ */
+
+use Hyperf\Database\Migrations\Migration;
+use Hyperf\Database\Schema\Blueprint;
+use Hyperf\Database\Schema\Schema;
+
+class AddIsHiddenToMagicSuperAgentTaskFilesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('magic_super_agent_task_files', function (Blueprint $table) {
+            $table->tinyInteger('is_hidden')->default(0)->comment('是否为隐藏文件：0-否，1-是');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('magic_super_agent_task_files', function (Blueprint $table) {
+            $table->dropColumn('is_hidden');
+        });
+    }
+} 

backend/super-magic-module/migrations/2025_05_29_000001_add_performance_indexes_to_magic_super_agent_message_table.php

@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Copyright (c) The Magic , Distributed under the software license
+ */
+use Hyperf\Database\Migrations\Migration;
+use Hyperf\Database\Schema\Blueprint;
+use Hyperf\Database\Schema\Schema;
+use Hyperf\DbConnection\Db;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        if (!Schema::hasTable('magic_super_agent_message')) {
+            return;
+        }
+
+        Schema::table('magic_super_agent_message', function (Blueprint $table) {
+            // Check if idx_id index exists
+            if (!$this->indexExists('magic_super_agent_message', 'idx_id')) {
+                $table->index(['id'], 'idx_id');
+            }
+
+            // Check if idx_topic_show_deleted index exists
+            if (!$this->indexExists('magic_super_agent_message', 'idx_topic_show_deleted')) {
+                $table->index(['topic_id', 'show_in_ui', 'deleted_at'], 'idx_topic_show_deleted');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        if (!Schema::hasTable('magic_super_agent_message')) {
+            return;
+        }
+
+        Schema::table('magic_super_agent_message', function (Blueprint $table) {
+            // Drop indexes if they exist
+            if ($this->indexExists('magic_super_agent_message', 'idx_id')) {
+                $table->dropIndex('idx_id');
+            }
+
+            if ($this->indexExists('magic_super_agent_message', 'idx_topic_show_deleted')) {
+                $table->dropIndex('idx_topic_show_deleted');
+            }
+        });
+    }
+
+    /**
+     * Check if index exists on table
+     */
+    private function indexExists(string $tableName, string $indexName): bool
+    {
+        $database = config('databases.default.database');
+        
+        $result = Db::select("
+            SELECT COUNT(*) as count 
+            FROM information_schema.statistics 
+            WHERE table_schema = ? 
+            AND table_name = ? 
+            AND index_name = ?
+        ", [$database, $tableName, $indexName]);
+
+        return $result[0]->count > 0;
+    }
+}; 

backend/super-magic-module/migrations/2025_05_29_215711_add_message_id_index_to_magic_super_agent_message.php

@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Copyright (c) The Magic , Distributed under the software license
+ */
+use Hyperf\Database\Migrations\Migration;
+use Hyperf\Database\Schema\Schema;
+use Hyperf\DbConnection\Db;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // 只有当表存在时才执行索引操作
+        if (Schema::hasTable('magic_super_agent_message')) {
+            // 检查并创建 idx_message_id 索引
+            $this->createIndexIfNotExists(
+                'magic_super_agent_message',
+                'idx_message_id',
+                'CREATE INDEX idx_message_id ON `magic_super_agent_message` (message_id)'
+            );
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        if (Schema::hasTable('magic_super_agent_message')) {
+            // 删除索引
+            $this->dropIndexIfExists('magic_super_agent_message', 'idx_message_id');
+        }
+    }
+
+    /**
+     * 检查索引是否存在，如果不存在则创建索引.
+     *
+     * @param string $table 表名
+     * @param string $indexName 索引名称
+     * @param string $createStatement 创建索引的SQL语句
+     */
+    private function createIndexIfNotExists(string $table, string $indexName, string $createStatement): void
+    {
+        // 检查索引是否存在
+        $indexExists = Db::select(
+            "SHOW INDEX FROM `{$table}` WHERE Key_name = ?",
+            [$indexName]
+        );
+
+        // 只有当索引不存在时才创建
+        if (empty($indexExists)) {
+            // 创建索引
+            Db::statement($createStatement);
+        }
+    }
+
+    /**
+     * 如果索引存在则删除.
+     *
+     * @param string $table 表名
+     * @param string $indexName 索引名称
+     */
+    private function dropIndexIfExists(string $table, string $indexName): void
+    {
+        // 检查索引是否存在
+        $indexExists = Db::select(
+            "SHOW INDEX FROM `{$table}` WHERE Key_name = ?",
+            [$indexName]
+        );
+
+        if (! empty($indexExists)) {
+            // 删除现有索引
+            Db::statement("DROP INDEX `{$indexName}` ON `{$table}`");
+        }
+    }
+};