feat(database): 重构数据库操作并添加 item 模型

- 创建 Item 模型类，包含 toMap 和 fromMap 方法 - 新增 ItemRepository 类，负责数据库操作 - 实现 ItemScopedModel，用于状态管理 - 更新 SQLiteHelper，使用新的 item 表结构- 删除旧的 SQLiteOperation 文件
2025-04-29 19:56:52 +08:00 · 2025-04-29 19:56:52 +08:00 · 8299e1ad62
commit 8299e1ad62
parent ca3ec2ca8c
11 changed files with 188 additions and 137 deletions
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=file:///C:/Users/YLL/Downloads/gradle-8.3-all.zip
+distributionUrl=file:///C:/Users/TxT/Downloads/gradle-8.3-all.zip
--- a/lib/database/item_table.dart
+++ b/lib/database/item_table.dart
@ -0,0 +1,13 @@
+const String createItemTable = '''
+CREATE TABLE items (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  name TEXT NOT NULL,
+  category_id INTEGER,
+  location_id INTEGER,
+  description TEXT,
+  purchase_date TEXT,
+  is_in_use INTEGER DEFAULT 0,
+  created_at TEXT DEFAULT (datetime('now')),
+  updated_at TEXT DEFAULT (datetime('now'))
+);
+''';
--- a/lib/database/sqlite_helper.dart
+++ b/lib/database/sqlite_helper.dart
@ -1,16 +1,14 @@
+import 'package:item_tracker/database/item_table.dart';
 import 'package:sqflite/sqflite.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';

 class DatabaseHelper {
+  // 数据库名称
  static final _databaseName = "my_database.db";
+  // 数据库版本
  static final _databaseVersion = 1;

-  static final table = 'items';
-  static final columnId = '_id';
-  static final columnName = 'name';
-  static final columnContext = 'context';
-
  static final DatabaseHelper _instance = DatabaseHelper._internal();
  factory DatabaseHelper() => _instance;
  static Database? _database;
@ -19,12 +17,12 @@ class DatabaseHelper {

  Future<Database> get database async {
    if (_database != null) return _database!;
-    _database = await _initDatabase();
-    print('初始化成功！');
-    return _database!;
+    return (await _initDatabase());
  }

+  // 初始化数据库
  Future<Database> _initDatabase() async {
+    // 获取App文档目录
    final directory = await getApplicationDocumentsDirectory();
    final path = join(directory.path, _databaseName);
    print('${path}');
@ -36,12 +34,6 @@ class DatabaseHelper {
  }

  Future<void> _onCreate(Database db, int version) async {
-    await db.execute('''
-      CREATE TABLE $table (
-        $columnId INTEGER PRIMARY KEY,
-        $columnName TEXT NOT NULL,
-        $columnContext
-      )
-    ''');
+    await db.execute(createItemTable);
  }
 }
--- a/lib/database/sqlite_operation.dart
+++ b/lib/database/sqlite_operation.dart
@ -1,21 +0,0 @@
-import 'sqlite_helper.dart';
-
-Future<int> insertItem(String name, String context) async {
-  final db = await DatabaseHelper().database;
-  final res = await db.insert(
-    DatabaseHelper.table,
-    {
-      DatabaseHelper.columnName: name,
-      DatabaseHelper.columnContext: context,
-    },
-  );
-  print('添加数据成功');
-  return res;
-}
-
-Future<List<Map<String, dynamic>>> getAllItems() async {
-  final db = await DatabaseHelper().database;
-  final res = await db.query(DatabaseHelper.table, orderBy: '_id DESC');
-  print('查询数据完成');
-  return res;
-}
--- a/lib/models/item_model.dart
+++ b/lib/models/item_model.dart
@ -1,19 +1,19 @@
 class Item {
  int? id;
  // 名称
-  String name;
+  final String name;
  // 分类
-  int? categoryId;
+  final int? categoryId;
  // 位置
-  int? locationId;
+  final int? locationId;
  // 描述
-  String? description;
+  final String? description;
  // 购买日期
-  String? purchaseDate;
+  final DateTime? purchaseDate;
  // 是否使用
-  int? isInUse;
-  String? createdAt;
-  String? updatedAt;
+  final bool isInUse;
+  final DateTime? createdAt;
+  final DateTime? updatedAt;

  Item({
    this.id,
@ -22,8 +22,36 @@ class Item {
    this.locationId,
    this.description,
    this.purchaseDate,
-    this.isInUse,
+    this.isInUse = false,
    this.createdAt,
    this.updatedAt,
  });
+
+  Map<String, dynamic> toMap() {
+    return {
+      'id': id,
+      'name': name,
+      'categoryId': categoryId,
+      'locationId': locationId,
+      'description': description,
+      'purchaseDate': purchaseDate,
+      'isInUse': isInUse,
+      'createdAt': createdAt,
+      'updatedAt': updatedAt,
+    };
+  }
+
+  factory Item.fromMap(Map<String, dynamic> map) {
+    return Item(
+      id: map['id'],
+      name: map['name'],
+      categoryId: map['categoryId'],
+      locationId: map['locationId'],
+      description: map['description'],
+      purchaseDate: map['purchaseDate'],
+      isInUse: map['isInUse'],
+      createdAt: map['createdAt'],
+      updatedAt: map['updatedAt'],
+    );
+  }
 }
--- a/lib/repository/item_repository.dart
+++ b/lib/repository/item_repository.dart
@ -0,0 +1,19 @@
+import 'package:item_tracker/database/sqlite_helper.dart';
+
+import '../models/item_model.dart';
+
+class ItemRepository {
+  late final DatabaseHelper dbHelper;
+
+  ItemRepository({required this.dbHelper});
+
+  Future<int> insertItem(Item item) async {
+    final db = await dbHelper.database;
+    return await db.insert('items', item.toMap());
+  }
+
+  Future<List<Map<String, dynamic>>> getAllItems() async {
+    final db = await dbHelper.database;
+    return await db.query('items');
+  }
+}
--- a/lib/scoped_models/item_scoped_model.dart
+++ b/lib/scoped_models/item_scoped_model.dart
@ -0,0 +1,38 @@
+import 'package:flutter/cupertino.dart';
+import 'package:item_tracker/models/item_model.dart';
+import 'package:item_tracker/repository/item_repository.dart';
+
+class ItemScopedModel extends InheritedWidget {
+  final ItemRepository itemRepository;
+  final List<Map<String, dynamic>> items;
+
+  ItemScopedModel({
+    required this.itemRepository,
+    required this.items,
+    required Widget child,
+  }) : super(
+          child: child,
+        );
+
+  static ItemScopedModel of(BuildContext context) {
+    return context.dependOnInheritedWidgetOfExactType<ItemScopedModel>()!;
+  }
+
+  @override
+  bool updateShouldNotify(covariant InheritedWidget oldWidget) {
+    return true;
+  }
+
+  Future<List<Map<String, dynamic>>> loadItems() async {
+    final itemsFormDb = await itemRepository.getAllItems();
+    items.clear();
+    items.addAll(itemsFormDb);
+    return itemsFormDb;
+  }
+
+  Future<void> addItem(Item item) async {
+    await itemRepository.insertItem(item);
+    print("提交完成");
+    await loadItems();
+  }
+}
--- a/lib/screens/addItem/add_item_screen.dart
+++ b/lib/screens/addItem/add_item_screen.dart
@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:item_tracker/database/sqlite_operation.dart';
+
+import '../../models/item_model.dart';
+import '../../scoped_models/item_scoped_model.dart';

 DateTime? selectedDate;

@ -33,6 +35,13 @@ class _FromTestRouteSate extends State<AddItemScreen> {
    });
  }

+  late Future<List<Map<String, dynamic>>> _itemsFuture;
+
+  Future<void> addItem(Item item) async {
+    final itemScopedModel = ItemScopedModel.of(context);
+    return await itemScopedModel.addItem(item);
+  }
+
  @override
  Widget build(BuildContext context) {
    var date = selectedDate;
@ -201,8 +210,10 @@ class _FromTestRouteSate extends State<AddItemScreen> {
                    print('物品是否使用：${_itemIsUse.toString()}');
                    print('物品价格：${_priceController.text}');

-                    insertItem(_nameController.text,
-                        _descriptionController.text);
+                    Item item = Item(name: _nameController.text);
+
+                    addItem(item);
+
                    ScaffoldMessenger.of(context).showSnackBar(SnackBar(
                      content: Text('提交成功'),
                      duration: Duration(seconds: 1),
--- a/lib/screens/item_list_screen.dart
+++ b/lib/screens/item_list_screen.dart
@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:item_tracker/screens/addItem/add_item_screen.dart';

-import '../database/sqlite_operation.dart';
+import '../scoped_models/item_scoped_model.dart';

 class ItemListScreen extends StatefulWidget {
  @override
@ -14,12 +14,17 @@ class _ItemListScreenState extends State<ItemListScreen> {
  @override
  void initState() {
    super.initState();
-    _itemsFuture = getAllItems(); // 初始化 Future
+    _itemsFuture = _loadItems(); // 初始化 Future
+  }
+
+  Future<List<Map<String, dynamic>>> _loadItems() async {
+    final itemScopedModel = ItemScopedModel.of(context);
+    return await itemScopedModel.loadItems();
  }

  Future<void> _refreshData() async {
    setState(() {
-      _itemsFuture = getAllItems(); // 更新 Future，触发 FutureBuilder 重新加载数据
+      _itemsFuture = _loadItems(); // 更新 Future，触发 FutureBuilder 重新加载数据
    });
  }

@ -75,4 +80,4 @@ class _ItemListScreenState extends State<ItemListScreen> {
      ),
    );
  }
-}
+}
--- a/pubspec.lock
+++ b/pubspec.lock
@ -5,42 +5,42 @@ packages:
    dependency: transitive
    description:
      name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
      url: "https://pub.dev"
    source: hosted
-    version: "2.12.0"
+    version: "2.11.0"
  boolean_selector:
    dependency: transitive
    description:
      name: boolean_selector
-      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
  characters:
    dependency: transitive
    description:
      name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
      url: "https://pub.dev"
    source: hosted
-    version: "1.4.0"
+    version: "1.3.0"
  clock:
    dependency: transitive
    description:
      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.2"
+    version: "1.1.1"
  collection:
    dependency: transitive
    description:
      name: collection
-      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
      url: "https://pub.dev"
    source: hosted
-    version: "1.19.1"
+    version: "1.19.0"
  cupertino_icons:
    dependency: "direct main"
    description:
@ -53,18 +53,18 @@ packages:
    dependency: transitive
    description:
      name: fake_async
-      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.2"
+    version: "1.3.1"
  ffi:
    dependency: transitive
    description:
      name: ffi
-      sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418"
+      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.4"
+    version: "2.1.3"
  flutter:
    dependency: "direct main"
    description: flutter
@ -79,18 +79,18 @@ packages:
    dependency: transitive
    description:
      name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
      url: "https://pub.dev"
    source: hosted
-    version: "10.0.8"
+    version: "10.0.7"
  leak_tracker_flutter_testing:
    dependency: transitive
    description:
      name: leak_tracker_flutter_testing
-      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.9"
+    version: "3.0.8"
  leak_tracker_testing:
    dependency: transitive
    description:
@ -103,10 +103,10 @@ packages:
    dependency: transitive
    description:
      name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
      url: "https://pub.dev"
    source: hosted
-    version: "0.12.17"
+    version: "0.12.16+1"
  material_color_utilities:
    dependency: transitive
    description:
@ -119,18 +119,18 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
      url: "https://pub.dev"
    source: hosted
-    version: "1.16.0"
+    version: "1.15.0"
  path:
    dependency: "direct main"
    description:
      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
      url: "https://pub.dev"
    source: hosted
-    version: "1.9.1"
+    version: "1.9.0"
  path_provider:
    dependency: "direct main"
    description:
@ -204,50 +204,42 @@ packages:
    dependency: transitive
    description:
      name: source_span
-      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
      url: "https://pub.dev"
    source: hosted
-    version: "1.10.1"
+    version: "1.10.0"
  sqflite:
    dependency: "direct main"
    description:
      name: sqflite
-      sha256: e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03
+      sha256: "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.2"
+    version: "2.4.1"
  sqflite_android:
    dependency: transitive
    description:
      name: sqflite_android
-      sha256: "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b"
+      sha256: "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.1"
+    version: "2.4.0"
  sqflite_common:
    dependency: transitive
    description:
      name: sqflite_common
-      sha256: "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b"
+      sha256: "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709"
      url: "https://pub.dev"
    source: hosted
-    version: "2.5.5"
-  sqflite_common_ffi:
-    dependency: "direct main"
-    description:
-      name: sqflite_common_ffi
-      sha256: "1f3ef3888d3bfbb47785cc1dda0dc7dd7ebd8c1955d32a9e8e9dae1e38d1c4c1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.5"
+    version: "2.5.4+6"
  sqflite_darwin:
    dependency: transitive
    description:
      name: sqflite_darwin
-      sha256: "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3"
+      sha256: "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.2"
+    version: "2.4.1+1"
  sqflite_platform_interface:
    dependency: transitive
    description:
@ -256,14 +248,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.4.0"
-  sqlite3:
-    dependency: transitive
-    description:
-      name: sqlite3
-      sha256: "310af39c40dd0bb2058538333c9d9840a2725ae0b9f77e4fd09ad6696aa8f66e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.7.5"
  sqlite3_flutter_libs:
    dependency: "direct main"
    description:
@ -276,58 +260,50 @@ packages:
    dependency: transitive
    description:
      name: stack_trace
-      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
      url: "https://pub.dev"
    source: hosted
-    version: "1.12.1"
+    version: "1.12.0"
  stream_channel:
    dependency: transitive
    description:
      name: stream_channel
-      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.4"
+    version: "2.1.2"
  string_scanner:
    dependency: transitive
    description:
      name: string_scanner
-      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
      url: "https://pub.dev"
    source: hosted
-    version: "1.4.1"
+    version: "1.3.0"
  synchronized:
    dependency: transitive
    description:
      name: synchronized
-      sha256: "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6"
+      sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225"
      url: "https://pub.dev"
    source: hosted
-    version: "3.3.1"
+    version: "3.3.0+3"
  term_glyph:
    dependency: transitive
    description:
      name: term_glyph
-      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.2"
+    version: "1.2.1"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.4"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
+    version: "0.7.3"
  vector_math:
    dependency: transitive
    description:
@ -340,18 +316,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
      url: "https://pub.dev"
    source: hosted
-    version: "14.3.1"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
+    version: "14.3.0"
  xdg_directories:
    dependency: transitive
    description:
@ -361,5 +329,5 @@ packages:
    source: hosted
    version: "1.1.0"
 sdks:
-  dart: ">=3.7.0 <4.0.0"
+  dart: ">=3.6.0 <4.0.0"
  flutter: ">=3.27.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -14,14 +14,12 @@ dependencies:
  cupertino_icons: ^1.0.2
  sqflite: ^2.3.0
  path: ^1.8.0
-  sqflite_common_ffi: ^2.3.0
  sqlite3_flutter_libs: ^0.5.32
  path_provider: ^2.0.2

-  
 dev_dependencies:
  flutter_test:
    sdk: flutter

 flutter:
-  uses-material-design: true
+  uses-material-design: true