From 4b21d6ed28c841a4ad00588cf360626187eb585d Mon Sep 17 00:00:00 2001
From: SjvavE <xah1123801846@163.com>
Date: Fri, 22 Sep 2023 23:43:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=AE=9E=E4=BD=93=E7=B1=BB=E7=9A=84to?=
 =?UTF-8?q?map=E6=96=B9=E6=B3=95=E5=AE=8C=E5=96=84=E4=BA=86=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E8=AE=BE=E8=AE=A1=E5=A5=BD=E4=BA=86=E5=9F=BA?=
 =?UTF-8?q?=E6=9C=AC=E7=9A=84mvc=E4=B8=89=E5=B1=82=E6=9E=B6=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/timemanagerapp/.idea/workspace.xml        | 30 ++++++--
 .../lib/controller/UserController.dart        | 16 ++++
 .../lib/database/User/UserService.dart        | 73 ++++++++++++-------
 src/timemanagerapp/lib/entity/Clock.dart      | 11 +++
 src/timemanagerapp/lib/entity/Course.dart     | 13 ++++
 src/timemanagerapp/lib/entity/Task.dart       | 13 ++++
 src/timemanagerapp/lib/entity/Team.dart       |  8 ++
 src/timemanagerapp/lib/entity/User.dart       | 17 ++++-
 src/timemanagerapp/lib/entity/Work.dart       | 13 ++++
 src/timemanagerapp/lib/main.dart              |  6 +-
 10 files changed, 164 insertions(+), 36 deletions(-)
 create mode 100644 src/timemanagerapp/lib/controller/UserController.dart

diff --git a/src/timemanagerapp/.idea/workspace.xml b/src/timemanagerapp/.idea/workspace.xml
index 68a4927..8c16bbc 100644
--- a/src/timemanagerapp/.idea/workspace.xml
+++ b/src/timemanagerapp/.idea/workspace.xml
@@ -9,13 +9,16 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="c05b8a8d-d805-4e13-a87e-db77479b20ae" name="Default Changelist" comment="添加基本的实体类">
+    <list default="true" id="c05b8a8d-d805-4e13-a87e-db77479b20ae" name="Default Changelist" comment="将实体类的getter，setter，tostring方法完善了">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/database/database_init.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/database/database_init.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/database/User/UserService.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/database/User/UserMapper.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/entity/Clock.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/entity/Clock.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/entity/Course.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/entity/Course.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/entity/Task.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/entity/Task.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/entity/Team.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/entity/Team.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/entity/User.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/entity/User.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/entity/Work.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/entity/Work.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/main.dart" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -145,7 +148,7 @@
       <workItem from="1695208047127" duration="657000" />
       <workItem from="1695299184020" duration="3382000" />
       <workItem from="1695309116608" duration="10000" />
-      <workItem from="1695340191136" duration="31011000" />
+      <workItem from="1695340191136" duration="34595000" />
     </task>
     <task id="LOCAL-00001" summary="解绝数据库连接的问题">
       <option name="closed" value="true" />
@@ -179,7 +182,23 @@
       <option name="project" value="LOCAL" />
       <updated>1695368650691</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="将实体类的getter，setter，tostring方法完善了">
+      <option name="closed" value="true" />
+      <created>1695393984912</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1695393984912</updated>
+    </task>
+    <task id="LOCAL-00006" summary="将实体类的getter，setter，tostring方法完善了">
+      <option name="closed" value="true" />
+      <created>1695394002494</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1695394002494</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="ToolWindowManager">
@@ -205,7 +224,8 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="解绝数据库连接的问题" />
     <MESSAGE value="添加基本的实体类" />
-    <option name="LAST_COMMIT_MESSAGE" value="添加基本的实体类" />
+    <MESSAGE value="将实体类的getter，setter，tostring方法完善了" />
+    <option name="LAST_COMMIT_MESSAGE" value="将实体类的getter，setter，tostring方法完善了" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
diff --git a/src/timemanagerapp/lib/controller/UserController.dart b/src/timemanagerapp/lib/controller/UserController.dart
new file mode 100644
index 0000000..5b486ae
--- /dev/null
+++ b/src/timemanagerapp/lib/controller/UserController.dart
@@ -0,0 +1,16 @@
+import 'package:timemanagerapp/database/User/UserService.dart';
+
+/**
+ * 封装所有要用到的与用户相关的函数
+ */
+class UserController {
+  UserController userController = new UserController();
+
+  //对外暴露实例
+  UserController getInstance() {
+    return userController;
+  }
+
+  //获取操作业务的实例
+  UserService userService=UserService.getInstance()
+}
diff --git a/src/timemanagerapp/lib/database/User/UserService.dart b/src/timemanagerapp/lib/database/User/UserService.dart
index c343e1b..5e38888 100644
--- a/src/timemanagerapp/lib/database/User/UserService.dart
+++ b/src/timemanagerapp/lib/database/User/UserService.dart
@@ -1,45 +1,68 @@
+import 'package:timemanagerapp/database/User/UserMapper.dart';
 import 'package:timemanagerapp/entity/User.dart';
 
