refactor(更新)

- 业务层注入器拆分
- 用户表新增状态字段

data/src/main/java/com/grkj/data/di/LogicModule.kt

@@ -0,0 +1,138 @@
+package com.grkj.data.di
+
+import com.grkj.data.data.MMKVConstants
+import com.grkj.data.logic.IExceptionLogic
+import com.grkj.data.logic.IHardwareLogic
+import com.grkj.data.logic.IIsolationPointLogic
+import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.logic.IRfidTokenLogic
+import com.grkj.data.logic.IRoleLogic
+import com.grkj.data.logic.ISopLogic
+import com.grkj.data.logic.ISysMenuLogic
+import com.grkj.data.logic.IUserLogic
+import com.grkj.data.logic.IWorkflowLogic
+import com.grkj.data.logic.IWorkstationLogic
+import com.grkj.data.logic.impl.network.NetworkExceptionLogic
+import com.grkj.data.logic.impl.network.NetworkHardwareLogic
+import com.grkj.data.logic.impl.network.NetworkIsolationPointLogic
+import com.grkj.data.logic.impl.network.NetworkJobTicketLogic
+import com.grkj.data.logic.impl.network.NetworkRfidTokenLogic
+import com.grkj.data.logic.impl.network.NetworkRoleLogic
+import com.grkj.data.logic.impl.network.NetworkSopLogic
+import com.grkj.data.logic.impl.network.NetworkSysMenuLogic
+import com.grkj.data.logic.impl.network.NetworkUserLogic
+import com.grkj.data.logic.impl.network.NetworkWorkflowLogic
+import com.grkj.data.logic.impl.network.NetworkWorkstationLogic
+import com.grkj.data.logic.impl.standard.ExceptionLogic
+import com.grkj.data.logic.impl.standard.HardwareLogic
+import com.grkj.data.logic.impl.standard.IsolationPointLogic
+import com.grkj.data.logic.impl.standard.JobTicketLogic
+import com.grkj.data.logic.impl.standard.RfidTokenLogic
+import com.grkj.data.logic.impl.standard.RoleLogic
+import com.grkj.data.logic.impl.standard.SopLogic
+import com.grkj.data.logic.impl.standard.SysMenuLogic
+import com.grkj.data.logic.impl.standard.UserLogic
+import com.grkj.data.logic.impl.standard.WorkflowLogic
+import com.grkj.data.logic.impl.standard.WorkstationLogic
+import com.sik.sikcore.extension.getMMKVData
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+/**
+ * 业务层注入器
+ */
+@Module
+@InstallIn(SingletonComponent::class)
+object LogicModule {
+
+    @Provides
+    @Singleton
+    fun provideHardwareRepository(
+        standard: HardwareLogic,
+        network: NetworkHardwareLogic,
+    ): IHardwareLogic =
+        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
+
+    @Provides
+    @Singleton
+    fun provideIsolationPointRepository(
+        standard: IsolationPointLogic,
+        network: NetworkIsolationPointLogic,
+    ): IIsolationPointLogic =
+        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
+
+    @Provides
+    @Singleton
+    fun provideJobTicketRepository(
+        standard: JobTicketLogic,
+        network: NetworkJobTicketLogic,
+    ): IJobTicketLogic =
+        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
+
+    @Provides
+    @Singleton
+    fun provideRfidTokenRepository(
+        standard: RfidTokenLogic,
+        network: NetworkRfidTokenLogic,
+    ): IRfidTokenLogic =
+        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
+
+    @Provides
+    @Singleton
+    fun provideRoleRepository(
+        standard: RoleLogic,
+        network: NetworkRoleLogic,
+    ): IRoleLogic =
+        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
+
+    @Provides
+    @Singleton
+    fun provideSopRepository(
+        standard: SopLogic,
+        network: NetworkSopLogic,
+    ): ISopLogic =
+        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
+
+    @Provides
+    @Singleton
+    fun provideUserRepository(
+        standard: UserLogic,
+        network: NetworkUserLogic,
+    ): IUserLogic =
+        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
+
+    @Provides
+    @Singleton
+    fun provideWorkstationRepository(
+        standard: WorkstationLogic,
+        network: NetworkWorkstationLogic,
+    ): IWorkstationLogic =
+        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
+
+    @Provides
+    @Singleton
+    fun provideSysMenuRepository(
+        standard: SysMenuLogic,
+        network: NetworkSysMenuLogic,
+    ): ISysMenuLogic =
+        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
+
+    @Provides
+    @Singleton
+    fun provideWorkflowRepository(
+        standard: WorkflowLogic,
+        network: NetworkWorkflowLogic,
+    ): IWorkflowLogic =
+        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
+
+    @Provides
+    @Singleton
+    fun provideExceptionRepository(
+        standard: ExceptionLogic,
+        network: NetworkExceptionLogic,
+    ): IExceptionLogic =
+        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
+}

data/src/main/java/com/grkj/data/di/RepositoryModule.kt

@@ -1,135 +1,24 @@
 package com.grkj.data.di
 
