瀏覽代碼

@fun: user and project table

bai 3 年之前
父節點
當前提交
2952bba965

+ 2 - 1
app/src/main/java/com/ys/bdtp/adm/mvvm/model/db/dao/ProjectDao.kt

@@ -4,7 +4,8 @@ import androidx.room.*
 import com.ys.bdtp.adm.mvvm.model.db.entity.ProjectEntity
 
 /**
- * 表 project Dao
+ * project 表访问接口
+ * @author bai
  */
 @Dao
 interface ProjectDao {

+ 11 - 7
app/src/main/java/com/ys/bdtp/adm/mvvm/model/db/dao/UserDao.kt

@@ -8,26 +8,30 @@ import androidx.room.Query
 import androidx.room.Update
 import com.ys.bdtp.adm.mvvm.model.db.entity.UserEntity
 
+/**
+ * user 表访问接口
+ * @author bai
+ */
 @Dao
 interface UserDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertUser(vararg user: UserEntity)
+    fun insUser(vararg user: UserEntity)
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insUsers(users: List<UserEntity>): List<Long>
 
     @Query("select * from user")
-    fun queryUsers(): List<UserEntity>
+    fun getUsers(): List<UserEntity>
 
     @Query("select * from user where id = :id")
-    fun queryUserById(id: String): UserEntity
+    fun getUserById(id: String): UserEntity
 
-    @Query("select * from user where name =:name and password = :password")
-    suspend fun getUser(name: String, password: String): UserEntity?
+    @Query("select * from user where name =:phone and password = :password")
+    suspend fun getUser(phone: String, password: String): UserEntity?
 
     @Update
-    fun updateUser(user: UserEntity)
+    fun updUser(user: UserEntity)
 
     @Delete
-    fun deleteUser(user: UserEntity)
+    fun delUser(user: UserEntity)
 }

+ 8 - 11
app/src/main/java/com/ys/bdtp/adm/mvvm/model/db/entity/ProjectEntity.kt

@@ -5,20 +5,17 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 
 /**
- * 项目表(远程无对应表)
+ * project 表: 项目表
+ *
+ * @param projectId 项目id
+ * @param projectName 项目名称
+ * @param groupCode 集团编码
+ * @param groupName 集团名称
  */
 @Entity(tableName = "project")
 data class ProjectEntity(
-    @PrimaryKey
-    @ColumnInfo(name = "id") val projectId: String,
+    @PrimaryKey @ColumnInfo(name = "id") val projectId: String,
     @ColumnInfo(name = "name") val projectName: String,
     @ColumnInfo(name = "group_code") val groupCode: String,
-    @ColumnInfo(name = "latitude") val latitude: String?,
-    @ColumnInfo(name = "longitude") val longitude: String?,
-    @ColumnInfo(name = "address") val detailAddress: String?,
-    @ColumnInfo(name = "local_id") val projectLocalID: String?,
-    @ColumnInfo(name = "local_name") val projectLocalName: String?,
-    @ColumnInfo(name = "function_type") val functionType: String?,
-    @ColumnInfo(name = "live_status") val liveStatus: String?,
-    @ColumnInfo(name = "user_id") val userId: String?
+    @ColumnInfo(name = "group_name") val groupName: String,
 )

+ 19 - 3
app/src/main/java/com/ys/bdtp/adm/mvvm/model/db/entity/UserEntity.kt

@@ -4,9 +4,25 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 
+/**
+ * user: 用户表
+ *
+ * @param id 用户id
+ * @param password 离线登录用密码,MD5加密过
+ * @param account BOSS 登录账号
+ * @param deptId BOSS 部门编号
+ * @param email BOSS 邮箱
+ * @param phone BOSS 手机
+ * @param name BOSS 用户名
+ *
+ */
 @Entity(tableName = "user")
 data class UserEntity(
-    @PrimaryKey val id: String,
-    @ColumnInfo(name = "name") val name: String,
-    @ColumnInfo(name = "password") val password: String
+    @PrimaryKey @ColumnInfo(name = "id") val id: String,
+    @ColumnInfo(name = "password") val password: String,
+    @ColumnInfo(name = "account") val account: String,
+    @ColumnInfo(name = "dept_id") val deptId: String,
+    @ColumnInfo(name = "email") val email: String,
+    @ColumnInfo(name = "phone") val phone: String,
+    @ColumnInfo(name = "name") val name: String
 )