+';
+
 /**
- * 封装对User的crud操作
+ * 主要处理和user相关的业务逻辑
  */
 class UserService {
-  UserService instance = new UserService();
+  UserService userService = new UserService();
 
-  static UserService getInstance() {
-    return this.instance;
-  }
-  /**
-   * 添加用户
-   */
-  void addUser(User user) {
-    //TODO
+  //对外暴露实例
+  UserService getInstance() {
+    return userService;
   }
+
+  //获取mapper对象
+  UserMapper userMapper = UserMapper.getInstance();
+
   /**
-   * 删除用户
+   *添加用户的方法
+   * @param user 用户实体
    */
-  void delete(User user) {
-    //TODO
+  bool addUser(User user) {
+    //TODO 插入之前要做的对应操作，如判断字段非空等等
+    String userName = user.getUsername();
+    String password = user.getPassword();
+    int role = user.getRole();
+    bool res = userMapper.add(userName, password, role);
+    //TODO 插入之后的判断操作，如返回结果和查询结果判断等等
   }
 
-  /**
-   * 查询所有用户
-   */
-  List<User> selectUser() {
-    //TODO
+  bool deleteUser(User user) {
+    //TODO 删除之前要做的对应操作，如判断字段非空等等
+    int id = user.getId();
+    bool res = userMapper.delete(id);
+    //TODO 删除之后的判断操作，如返回结果和查询结果判断等等
   }
 
   /**
-   *  查询单个用户
+   * 更新用户信息
+   * @param user 用户实体
    */
-  User queryUser(int id) {
-    //TODO
+  bool updateUser(User user) {
+    //TODO 更新之前要做的对应操作，如判断字段非空等等
+    int id = user.getId();
+    String userName = user.getUsername();
+    String password = user.getPassword();
+    int role = user.getRole();
+    bool res = userMapper.update(id, userName, password, role);
+    //TODO 更新之后的判断操作，如返回结果和查询结果判断等等
   }
 
   /**
-   * 修改一个用户
+   *查询当个用户信息
+   * @param user 用户实体
    */
-  User editUser(User user) {
-    //TODO
+  User queryUser(User user) {
+    //TODO 查询之前要做的对应操作，如判断字段非空等等
+    int id = user.getId();
+    User res = userMapper.query(id);
+    //TODO 查询之后的判断操作，如返回结果和查询结果判断等等
   }
-}
+
+  List<User> queryUserList() {
+    List<User> res = userMapper.selectAll(;
+        //TODO 查询之后的判断操作，如返回结果和查询结果判断等等
+        }
diff --git a/src/timemanagerapp/lib/entity/Clock.dart b/src/timemanagerapp/lib/entity/Clock.dart
index 21caf8a..e75e27b 100644
--- a/src/timemanagerapp/lib/entity/Clock.dart
+++ b/src/timemanagerapp/lib/entity/Clock.dart
@@ -15,6 +15,17 @@ class Clock {
     required this.continueTime,
   });
 
+  Map<String, dynamic> toMap() {
+    return {
+      'id': id,
+      'userId': userId,
+      'text': text,
+      'img': img,
+      'music': music,
+      'continueTime': continueTime.toIso8601String(),
+    };
+  }
+
   // Getter methods
   int get getId => id;
 
diff --git a/src/timemanagerapp/lib/entity/Course.dart b/src/timemanagerapp/lib/entity/Course.dart
index 7532ce9..599596d 100644
--- a/src/timemanagerapp/lib/entity/Course.dart
+++ b/src/timemanagerapp/lib/entity/Course.dart
@@ -19,6 +19,19 @@ class Course {
     required this.end,
   });
 
+  Map<String, dynamic> toMap() {
+    return {
+      'id': id,
+      'name': name,
+      'credit': credit,
+      'teacher': teacher,
+      'location': location,
+      'remark': remark,
+      'start': start.toIso8601String(),
+      'end': end.toIso8601String(),
+    };
+  }
+
   // Getter methods
   int get getId => id;
 
diff --git a/src/timemanagerapp/lib/entity/Task.dart b/src/timemanagerapp/lib/entity/Task.dart
index 30de4e1..41a8d69 100644
--- a/src/timemanagerapp/lib/entity/Task.dart
+++ b/src/timemanagerapp/lib/entity/Task.dart
@@ -19,6 +19,19 @@ class Task {
     required this.endTime,
   });
 
+  Map<String, dynamic> toMap() {
+    return {
+      'id': id,
+      'userId': userId,
+      'content': content,
+      'taskId': taskId,
+      'frequency': frequency,
+      'name': name,
+      'startTime': startTime.toIso8601String(),
+      'endTime': endTime.toIso8601String(),
+    };
+  }
+
   // Getter methods
   int get getId => id;
 
diff --git a/src/timemanagerapp/lib/entity/Team.dart b/src/timemanagerapp/lib/entity/Team.dart
index 0f91574..55af31f 100644
--- a/src/timemanagerapp/lib/entity/Team.dart
+++ b/src/timemanagerapp/lib/entity/Team.dart
@@ -9,6 +9,14 @@ class Team {
     required this.maxNumber,
   });
 
+  Map<String, dynamic> toMap() {
+    return {
+      'id': id,
+      'teamName': teamName,
+      'maxNumber': maxNumber,
+    };
+  }
+
   // Getter methods
   int get getId => id;
 
diff --git a/src/timemanagerapp/lib/entity/User.dart b/src/timemanagerapp/lib/entity/User.dart
index 775269f..931cfb0 100644
--- a/src/timemanagerapp/lib/entity/User.dart
+++ b/src/timemanagerapp/lib/entity/User.dart
@@ -2,7 +2,9 @@ class User {
   int id;
   String username;
   String password;
-  String role;
+
+  //0表示一般用户，1表示管理员
+  int role;
 
   User({
     required this.id,
@@ -11,6 +13,15 @@ class User {
     required this.role,
   });
 
+  Map<String, dynamic> toMap() {
+    return {
+      'id': id,
+      'username': username,
+      'password': password,
+      'role': role,
+    };
+  }
+
   // Getter methods
   int get getId => id;
 
@@ -18,7 +29,7 @@ class User {
 
   String get getPassword => password;
 
-  String get getRole => role;
+  int get getRole => role;
 
   // Setter methods
   set setId(int newId) {
@@ -33,7 +44,7 @@ class User {
     password = newPassword;
   }
 
-  set setRole(String newRole) {
+  set setRole(int newRole) {
     role = newRole;
   }
 
diff --git a/src/timemanagerapp/lib/entity/Work.dart b/src/timemanagerapp/lib/entity/Work.dart
index abdfbc3..d6ffcfd 100644
--- a/src/timemanagerapp/lib/entity/Work.dart
+++ b/src/timemanagerapp/lib/entity/Work.dart
@@ -19,6 +19,19 @@ class Work {
     required this.startTime,
   });
 
+  Map<String, dynamic> toMap() {
+    return {
+      'id': id,
+      'status': status,
+      'workContent': workContent,
+      'teamId': teamId,
+      'functionaryId': functionaryId,
+      'workId': workId,
+      'endTime': endTime.toString(),
+      'startTime': startTime.toString(),
+    };
+  }
+
   // Getter methods
   int get getId => id;
 
diff --git a/src/timemanagerapp/lib/main.dart b/src/timemanagerapp/lib/main.dart
index 1aa1bb5..f7a2db4 100644
--- a/src/timemanagerapp/lib/main.dart
+++ b/src/timemanagerapp/lib/main.dart
@@ -48,17 +48,17 @@ class HomePage extends StatefulWidget {
 
 class _HomePageState extends State<HomePage> {
   Future<Database>? _database;
+
   @override
   void initState() {
     super.initState();
     //获取数据库对象
-    var db=MyDatabase.initDatabase();
+    var db = MyDatabase.initDatabase();
     setState(() {
-      _database=db;
+      _database = db;
     });
   }
 
-
   Future<void> _insertUser() async {
     final database = await _database;
     if (database != null) {