-import com.grkj.data.data.MMKVConstants
-import com.grkj.data.logic.IExceptionLogic
-import com.grkj.data.logic.IHardwareLogic
-import com.grkj.data.logic.IIsolationPointLogic
-import com.grkj.data.logic.IJobTicketLogic
-import com.grkj.data.logic.IRfidTokenLogic
-import com.grkj.data.logic.IRoleLogic
-import com.grkj.data.logic.ISopLogic
-import com.grkj.data.logic.ISysMenuLogic
-import com.grkj.data.logic.IUserLogic
-import com.grkj.data.logic.IWorkflowLogic
-import com.grkj.data.logic.IWorkstationLogic
-import com.grkj.data.logic.impl.network.NetworkExceptionLogic
-import com.grkj.data.logic.impl.network.NetworkHardwareLogic
-import com.grkj.data.logic.impl.network.NetworkIsolationPointLogic
-import com.grkj.data.logic.impl.network.NetworkJobTicketLogic
-import com.grkj.data.logic.impl.network.NetworkRfidTokenLogic
-import com.grkj.data.logic.impl.network.NetworkRoleLogic
-import com.grkj.data.logic.impl.network.NetworkSopLogic
-import com.grkj.data.logic.impl.network.NetworkSysMenuLogic
-import com.grkj.data.logic.impl.network.NetworkUserLogic
-import com.grkj.data.logic.impl.network.NetworkWorkflowLogic
-import com.grkj.data.logic.impl.network.NetworkWorkstationLogic
-import com.grkj.data.logic.impl.standard.ExceptionLogic
-import com.grkj.data.logic.impl.standard.HardwareLogic
-import com.grkj.data.logic.impl.standard.IsolationPointLogic
-import com.grkj.data.logic.impl.standard.JobTicketLogic
-import com.grkj.data.logic.impl.standard.RfidTokenLogic
-import com.grkj.data.logic.impl.standard.RoleLogic
-import com.grkj.data.logic.impl.standard.SopLogic
-import com.grkj.data.logic.impl.standard.SysMenuLogic
-import com.grkj.data.logic.impl.standard.UserLogic
-import com.grkj.data.logic.impl.standard.WorkflowLogic
-import com.grkj.data.logic.impl.standard.WorkstationLogic
-import com.sik.sikcore.extension.getMMKVData
+import com.grkj.data.repository.UserRepository
+import com.grkj.data.repository.impl.UserRepositoryImpl
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 
+/**
+ * 仓储层注入器
+ */
 @Module
 @InstallIn(SingletonComponent::class)
 object RepositoryModule {
 
-    @Provides
-    @Singleton
-    fun provideHardwareRepository(
-        standard: HardwareLogic,
-        network: NetworkHardwareLogic,
-    ): IHardwareLogic =
-        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
-
-    @Provides
-    @Singleton
-    fun provideIsolationPointRepository(
-        standard: IsolationPointLogic,
-        network: NetworkIsolationPointLogic,
-    ): IIsolationPointLogic =
-        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
-
-    @Provides
-    @Singleton
-    fun provideJobTicketRepository(
-        standard: JobTicketLogic,
-        network: NetworkJobTicketLogic,
-    ): IJobTicketLogic =
-        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
-
-    @Provides
-    @Singleton
-    fun provideRfidTokenRepository(
-        standard: RfidTokenLogic,
-        network: NetworkRfidTokenLogic,
-    ): IRfidTokenLogic =
-        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
-
-    @Provides
-    @Singleton
-    fun provideRoleRepository(
-        standard: RoleLogic,
-        network: NetworkRoleLogic,
-    ): IRoleLogic =
-        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
-
-    @Provides
-    @Singleton
-    fun provideSopRepository(
-        standard: SopLogic,
-        network: NetworkSopLogic,
-    ): ISopLogic =
-        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
-
     @Provides
     @Singleton
     fun provideUserRepository(
-        standard: UserLogic,
-        network: NetworkUserLogic,
-    ): IUserLogic =
-        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
-
-    @Provides
-    @Singleton
-    fun provideWorkstationRepository(
-        standard: WorkstationLogic,
-        network: NetworkWorkstationLogic,
-    ): IWorkstationLogic =
-        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
-
-    @Provides
-    @Singleton
-    fun provideSysMenuRepository(
-        standard: SysMenuLogic,
-        network: NetworkSysMenuLogic,
-    ): ISysMenuLogic =
-        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
+        userRepository: UserRepositoryImpl,
+    ): UserRepository = userRepository
 
-    @Provides
-    @Singleton
-    fun provideWorkflowRepository(
-        standard: WorkflowLogic,
-        network: NetworkWorkflowLogic,
-    ): IWorkflowLogic =
-        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
-
-    @Provides
-    @Singleton
-    fun provideExceptionRepository(
-        standard: ExceptionLogic,
-        network: NetworkExceptionLogic,
-    ): IExceptionLogic =
-        if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
 }

data/src/main/java/com/grkj/data/model/dos/SysUserDo.kt

@@ -42,6 +42,9 @@ open class SysUserDo : BaseBean() {
     @ColumnInfo("key_code")
     var keyCode: String? = "123456"
 
+    /**
+     * 状态 0、禁用；1、启用
+     */
     @ColumnInfo("status")
     var status: String? = null