Add files via upload

internal/database/database.go

@@ -242,6 +242,11 @@ func (db *DB) initTables() error {
 		// 不返回错误，允许继续运行
 	}
 
+	if err := db.migrateConversationGroupMappingsTable(); err != nil {
+		db.logger.Warn("迁移conversation_group_mappings表失败", zap.Error(err))
+		// 不返回错误，允许继续运行
+	}
+
 	if _, err := db.Exec(createIndexes); err != nil {
 		return fmt.Errorf("创建索引失败: %w", err)
 	}
@@ -334,6 +339,30 @@ func (db *DB) migrateConversationGroupsTable() error {
 	return nil
 }
 
+// migrateConversationGroupMappingsTable 迁移conversation_group_mappings表，添加新字段
+func (db *DB) migrateConversationGroupMappingsTable() error {
+	// 检查pinned字段是否存在
+	var count int
+	err := db.QueryRow("SELECT COUNT(*) FROM pragma_table_info('conversation_group_mappings') WHERE name='pinned'").Scan(&count)
+	if err != nil {
+		// 如果查询失败，尝试添加字段
+		if _, addErr := db.Exec("ALTER TABLE conversation_group_mappings ADD COLUMN pinned INTEGER DEFAULT 0"); addErr != nil {
+			// 如果字段已存在，忽略错误
+			errMsg := strings.ToLower(addErr.Error())
+			if !strings.Contains(errMsg, "duplicate column") && !strings.Contains(errMsg, "already exists") {
+				db.logger.Warn("添加pinned字段失败", zap.Error(addErr))
+			}
+		}
+	} else if count == 0 {
+		// 字段不存在，添加它
+		if _, err := db.Exec("ALTER TABLE conversation_group_mappings ADD COLUMN pinned INTEGER DEFAULT 0"); err != nil {
+			db.logger.Warn("添加pinned字段失败", zap.Error(err))
+		}
+	}
+
+	return nil
+}
+
 // NewKnowledgeDB 创建知识库数据库连接（只包含知识库相关的表）
 func NewKnowledgeDB(dbPath string, logger *zap.Logger) (*DB, error) {
 	sqlDB, err := sql.Open("sqlite3", dbPath+"?_journal_mode=WAL&_foreign_keys=1")

internal/database/group.go

@@ -222,11 +222,11 @@ func (db *DB) RemoveConversationFromGroup(conversationID, groupID string) error
 // GetConversationsByGroup 获取分组中的所有对话
 func (db *DB) GetConversationsByGroup(groupID string) ([]*Conversation, error) {
 	rows, err := db.Query(
-		`SELECT c.id, c.title, COALESCE(c.pinned, 0), c.created_at, c.updated_at 
+		`SELECT c.id, c.title, COALESCE(c.pinned, 0), c.created_at, c.updated_at, COALESCE(cgm.pinned, 0) as group_pinned
 		 FROM conversations c
 		 INNER JOIN conversation_group_mappings cgm ON c.id = cgm.conversation_id
 		 WHERE cgm.group_id = ?
-		 ORDER BY c.updated_at DESC`,
+		 ORDER BY COALESCE(cgm.pinned, 0) DESC, c.updated_at DESC`,
 		groupID,
 	)
 	if err != nil {
@@ -239,8 +239,9 @@ func (db *DB) GetConversationsByGroup(groupID string) ([]*Conversation, error) {
 		var conv Conversation
 		var createdAt, updatedAt string
 		var pinned int
+		var groupPinned int
 
-		if err := rows.Scan(&conv.ID, &conv.Title, &pinned, &createdAt, &updatedAt); err != nil {
+		if err := rows.Scan(&conv.ID, &conv.Title, &pinned, &createdAt, &updatedAt, &groupPinned); err != nil {
 			return nil, fmt.Errorf("扫描对话失败: %w", err)
 		}
 
@@ -318,3 +319,19 @@ func (db *DB) UpdateGroupPinned(id string, pinned bool) error {
 	}
 	return nil
 }
+
+// UpdateConversationPinnedInGroup 更新对话在分组中的置顶状态
+func (db *DB) UpdateConversationPinnedInGroup(conversationID, groupID string, pinned bool) error {
+	pinnedValue := 0
+	if pinned {
+		pinnedValue = 1
+	}
+	_, err := db.Exec(
+		"UPDATE conversation_group_mappings SET pinned = ? WHERE conversation_id = ? AND group_id = ?",
+		pinnedValue, conversationID, groupID,
+	)
+	if err != nil {
+		return fmt.Errorf("更新分组对话置顶状态失败: %w", err)
+	}
+	return nil
+}