feat(super-magic-module): implement hidden file functionality and update related services and DTOs

liaobw · liaobw · commit 6daffe6393c1 · 2025-05-29T17:43:25.000+08:00
diff --git a/backend/super-magic-module/src/Application/SuperAgent/Service/WorkspaceAppService.php b/backend/super-magic-module/src/Application/SuperAgent/Service/WorkspaceAppService.php
@@ -585,6 +585,7 @@ public function getTopicAttachmentList(DataIsolation $dataIsolation, GetTopicAtt
             $dto->fileExtension = $entity->getFileExtension();
             $dto->fileKey = $entity->getFileKey();
             $dto->fileSize = $entity->getFileSize();
+            $dto->isHidden = $entity->getIsHidden();
             
             // Calculate relative file path by removing workDir from fileKey
             $fileKey = $entity->getFileKey();
@@ -639,6 +640,7 @@ private function assembleTaskFilesTree(string $sandboxId, string $workDir, array
         $root = [
             'type' => 'root',
             'is_directory' => true,
+            'is_hidden' => false,
             'children' => [],
         ];
 
@@ -733,6 +735,7 @@ private function assembleTaskFilesTree(string $sandboxId, string $workDir, array
                 // 逐级构建目录
                 $currentPath = '';
                 $parent = &$root;
+                $parentIsHidden = false; // 父级是否为隐藏目录
 
                 foreach ($pathParts as $dirName) {
                     if (empty($dirName)) {
@@ -744,12 +747,16 @@ private function assembleTaskFilesTree(string $sandboxId, string $workDir, array
 
                     // 如果当前路径的目录不存在，创建它
                     if (! isset($directoryMap[$currentPath])) {
+                        // 判断当前目录是否为隐藏目录
+                        $isHiddenDir = $this->isHiddenDirectory($dirName) || $parentIsHidden;
+
                         // 创建新目录节点
                         $newDir = [
                             'name' => $dirName,
                             'path' => $currentPath,
                             'type' => 'directory',
                             'is_directory' => true,
+                            'is_hidden' => $isHiddenDir,
                             'children' => [],
                         ];
 
@@ -762,6 +769,13 @@ private function assembleTaskFilesTree(string $sandboxId, string $workDir, array
 
                     // 更新父目录引用为当前目录
                     $parent = &$directoryMap[$currentPath];
+                    // 更新父级隐藏状态，如果当前目录是隐藏的，那么其子级都应该是隐藏的
+                    $parentIsHidden = $parent['is_hidden'] ?? false;
+                }
+
+                // 如果父目录是隐藏的，那么文件也应该被标记为隐藏
+                if ($parentIsHidden) {
+                    $fileNode['is_hidden'] = true;
                 }
 
                 // 将文件添加到最终目录的子项中
@@ -773,6 +787,78 @@ private function assembleTaskFilesTree(string $sandboxId, string $workDir, array
         return $root['children'];
     }
 
+    /**
+     * 判断目录名是否为隐藏目录
+     * 隐藏目录的判断规则：目录名以 . 开头
+     *
+     * @param string $dirName 目录名
+     * @return bool true-隐藏目录，false-普通目录
+     */
+    private function isHiddenDirectory(string $dirName): bool
+    {
+        return str_starts_with($dirName, '.');
+    }
+
+    /**
+     * 更新话题.
+     *
+     * @param DataIsolation $dataIsolation 数据隔离对象
+     * @param SaveTopicRequestDTO $requestDTO 请求DTO
+     * @return SaveTopicResultDTO 更新结果
+     * @throws BusinessException 如果更新失败则抛出异常
+     */
+    private function updateTopic(DataIsolation $dataIsolation, SaveTopicRequestDTO $requestDTO): SaveTopicResultDTO
+    {
+        // 更新话题名称
+        $result = $this->workspaceDomainService->updateTopicName(
+            $dataIsolation,
+            (int) $requestDTO->getId(), // 传递主键ID
+            $requestDTO->getTopicName()
+        );
+
+        if (! $result) {
+            ExceptionBuilder::throw(GenericErrorCode::SystemError, 'topic.update_failed');
+        }
+
+        return SaveTopicResultDTO::fromId((int) $requestDTO->getId());
+    }
+
+    /**
+     * 创建新话题.
+     *
+     * @param DataIsolation $dataIsolation 数据隔离对象
+     * @param SaveTopicRequestDTO $requestDTO 请求DTO
+     * @return SaveTopicResultDTO 创建结果
+     * @throws BusinessException|Throwable 如果创建失败则抛出异常
+     */
+    private function createNewTopic(DataIsolation $dataIsolation, SaveTopicRequestDTO $requestDTO): SaveTopicResultDTO
+    {
+        // 创建新话题，使用事务确保原子性
+        Db::beginTransaction();
+        try {
+            // 1. 初始化 chat 的会话和话题
+            [$chatConversationId, $chatConversationTopicId] = $this->initMagicChatConversation($dataIsolation);
+
+            // 2. 创建话题
+            $topicEntity = $this->workspaceDomainService->createTopic(
+                $dataIsolation,
+                (int) $requestDTO->getWorkspaceId(),
+                $chatConversationTopicId, // 会话的话题ID
+                $requestDTO->getTopicName()
+            );
+
+            // 提交事务
+            Db::commit();
+
+            // 返回结果
+            return SaveTopicResultDTO::fromId((int) $topicEntity->getId());
+        } catch (Throwable $e) {
+            // 回滚事务
+            Db::rollBack();
+            throw $e;
+        }
+    }
+
     /**
      * 初始化用户工作区.
      *
diff --git a/backend/super-magic-module/src/Domain/SuperAgent/Entity/TaskFileEntity.php b/backend/super-magic-module/src/Domain/SuperAgent/Entity/TaskFileEntity.php
@@ -35,6 +35,8 @@ class TaskFileEntity extends AbstractEntity
 
     protected string $storageType = 'workspace';
 
+    protected bool $isHidden = false;
+
     protected string $createdAt = '';
 
     protected string $updatedAt = '';
@@ -161,6 +163,16 @@ public function setStorageType(string $storageType): void
         $this->storageType = $storageType;
     }
 
+    public function getIsHidden(): bool
+    {
+        return $this->isHidden;
+    }
+
+    public function setIsHidden(bool $isHidden): void
+    {
+        $this->isHidden = $isHidden;
+    }
+
     public function getCreatedAt(): string
     {
         return $this->createdAt;
@@ -206,6 +218,7 @@ public function toArray(): array
             'file_size' => $this->fileSize,
             'external_url' => $this->externalUrl,
             'storage_type' => $this->storageType,
+            'is_hidden' => $this->isHidden,
             'created_at' => $this->createdAt,
             'updated_at' => $this->updatedAt,
             'deleted_at' => $this->deletedAt,
diff --git a/backend/super-magic-module/src/Domain/SuperAgent/Repository/Model/TaskFileModel.php b/backend/super-magic-module/src/Domain/SuperAgent/Repository/Model/TaskFileModel.php
@@ -35,6 +35,7 @@ class TaskFileModel extends AbstractModel
         'external_url',
         'menu',
         'storage_type', // 存储类型，由FileProcessAppService.processAttachmentsArray方法传入
+        'is_hidden', // 是否为隐藏文件
         'created_at',
         'updated_at',
         'deleted_at',
@@ -45,5 +46,13 @@ class TaskFileModel extends AbstractModel
      */
     protected array $attributes = [
         'storage_type' => 'workspace', // 默认存储类型为workspace
+        'is_hidden' => 0, // 默认不是隐藏文件：0-否，1-是
+    ];
+
+    /**
+     * 类型转换
+     */
+    protected array $casts = [
+        'is_hidden' => 'boolean', // 自动将数据库中的0/1转换为false/true
     ];
 }
diff --git a/backend/super-magic-module/src/Domain/SuperAgent/Repository/Persistence/TaskFileRepository.php b/backend/super-magic-module/src/Domain/SuperAgent/Repository/Persistence/TaskFileRepository.php
@@ -76,16 +76,15 @@ public function getByTopicId(int $topicId, int $page, int $pageSize, array $file
         // 先获取总数
         $total = $query->count();
 
-        // 获取分页数据
-        $query = $query->skip($offset)
+        // 获取分页数据，使用Eloquent的get()方法让$casts生效
+        $models = $query->skip($offset)
             ->take($pageSize)
-            ->orderBy('file_id', 'desc');
-
-        $result = Db::select($query->toSql(), $query->getBindings());
+            ->orderBy('file_id', 'desc')
+            ->get();
 
         $list = [];
-        foreach ($result as $item) {
-            $list[] = new TaskFileEntity((array) $item);
+        foreach ($models as $model) {
+            $list[] = new TaskFileEntity($model->toArray());
         }
 
         return [
@@ -111,18 +110,17 @@ public function getByTaskId(int $taskId, int $page, int $pageSize): array
             ->where('task_id', $taskId)
             ->count();
 
-        // 获取分页数据
-        $query = $this->model::query()
+        // 获取分页数据，使用Eloquent的get()方法让$casts生效
+        $models = $this->model::query()
             ->where('task_id', $taskId)
             ->skip($offset)
             ->take($pageSize)
-            ->orderBy('file_id', 'desc');
-
-        $result = Db::select($query->toSql(), $query->getBindings());
+            ->orderBy('file_id', 'desc')
+            ->get();
 
         $list = [];
-        foreach ($result as $item) {
-            $list[] = new TaskFileEntity((array) $item);
+        foreach ($models as $model) {
+            $list[] = new TaskFileEntity($model->toArray());
         }
 
         return [
diff --git a/backend/super-magic-module/src/Domain/SuperAgent/Service/TaskDomainService.php b/backend/super-magic-module/src/Domain/SuperAgent/Service/TaskDomainService.php
@@ -375,6 +375,8 @@ public function saveOrCreateTaskFileByFileId(
             $taskFileEntity->setFileName($fileData['display_filename'] ?? $fileData['filename'] ?? '');
             $taskFileEntity->setFileExtension($fileData['file_extension'] ?? '');
             $taskFileEntity->setFileSize($fileData['file_size'] ?? 0);
+            // 判断并设置是否为隐藏文件
+            $taskFileEntity->setIsHidden($this->isHiddenFile($fileKey));
             // 更新存储类型，如果提供了的话
             if (isset($fileData['storage_type'])) {
                 $taskFileEntity->setStorageType($fileData['storage_type']);
@@ -406,6 +408,8 @@ public function saveOrCreateTaskFileByFileId(
         $taskFileEntity->setFileName($fileData['display_filename'] ?? $fileData['filename'] ?? '');
         $taskFileEntity->setFileExtension($fileData['file_extension'] ?? '');
         $taskFileEntity->setFileSize($fileData['file_size'] ?? 0);
+        // 判断并设置是否为隐藏文件
+        $taskFileEntity->setIsHidden($this->isHiddenFile($fileKey));
         // 设置存储类型，默认为workspace
         $taskFileEntity->setStorageType($fileData['storage_type'] ?? 'workspace');
 
@@ -467,6 +471,8 @@ public function saveOrCreateTaskFileByFileKey(
         $taskFileEntity->setFileExtension($fileData['file_extension'] ?? '');
         $taskFileEntity->setFileSize($fileData['file_size'] ?? 0);
         $taskFileEntity->setExternalUrl($fileData['external_url'] ?? '');
+        // 判断并设置是否为隐藏文件
+        $taskFileEntity->setIsHidden($this->isHiddenFile($fileKey));
         // 设置存储类型，默认为workspace
         $taskFileEntity->setStorageType($fileData['storage_type'] ?? 'workspace');
 
@@ -647,6 +653,30 @@ public function updateTaskStatusByTaskId(int $id, TaskStatus $status, ?string $e
         return $this->taskRepository->updateTaskStatusByTaskId($id, $status);
     }
 
+    /**
+     * 判断文件是否为隐藏文件
+     *
+     * @param string $fileKey 文件路径
+     * @return bool 是否为隐藏文件：true-是，false-否
+     */
+    private function isHiddenFile(string $fileKey): bool
+    {
+        // 移除开头的斜杠，统一处理
+        $fileKey = ltrim($fileKey, '/');
+
+        // 分割路径为各个部分
+        $pathParts = explode('/', $fileKey);
+
+        // 检查每个路径部分是否以 . 开头
+        foreach ($pathParts as $part) {
+            if (!empty($part) && str_starts_with($part, '.')) {
+                return true; // 是隐藏文件
+            }
+        }
+
+        return false; // 不是隐藏文件
+    }
+
     /**
      * 获取最近更新时间超过指定时间的任务列表.
      *
diff --git a/backend/super-magic-module/src/Interfaces/SuperAgent/DTO/Response/TaskFileItemDTO.php b/backend/super-magic-module/src/Interfaces/SuperAgent/DTO/Response/TaskFileItemDTO.php
@@ -57,6 +57,11 @@ class TaskFileItemDTO extends AbstractDTO
      */
     public string $fileUrl;
 
+    /**
+     * 是否为隐藏文件：true-是，false-否.
+     */
+    public bool $isHidden;
+
     /**
      * 从实体创建DTO.
      */
@@ -72,6 +77,7 @@ public static function fromEntity(TaskFileEntity $entity): self
         $dto->fileSize = $entity->getFileSize();
         $dto->relativeFilePath = '';
         $dto->fileUrl = $entity->getExternalUrl();
+        $dto->isHidden = $entity->getIsHidden();
 
         return $dto;
     }
@@ -82,15 +88,16 @@ public static function fromEntity(TaskFileEntity $entity): self
     public static function fromArray(array $data): self
     {
         $dto = new self();
-        $dto->fileId = (string) ($data['file_id'] ?? '0');
-        $dto->taskId = (string) ($data['task_id'] ?? '0');
+        $dto->fileId = (string) ($data['file_id'] ?? '');
+        $dto->taskId = (string) ($data['task_id'] ?? '');
         $dto->fileType = $data['file_type'] ?? '';
         $dto->fileName = $data['file_name'] ?? '';
         $dto->fileExtension = $data['file_extension'] ?? '';
         $dto->fileKey = $data['file_key'] ?? '';
         $dto->fileSize = $data['file_size'] ?? 0;
         $dto->relativeFilePath = $data['relative_file_path'] ?? '';
         $dto->fileUrl = $data['file_url'] ?? $data['external_url'] ?? '';
+        $dto->isHidden = $data['is_hidden'] ?? false;
         return $dto;
     }
 
@@ -110,6 +117,7 @@ public function toArray(): array
             'file_size' => $this->fileSize,
             'relative_file_path' => $this->relativeFilePath,
             'file_url' => $this->fileUrl,
+            'is_hidden' => $this->isHidden,
         ];
     }
 }
