优化

lib/utils/note/note_dao.dart

@@ -1,4 +1,4 @@
-import 'package:sqflite/sqflite.dart';
+import 'package:flutter/foundation.dart';
 import '../../models/data_models.dart';
 import '../database_helper.dart';
 
@@ -6,8 +6,17 @@ import '../database_helper.dart';
 class NoteDao {
   final DatabaseHelper _dbHelper = DatabaseHelper.instance;
 
+  Future<T> _wrap<T>(String op, Future<T> Function() fn) async {
+    try {
+      return await fn();
+    } catch (e) {
+      debugPrint('[NoteDao] $op error: $e');
+      rethrow;
+    }
+  }
+
   // 获取所有未删除的笔记
-  Future<List<Note>> getAllNotes() async {
+  Future<List<Note>> getAllNotes() => _wrap('getAllNotes', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'notes',
@@ -15,39 +24,37 @@ class NoteDao {
       whereArgs: [0],
       orderBy: 'created_at DESC',
     );
-
     return List.generate(maps.length, (i) => Note.fromJson(maps[i]));
-  }
+  });
 
   // 分页查询笔记
-  Future<List<Note>> getNotesPaged({int limit = 20, int offset = 0}) async {
+  Future<List<Note>> getNotesPaged({int limit = 20, int offset = 0}) => _wrap('getNotesPaged', () async {
     final db = await _dbHelper.database;
     final maps = await db.query('notes', where: 'is_deleted = 0',
         orderBy: 'created_at DESC', limit: limit, offset: offset);
     return List.generate(maps.length, (i) => Note.fromJson(maps[i]));
-  }
+  });
 
   // 根据ID获取笔记
-  Future<Note?> getNoteById(String id) async {
+  Future<Note?> getNoteById(String id) => _wrap('getNoteById', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'notes',
-      where: 'id = ?',
-      whereArgs: [id],
+      where: 'id = ? AND is_deleted = ?',
+      whereArgs: [id, 0],
     );
-
     if (maps.isEmpty) return null;
     return Note.fromJson(maps.first);
-  }
+  });
 
   // 添加笔记
-  Future<int> insertNote(Note note) async {
+  Future<int> insertNote(Note note) => _wrap('insertNote', () async {
     final db = await _dbHelper.database;
     return await db.insert('notes', note.toJson());
-  }
+  });
 
   // 更新笔记
-  Future<int> updateNote(Note note) async {
+  Future<int> updateNote(Note note) => _wrap('updateNote', () async {
     final db = await _dbHelper.database;
     return await db.update(
       'notes',
@@ -55,10 +62,10 @@ class NoteDao {
       where: 'id = ?',
       whereArgs: [note.id],
     );
-  }
+  });
 
   // 软删除笔记
-  Future<int> deleteNote(String id) async {
+  Future<int> deleteNote(String id) => _wrap('deleteNote', () async {
     final db = await _dbHelper.database;
     return await db.update(
       'notes',
@@ -66,12 +73,12 @@ class NoteDao {
       where: 'id = ?',
       whereArgs: [id],
     );
-  }
+  });
 
   // ========== 回收站相关方法 ==========
 
   // 获取已删除的笔记
-  Future<List<Note>> getDeletedNotes() async {
+  Future<List<Note>> getDeletedNotes() => _wrap('getDeletedNotes', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'notes',
@@ -79,12 +86,11 @@ class NoteDao {
       whereArgs: [1],
       orderBy: 'created_at DESC',
     );
-
     return List.generate(maps.length, (i) => Note.fromJson(maps[i]));
-  }
+  });
 
   // 恢复已删除的笔记
-  Future<int> restoreNote(String id) async {
+  Future<int> restoreNote(String id) => _wrap('restoreNote', () async {
     final db = await _dbHelper.database;
     return await db.update(
       'notes',
@@ -92,20 +98,20 @@ class NoteDao {
       where: 'id = ?',
       whereArgs: [id],
     );
-  }
+  });
 
   // 彻底删除笔记
-  Future<int> permanentDeleteNote(String id) async {
+  Future<int> permanentDeleteNote(String id) => _wrap('permanentDeleteNote', () async {
     final db = await _dbHelper.database;
     return await db.delete(
       'notes',
       where: 'id = ?',
       whereArgs: [id],
     );
-  }
+  });
 
   // 搜索笔记
-  Future<List<Note>> searchNotes(String query) async {
+  Future<List<Note>> searchNotes(String query) => _wrap('searchNotes', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'notes',
@@ -113,12 +119,11 @@ class NoteDao {
       whereArgs: ['%$query%', '%$query%', '%$query%', 0],
       orderBy: 'created_at DESC',
     );
-
     return List.generate(maps.length, (i) => Note.fromJson(maps[i]));
-  }
+  });
 
   // 根据标签筛选
-  Future<List<Note>> getNotesByTag(String tag) async {
+  Future<List<Note>> getNotesByTag(String tag) => _wrap('getNotesByTag', () async {
     final db = await _dbHelper.database;
     final List<Map<String, dynamic>> maps = await db.query(
       'notes',
@@ -126,7 +131,6 @@ class NoteDao {
       whereArgs: ['%$tag%', 0],
       orderBy: 'created_at DESC',
     );
-
     return List.generate(maps.length, (i) => Note.fromJson(maps[i]));
-  }
+  });
 }