fix(数据)

- 仓储层改逻辑层

app/src/main/java/com/grkj/iscs/features/init/viewmodel/InitDeviceRegistrationKeyAndLockViewModel.kt

@@ -6,7 +6,7 @@ import androidx.lifecycle.liveData
 import com.clj.fastble.BleManager
 import com.grkj.data.data.MMKVConstants
 import com.grkj.data.model.dos.IsLockCabinetSlots
-import com.grkj.data.repository.IHardwareRepository
+import com.grkj.data.logic.IHardwareLogic
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.business.ModbusBusinessManager
 import com.grkj.ui_base.config.ISCSConfig
@@ -26,7 +26,7 @@ import javax.inject.Inject
 import kotlin.coroutines.resume
 
 @HiltViewModel
-class InitDeviceRegistrationKeyAndLockViewModel @Inject constructor(val hardwareRepository: IHardwareRepository) :
+class InitDeviceRegistrationKeyAndLockViewModel @Inject constructor(val hardwareRepository: IHardwareLogic) :
     BaseViewModel() {
     val isLoadComplete: MutableLiveData<Boolean> = MutableLiveData(false)
     var isDestroy: Boolean = false

app/src/main/java/com/grkj/iscs/features/init/viewmodel/InitViewModel.kt

@@ -1,14 +1,10 @@
 package com.grkj.iscs.features.init.viewmodel
 
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.liveData
-import com.grkj.data.database.ISCSDatabase
-import com.grkj.data.di.RepositoryManager
-import com.grkj.data.repository.IHardwareRepository
-import com.grkj.data.repository.IUserRepository
+import com.grkj.data.logic.IHardwareLogic
+import com.grkj.data.logic.IUserLogic
 import com.grkj.ui_base.base.BaseViewModel
-import com.sik.sikcore.thread.ThreadUtils
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
@@ -18,8 +14,8 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class InitViewModel @Inject constructor(
-    override val userRepository: IUserRepository,
-    val hardwareRepository: IHardwareRepository
+    override val userRepository: IUserLogic,
+    val hardwareRepository: IHardwareLogic
 ) : BaseViewModel(userRepository) {
     /**
      * 移除超级管理员用户

app/src/main/java/com/grkj/iscs/features/login/viewmodel/LoginViewModel.kt

@@ -3,7 +3,7 @@ package com.grkj.iscs.features.login.viewmodel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.enums.LoginResultEnum
-import com.grkj.data.repository.IUserRepository
+import com.grkj.data.logic.IUserLogic
 import com.grkj.shared.utils.ArcSoftUtil
 import com.grkj.ui_base.base.BaseViewModel
 import com.sik.sikcore.extension.file
@@ -16,7 +16,7 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class LoginViewModel @Inject constructor(
-    override val userRepository: IUserRepository,
+    override val userRepository: IUserLogic,
 ) : BaseViewModel(userRepository) {
 
 

app/src/main/java/com/grkj/iscs/features/main/viewmodel/WorkflowViewModel.kt

@@ -8,7 +8,7 @@ import com.grkj.data.data.CommonConstants
 import com.grkj.data.model.dos.WorkflowMode
 import com.grkj.data.model.dos.WorkflowStep
 import com.grkj.data.model.vo.WorkflowModeVo
-import com.grkj.data.repository.IWorkflowRepository
+import com.grkj.data.logic.IWorkflowLogic
 import com.grkj.iscs.R
 import com.grkj.iscs.features.main.entity.WorkflowModeImport
 import com.grkj.shared.config.AESConfig
@@ -32,7 +32,7 @@ import javax.inject.Inject
  * 流程模式
  */
 @HiltViewModel
-class WorkflowViewModel @Inject constructor(val workflowRepository: IWorkflowRepository) :
+class WorkflowViewModel @Inject constructor(val workflowRepository: IWorkflowLogic) :
     BaseViewModel() {
     /**
      * 流程模式数据

app/src/main/java/com/grkj/iscs/features/main/viewmodel/common/EditJobWorkflowSettingViewModel.kt

@@ -5,13 +5,11 @@ import androidx.lifecycle.liveData
 import com.grkj.data.enums.WorkflowStepConfirmTypeEnum
 import com.grkj.data.model.dos.IsJobTicketStep
 import com.grkj.data.model.dos.SysRole
-import com.grkj.data.model.dos.WorkflowStep
 import com.grkj.data.model.vo.SysUserVo
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.data.repository.IRoleRepository
-import com.grkj.data.repository.IUserRepository
-import com.grkj.data.repository.IWorkflowRepository
-import com.grkj.data.repository.impl.standard.JobTicketRepository
+import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.logic.IRoleLogic
+import com.grkj.data.logic.IUserLogic
+import com.grkj.data.logic.IWorkflowLogic
 import com.grkj.iscs.R
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils
@@ -25,10 +23,10 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class EditJobWorkflowSettingViewModel @Inject constructor(
-    val workflowRepository: IWorkflowRepository,
-    val jobTicketRepository: IJobTicketRepository,
-    override val userRepository: IUserRepository,
-    val roleRepository: IRoleRepository
+    val workflowRepository: IWorkflowLogic,
+    val jobTicketRepository: IJobTicketLogic,
+    override val userRepository: IUserLogic,
+    val roleRepository: IRoleLogic
 ) : BaseViewModel(userRepository) {
     var modeId: Long = 0
     var ticketId: Long = 0

app/src/main/java/com/grkj/iscs/features/main/viewmodel/common/EditSopWorkflowSettingViewModel.kt

@@ -6,10 +6,10 @@ import com.grkj.data.enums.WorkflowStepConfirmTypeEnum
 import com.grkj.data.model.dos.IsSopWorkflowStep
 import com.grkj.data.model.dos.SysRole
 import com.grkj.data.model.vo.SysUserVo
-import com.grkj.data.repository.IRoleRepository
-import com.grkj.data.repository.ISopRepository
-import com.grkj.data.repository.IUserRepository
-import com.grkj.data.repository.IWorkflowRepository
+import com.grkj.data.logic.IRoleLogic
+import com.grkj.data.logic.ISopLogic
+import com.grkj.data.logic.IUserLogic
+import com.grkj.data.logic.IWorkflowLogic
 import com.grkj.iscs.R
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils
@@ -23,10 +23,10 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class EditSopWorkflowSettingViewModel @Inject constructor(
-    val workflowRepository: IWorkflowRepository,
-    val sopRepository: ISopRepository,
-    override val userRepository: IUserRepository,
-    val roleRepository: IRoleRepository
+    val workflowRepository: IWorkflowLogic,
+    val sopRepository: ISopLogic,
+    override val userRepository: IUserLogic,
+    val roleRepository: IRoleLogic
 ) : BaseViewModel(userRepository) {
     var modeId: Long = 0
     var sopId: Long = 0

app/src/main/java/com/grkj/iscs/features/main/viewmodel/common/SelectMemberViewModel.kt

@@ -7,8 +7,8 @@ import com.grkj.data.model.vo.IsJobTicketUserDataVo
 import com.grkj.data.model.vo.JobTicketGroupInfoVo
 import com.grkj.data.model.vo.JobUserVo
 import com.grkj.data.model.vo.SysBiometricDataVo
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.data.repository.IUserRepository
+import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.logic.IUserLogic
 import com.grkj.ui_base.base.BaseViewModel
 import com.sik.sikcore.data.BeanUtils
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -20,8 +20,8 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class SelectMemberViewModel @Inject constructor(
-    override val userRepository: IUserRepository,
-    val jobTicketRepository: IJobTicketRepository
+    override val userRepository: IUserLogic,
+    val jobTicketRepository: IJobTicketLogic
 ) :
     BaseViewModel(userRepository) {
     var workstationId: Long = 0

app/src/main/java/com/grkj/iscs/features/main/viewmodel/common/SelectPointViewModel.kt

@@ -4,9 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.model.vo.JobPointVo
 import com.grkj.data.model.vo.JobTicketGroupDataVo
-import com.grkj.data.model.vo.JobTicketGroupInfoVo
-import com.grkj.data.model.vo.JobUserVo
-import com.grkj.data.repository.IIsolationPointRepository
+import com.grkj.data.logic.IIsolationPointLogic
 import com.grkj.ui_base.base.BaseViewModel
 import com.sik.sikcore.data.BeanUtils
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -17,7 +15,7 @@ import javax.inject.Inject
  * 选择点位
  */
 @HiltViewModel
-class SelectPointViewModel @Inject constructor(val pointRepository: IIsolationPointRepository) :
+class SelectPointViewModel @Inject constructor(val pointRepository: IIsolationPointLogic) :
     BaseViewModel() {
     var pointManageData: MutableList<JobPointVo> = mutableListOf()
     var workstationId: Long = 0

app/src/main/java/com/grkj/iscs/features/main/viewmodel/common/WorkflowSettingViewModel.kt

@@ -6,9 +6,9 @@ import com.grkj.data.enums.WorkflowStepConfirmTypeEnum
 import com.grkj.data.model.dos.SysRole
 import com.grkj.data.model.dos.WorkflowStep
 import com.grkj.data.model.vo.SysUserVo
-import com.grkj.data.repository.IRoleRepository
-import com.grkj.data.repository.IUserRepository
-import com.grkj.data.repository.IWorkflowRepository
+import com.grkj.data.logic.IRoleLogic
+import com.grkj.data.logic.IUserLogic
+import com.grkj.data.logic.IWorkflowLogic
 import com.grkj.iscs.R
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils
@@ -22,9 +22,9 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class WorkflowSettingViewModel @Inject constructor(
-    val workflowRepository: IWorkflowRepository,
-    override val userRepository: IUserRepository,
-    val roleRepository: IRoleRepository
+    val workflowRepository: IWorkflowLogic,
+    override val userRepository: IUserLogic,
+    val roleRepository: IRoleLogic
 ) : BaseViewModel(userRepository) {
     var modeId: Long = 0
     var workflowSteps: List<WorkflowStep> = mutableListOf()

app/src/main/java/com/grkj/iscs/features/main/viewmodel/data_manage/PointManageViewModel.kt

@@ -3,16 +3,15 @@ package com.grkj.iscs.features.main.viewmodel.data_manage
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.model.dos.IsRfidToken
-import com.grkj.data.model.dos.IsWorkstation
 import com.grkj.data.model.vo.AddPointManageVo
 import com.grkj.data.model.vo.PointManageFilterVo
 import com.grkj.data.model.vo.PointManageVo
 import com.grkj.data.model.vo.UpdatePointManageVo
 import com.grkj.data.model.vo.WorkstationManageVo
-import com.grkj.data.repository.IIsolationPointRepository
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.data.repository.IRfidTokenRepository
-import com.grkj.data.repository.IWorkstationRepository
+import com.grkj.data.logic.IIsolationPointLogic
+import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.logic.IRfidTokenLogic
+import com.grkj.data.logic.IWorkstationLogic
 import com.grkj.iscs.R
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils
@@ -25,10 +24,10 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class PointManageViewModel @Inject constructor(
-    val isolationPointRepository: IIsolationPointRepository,
-    val rfidTokenRepository: IRfidTokenRepository,
-    val workstationRepository: IWorkstationRepository,
-    val jobTicketRepository: IJobTicketRepository
+    val isolationPointRepository: IIsolationPointLogic,
+    val rfidTokenRepository: IRfidTokenLogic,
+    val workstationRepository: IWorkstationLogic,
+    val jobTicketRepository: IJobTicketLogic
 ) : BaseViewModel() {
     private var current: Int = 0
     private var size: Int = 50

app/src/main/java/com/grkj/iscs/features/main/viewmodel/data_manage/RoleManageViewModel.kt

@@ -6,11 +6,9 @@ import com.grkj.data.model.vo.AddRoleDo
 import com.grkj.data.model.vo.RoleManageFilterVo
 import com.grkj.data.model.vo.RoleManageVo
 import com.grkj.data.model.vo.UpdateRoleDo
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.data.repository.IRoleRepository
-import com.grkj.data.repository.ISysMenuRepository
-import com.grkj.data.repository.impl.standard.JobTicketRepository
-import com.grkj.data.repository.impl.standard.SysMenuRepository
+import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.logic.IRoleLogic
+import com.grkj.data.logic.ISysMenuLogic
 import com.grkj.iscs.features.main.entity.AddRoleDataEntity
 import com.grkj.iscs.features.main.entity.RoleManageFunctionalPermissionsEntity
 import com.grkj.iscs.features.main.entity.UpdateRoleDataEntity
@@ -25,9 +23,9 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class RoleManageViewModel @Inject constructor(
-    val roleRepository: IRoleRepository,
-    val sysMenuRepository: ISysMenuRepository,
-    val jobTicketRepository: IJobTicketRepository
+    val roleRepository: IRoleLogic,
+    val sysMenuRepository: ISysMenuLogic,
+    val jobTicketRepository: IJobTicketLogic
 ) :
     BaseViewModel() {
     private var current: Int = 0

app/src/main/java/com/grkj/iscs/features/main/viewmodel/data_manage/UserManageViewModel.kt

@@ -8,11 +8,11 @@ import com.grkj.data.model.vo.UpdateUserDataVo
 import com.grkj.data.model.vo.UserManageFilterVo
 import com.grkj.data.model.vo.UserManageVo
 import com.grkj.data.model.vo.WorkstationManageVo
-import com.grkj.data.repository.IHardwareRepository
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.data.repository.IRoleRepository
-import com.grkj.data.repository.IUserRepository
-import com.grkj.data.repository.IWorkstationRepository
+import com.grkj.data.logic.IHardwareLogic
+import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.logic.IRoleLogic
+import com.grkj.data.logic.IUserLogic
+import com.grkj.data.logic.IWorkstationLogic
 import com.grkj.iscs.R
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils
@@ -25,11 +25,11 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class UserManageViewModel @Inject constructor(
-    override val userRepository: IUserRepository,
-    val roleRepository: IRoleRepository,
-    val workstationRepository: IWorkstationRepository,
-    val hardwareRepository: IHardwareRepository,
-    val jobTicketRepository: IJobTicketRepository
+    override val userRepository: IUserLogic,
+    val roleRepository: IRoleLogic,
+    val workstationRepository: IWorkstationLogic,
+    val hardwareRepository: IHardwareLogic,
+    val jobTicketRepository: IJobTicketLogic
 ) : BaseViewModel(userRepository) {
     private var current: Int = 0
     private var size: Int = 50

app/src/main/java/com/grkj/iscs/features/main/viewmodel/data_manage/WorkstationManageViewModel.kt

@@ -3,7 +3,7 @@ package com.grkj.iscs.features.main.viewmodel.data_manage
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.model.vo.WorkstationManageVo
-import com.grkj.data.repository.IWorkstationRepository
+import com.grkj.data.logic.IWorkstationLogic
 import com.grkj.ui_base.R
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils
@@ -15,7 +15,7 @@ import kotlinx.coroutines.Dispatchers
  * 岗位数据
  */
 @HiltViewModel
-class WorkstationManageViewModel @Inject constructor(val workstationRepository: IWorkstationRepository) :
+class WorkstationManageViewModel @Inject constructor(val workstationRepository: IWorkstationLogic) :
     BaseViewModel(null) {
     var workstationManageData: MutableList<WorkstationManageVo> = mutableListOf()
 

app/src/main/java/com/grkj/iscs/features/main/viewmodel/exception_manage/ExceptionJobViewModel.kt

@@ -7,8 +7,6 @@ import com.grkj.data.enums.JobTicketStatusEnum
 import com.grkj.data.enums.NextJobPrompt
 import com.grkj.data.enums.RoleEnum
 import com.grkj.data.model.dos.IsJobTicketStep
-import com.grkj.data.model.dos.WorkflowMode
-import com.grkj.data.model.dos.WorkflowStep
 import com.grkj.data.model.res.CommonDictRes
 import com.grkj.data.model.vo.IsExceptionStandardVo
 import com.grkj.data.model.vo.IsJobTicketDataVo
@@ -20,10 +18,9 @@ import com.grkj.data.model.vo.IsJobTicketUserDataVo
 import com.grkj.data.model.vo.JobTicketGroupDataVo
 import com.grkj.data.model.vo.JobTicketGroupInfoVo
 import com.grkj.data.model.vo.JobUserVo
-import com.grkj.data.repository.IExceptionRepository
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.data.repository.IUserRepository
-import com.grkj.data.repository.IWorkflowRepository
+import com.grkj.data.logic.IExceptionLogic
+import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.logic.IUserLogic
 import com.grkj.iscs.R
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.business.DataBusiness
@@ -39,9 +36,9 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class ExceptionJobViewModel @Inject constructor(
-    val exceptionRepository: IExceptionRepository,
-    val jobTicketRepository: IJobTicketRepository,
-    override val userRepository: IUserRepository
+    val exceptionRepository: IExceptionLogic,
+    val jobTicketRepository: IJobTicketLogic,
+    override val userRepository: IUserLogic
 ) : BaseViewModel(userRepository) {
     var ticketId: Long = 0
     var exceptionId: Long = 0

app/src/main/java/com/grkj/iscs/features/main/viewmodel/exception_manage/ExceptionViewModel.kt

@@ -7,16 +7,15 @@ import com.grkj.data.model.dos.IsExceptionSourceStandard
 import com.grkj.data.model.dos.IsExceptionStandard
 import com.grkj.data.model.res.CommonDictRes
 import com.grkj.data.model.vo.IsExceptionStandardVo
-import com.grkj.data.repository.IExceptionRepository
-import com.grkj.data.repository.IHardwareRepository
-import com.grkj.data.repository.IJobTicketRepository
+import com.grkj.data.logic.IExceptionLogic
+import com.grkj.data.logic.IHardwareLogic
+import com.grkj.data.logic.IJobTicketLogic
 import com.grkj.iscs.R
 import com.grkj.iscs.features.main.entity.ExceptionSourceDataEntity
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.business.DataBusiness
 import com.grkj.ui_base.business.ModbusBusinessManager
 import com.grkj.ui_base.utils.CommonUtils
-import com.sik.sikcore.data.BeanUtils
 import com.sik.sikcore.extension.toJson
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -27,9 +26,9 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class ExceptionViewModel @Inject constructor(
-    val exceptionRepository: IExceptionRepository,
-    val hardwareRepository: IHardwareRepository,
-    val jobTicketRepository: IJobTicketRepository
+    val exceptionRepository: IExceptionLogic,
+    val hardwareRepository: IHardwareLogic,
+    val jobTicketRepository: IJobTicketLogic
 ) : BaseViewModel() {
     /**
      * 钥匙状态

app/src/main/java/com/grkj/iscs/features/main/viewmodel/hardware_manage/CardManageViewModel.kt

@@ -7,8 +7,8 @@ import com.grkj.data.model.dos.IsJobCard
 import com.grkj.data.model.vo.AddCardDataVo
 import com.grkj.data.model.vo.CardManageFilterVo
 import com.grkj.data.model.vo.UpdateCardDataVo
-import com.grkj.data.repository.IHardwareRepository
-import com.grkj.data.repository.IUserRepository
+import com.grkj.data.logic.IHardwareLogic
+import com.grkj.data.logic.IUserLogic
 import com.grkj.iscs.R
 import com.grkj.iscs.features.main.dialog.TextDropDownDialog
 import com.grkj.ui_base.base.BaseViewModel
@@ -23,8 +23,8 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class CardManageViewModel @Inject constructor(
-    private val hardwareRepository: IHardwareRepository,
-    override val userRepository: IUserRepository
+    private val hardwareRepository: IHardwareLogic,
+    override val userRepository: IUserLogic
 ) : BaseViewModel(userRepository) {
     private var current: Int = 0
     private val size: Int = 50

app/src/main/java/com/grkj/iscs/features/main/viewmodel/hardware_manage/KeyManageViewModel.kt

@@ -7,10 +7,8 @@ import com.grkj.data.model.dos.IsKey
 import com.grkj.data.model.vo.AddKeyDataVo
 import com.grkj.data.model.vo.KeyManageFilterVo
 import com.grkj.data.model.vo.UpdateKeyDataVo
-import com.grkj.data.model.vo.UpdateUserDataVo
-import com.grkj.data.repository.IHardwareRepository
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.data.repository.impl.standard.JobTicketRepository
+import com.grkj.data.logic.IHardwareLogic
+import com.grkj.data.logic.IJobTicketLogic
 import com.grkj.iscs.R
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils
@@ -24,8 +22,8 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class KeyManageViewModel @Inject constructor(
-    val hardwareRepository: IHardwareRepository,
-    val jobTicketRepository: IJobTicketRepository
+    val hardwareRepository: IHardwareLogic,
+    val jobTicketRepository: IJobTicketLogic
 ) : BaseViewModel() {
     private var current: Int = 0
     private var size: Int = 50

app/src/main/java/com/grkj/iscs/features/main/viewmodel/hardware_manage/LockManageViewModel.kt

@@ -7,8 +7,8 @@ import com.grkj.data.model.dos.IsLock
 import com.grkj.data.model.vo.AddLockDataVo
 import com.grkj.data.model.vo.LockManageFilterVo
 import com.grkj.data.model.vo.UpdateLockDataVo
-import com.grkj.data.repository.IHardwareRepository
-import com.grkj.data.repository.IJobTicketRepository
+import com.grkj.data.logic.IHardwareLogic
+import com.grkj.data.logic.IJobTicketLogic
 import com.grkj.iscs.R
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils
@@ -22,8 +22,8 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class LockManageViewModel @Inject constructor(
-    private val hardwareRepository: IHardwareRepository,
-    val jobTicketRepository: IJobTicketRepository
+    private val hardwareRepository: IHardwareLogic,
+    val jobTicketRepository: IJobTicketLogic
 ) : BaseViewModel() {
     private var current: Int = 0
     private val size: Int = 50

app/src/main/java/com/grkj/iscs/features/main/viewmodel/hardware_manage/RfidTokenManageViewModel.kt

@@ -7,8 +7,8 @@ import com.grkj.data.model.dos.IsRfidToken
 import com.grkj.data.model.vo.AddRfidTokenDataVo
 import com.grkj.data.model.vo.RfidTokenManageFilterVo
 import com.grkj.data.model.vo.UpdateRfidTokenDataVo
-import com.grkj.data.repository.IHardwareRepository
-import com.grkj.data.repository.IJobTicketRepository
+import com.grkj.data.logic.IHardwareLogic
+import com.grkj.data.logic.IJobTicketLogic
 import com.grkj.iscs.R
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.utils.CommonUtils
@@ -22,8 +22,8 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class RfidTokenManageViewModel @Inject constructor(
-    private val hardwareRepository: IHardwareRepository,
-    val jobTicketRepository: IJobTicketRepository
+    private val hardwareRepository: IHardwareLogic,
+    val jobTicketRepository: IJobTicketLogic
 ) : BaseViewModel() {
     private var current: Int = 0
     private val size: Int = 50

app/src/main/java/com/grkj/iscs/features/main/viewmodel/hardware_manage/SlotsManageViewModel.kt

@@ -1,12 +1,11 @@
 package com.grkj.iscs.features.main.viewmodel.hardware_manage
 
-import androidx.core.view.isVisible
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.model.dos.IsKey
 import com.grkj.data.model.dos.IsLock
 import com.grkj.data.model.dos.IsLockCabinetSlots
-import com.grkj.data.repository.IHardwareRepository
+import com.grkj.data.logic.IHardwareLogic
 import com.grkj.iscs.features.init.model.DockData
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.business.ModbusBusinessManager
@@ -15,12 +14,9 @@ import com.grkj.ui_base.utils.modbus.DeviceConst
 import com.grkj.ui_base.utils.modbus.DockBean
 import com.grkj.ui_base.utils.modbus.ModBusController
 import com.sik.sikcore.extension.toJson
-import com.sik.sikcore.thread.ThreadUtils
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import kotlin.coroutines.resume
 
@@ -29,7 +25,7 @@ import kotlin.coroutines.resume
  */
 @HiltViewModel
 class SlotsManageViewModel @Inject constructor(
-    val hardwareRepository: IHardwareRepository
+    val hardwareRepository: IHardwareLogic
 ) : BaseViewModel() {
     /**
      * 异常仓位

app/src/main/java/com/grkj/iscs/features/main/viewmodel/home/HomeViewModel.kt

@@ -3,40 +3,32 @@ package com.grkj.iscs.features.main.viewmodel.home
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.data.MainDomainData
-import com.grkj.data.enums.JobTicketStatusEnum
-import com.grkj.data.enums.OperationTypeEnum
-import com.grkj.data.enums.TodoStatusEnum
-import com.grkj.data.model.dos.IsWorkstation
 import com.grkj.data.model.dos.WorkflowMode
-import com.grkj.data.model.local.TodoStepJoin
 import com.grkj.data.model.local.isMyTodo
 import com.grkj.data.model.vo.TodoItemVo
 import com.grkj.data.model.vo.WorkstationManageVo
-import com.grkj.data.repository.IHardwareRepository
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.data.repository.IUserRepository
-import com.grkj.data.repository.IWorkflowRepository
-import com.grkj.data.repository.IWorkstationRepository
-import com.grkj.iscs.features.main.entity.actionKey
-import com.grkj.iscs.features.main.entity.findPredecessors
+import com.grkj.data.logic.IHardwareLogic
+import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.logic.IUserLogic
+import com.grkj.data.logic.IWorkflowLogic
+import com.grkj.data.logic.IWorkstationLogic
 import com.grkj.iscs.features.main.entity.splitTodoSteps
 import com.grkj.iscs.features.main.entity.toTodoVo
 import com.grkj.ui_base.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
-import kotlin.collections.contains
 
 /**
  * 主界面界面模型
  */
 @HiltViewModel
 class HomeViewModel @Inject constructor(
-    val workstationRepository: IWorkstationRepository,
-    val jobTicketRepository: IJobTicketRepository,
-    val hardwareRepository: IHardwareRepository,
-    val workflowRepository: IWorkflowRepository,
-    override val userRepository: IUserRepository
+    val workstationRepository: IWorkstationLogic,
+    val jobTicketRepository: IJobTicketLogic,
+    val hardwareRepository: IHardwareLogic,
+    val workflowRepository: IWorkflowLogic,
+    override val userRepository: IUserLogic
 ) :
     BaseViewModel(userRepository) {
     var workstationData: List<WorkstationManageVo> = listOf()

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/JobExecuteViewModel.kt

@@ -8,7 +8,6 @@ import com.grkj.data.enums.JobTicketStatusEnum
 import com.grkj.data.enums.RoleEnum
 import com.grkj.data.model.dos.IsJobTicketStep
 import com.grkj.data.model.dos.WorkflowMode
-import com.grkj.data.model.dos.WorkflowStep
 import com.grkj.data.model.local.DeviceTakeUpdate
 import com.grkj.data.model.vo.IsJobTicketDataVo
 import com.grkj.data.model.vo.IsJobTicketKeyDataVo
@@ -20,9 +19,9 @@ import com.grkj.data.model.vo.JobTicketGroupDataVo
 import com.grkj.data.model.vo.JobTicketGroupInfoVo
 import com.grkj.data.model.vo.JobUserVo
 import com.grkj.data.model.vo.SysBiometricDataVo
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.data.repository.IWorkflowRepository
-import com.grkj.data.repository.impl.standard.UserRepository
+import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.logic.IWorkflowLogic
+import com.grkj.data.logic.impl.standard.UserLogic
 import com.grkj.iscs.R
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.business.BleBusinessManager
@@ -48,9 +47,9 @@ import java.util.concurrent.atomic.AtomicInteger
  */
 @HiltViewModel
 class JobExecuteViewModel @Inject constructor(
-    val jobTicketRepository: IJobTicketRepository,
-    val workflowRepository: IWorkflowRepository,
-    userRepository: UserRepository
+    val jobTicketRepository: IJobTicketLogic,
+    val workflowRepository: IWorkflowLogic,
+    userRepository: UserLogic
 ) : BaseViewModel(userRepository) {
     var ticketId: Long = 0
     var ticketData: IsJobTicketDataVo? = null

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/JobManageHomeViewModel.kt

@@ -3,26 +3,19 @@ package com.grkj.iscs.features.main.viewmodel.job_manage
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.data.MainDomainData
-import com.grkj.data.enums.JobTicketStatusEnum
-import com.grkj.data.enums.OperationTypeEnum
-import com.grkj.data.enums.TodoStatusEnum
-import com.grkj.data.model.local.TodoStepJoin
 import com.grkj.data.model.local.isMyTodo
 import com.grkj.data.model.vo.TodoItemVo
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.iscs.features.main.entity.actionKey
-import com.grkj.iscs.features.main.entity.findPredecessors
+import com.grkj.data.logic.IJobTicketLogic
 import com.grkj.iscs.features.main.entity.splitTodoSteps
 import com.grkj.iscs.features.main.entity.toTodoVo
 import com.grkj.ui_base.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
-import kotlin.collections.contains
 
 @HiltViewModel
 class JobManageHomeViewModel @Inject constructor(
-    val jobTicketRepository: IJobTicketRepository
+    val jobTicketRepository: IJobTicketLogic
 ) : BaseViewModel() {
     var todoItemVos: MutableList<TodoItemVo> = mutableListOf()
 

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/JobManageViewModel.kt

@@ -5,8 +5,8 @@ import androidx.lifecycle.liveData
 import com.grkj.data.data.DictConstants
 import com.grkj.data.model.res.CommonDictRes
 import com.grkj.data.model.vo.JobTicketManageVo
-import com.grkj.data.repository.IExceptionRepository
-import com.grkj.data.repository.IJobTicketRepository
+import com.grkj.data.logic.IExceptionLogic
+import com.grkj.data.logic.IJobTicketLogic
 import com.grkj.ui_base.base.BaseViewModel
 import com.grkj.ui_base.business.DataBusiness
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -18,8 +18,8 @@ import kotlinx.coroutines.Dispatchers
  */
 @HiltViewModel
 class JobManageViewModel @Inject constructor(
-    val jobTicketRepository: IJobTicketRepository,
-    val exceptionRepository: IExceptionRepository
+    val jobTicketRepository: IJobTicketLogic,
+    val exceptionRepository: IExceptionLogic
 ) : BaseViewModel() {
     var jobTicketStatus: List<CommonDictRes> = mutableListOf()
     var jobManageDataList: MutableList<JobTicketManageVo> = mutableListOf()

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/JobViewModel.kt

@@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.enums.RoleEnum
 import com.grkj.data.model.dos.IsSopGroup
-import com.grkj.data.model.dos.IsWorkstation
 import com.grkj.data.model.dos.WorkflowMode
 import com.grkj.data.model.dos.WorkflowStep
 import com.grkj.data.model.vo.JobPointVo
@@ -13,11 +12,11 @@ import com.grkj.data.model.vo.JobTicketManageVo
 import com.grkj.data.model.vo.JobUserVo
 import com.grkj.data.model.vo.SysBiometricDataVo
 import com.grkj.data.model.vo.WorkstationManageVo
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.data.repository.ISopRepository
-import com.grkj.data.repository.IWorkflowRepository
-import com.grkj.data.repository.IWorkstationRepository
-import com.grkj.data.repository.impl.standard.UserRepository
+import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.logic.ISopLogic
+import com.grkj.data.logic.IWorkflowLogic
+import com.grkj.data.logic.IWorkstationLogic
+import com.grkj.data.logic.impl.standard.UserLogic
 import com.grkj.ui_base.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -28,11 +27,11 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class JobViewModel @Inject constructor(
-    val workstationRepository: IWorkstationRepository,
-    val sopRepository: ISopRepository,
-    val jobTicketRepository: IJobTicketRepository,
-    val workflowRepository: IWorkflowRepository,
-    override val userRepository: UserRepository
+    val workstationRepository: IWorkstationLogic,
+    val sopRepository: ISopLogic,
+    val jobTicketRepository: IJobTicketLogic,
+    val workflowRepository: IWorkflowLogic,
+    override val userRepository: UserLogic
 ) : BaseViewModel(userRepository) {
     var workstationData: List<WorkstationManageVo> = listOf()
     var jobTicketData: JobTicketManageVo? = null

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/LockedPointsViewModel.kt

@@ -3,7 +3,7 @@ package com.grkj.iscs.features.main.viewmodel.job_manage
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.model.vo.LockedPointVo
-import com.grkj.data.repository.IJobTicketRepository
+import com.grkj.data.logic.IJobTicketLogic
 import com.grkj.ui_base.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -13,7 +13,7 @@ import javax.inject.Inject
  * 锁定中的点位
  */
 @HiltViewModel
-class LockedPointsViewModel @Inject constructor(val jobTicketRepository: IJobTicketRepository) :
+class LockedPointsViewModel @Inject constructor(val jobTicketRepository: IJobTicketLogic) :
     BaseViewModel() {
     private var current: Int = 0
     private var size: Int = 50

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/MyTodoViewModel.kt

@@ -7,14 +7,12 @@ import com.grkj.data.data.MainDomainData
 import com.grkj.data.enums.JobTicketStatusEnum
 import com.grkj.data.enums.OperationTypeEnum
 import com.grkj.data.enums.TodoStatusEnum
-import com.grkj.data.model.local.TodoStepJoin
 import com.grkj.data.model.local.isMyTodo
 import com.grkj.data.model.res.CommonDictRes
 import com.grkj.data.model.vo.IsJobTicketPointsDataVo
 import com.grkj.data.model.vo.TodoItemVo
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.data.repository.IUserRepository
-import com.grkj.data.repository.impl.standard.UserRepository
+import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.logic.IUserLogic
 import com.grkj.iscs.R
 import com.grkj.iscs.features.main.entity.actionKey
 import com.grkj.iscs.features.main.entity.findPredecessors
@@ -32,8 +30,8 @@ import kotlin.collections.contains
  */
 @HiltViewModel
 class MyTodoViewModel @Inject constructor(
-    val jobTicketRepository: IJobTicketRepository,
-    override val userRepository: IUserRepository
+    val jobTicketRepository: IJobTicketLogic,
+    override val userRepository: IUserLogic
 ) : BaseViewModel(userRepository) {
     /**
      * 开始读卡

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/SopJobViewModel.kt

@@ -3,7 +3,6 @@ package com.grkj.iscs.features.main.viewmodel.job_manage
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.enums.RoleEnum
-import com.grkj.data.model.dos.IsWorkstation
 import com.grkj.data.model.dos.WorkflowMode
 import com.grkj.data.model.dos.WorkflowStep
 import com.grkj.data.model.vo.JobPointVo
@@ -14,11 +13,11 @@ import com.grkj.data.model.vo.JobUserVo
 import com.grkj.data.model.vo.SopManageVo
 import com.grkj.data.model.vo.SysBiometricDataVo
 import com.grkj.data.model.vo.WorkstationManageVo
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.data.repository.ISopRepository
-import com.grkj.data.repository.IUserRepository
-import com.grkj.data.repository.IWorkflowRepository
-import com.grkj.data.repository.IWorkstationRepository
+import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.logic.ISopLogic
+import com.grkj.data.logic.IUserLogic
+import com.grkj.data.logic.IWorkflowLogic
+import com.grkj.data.logic.IWorkstationLogic
 import com.grkj.ui_base.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -30,11 +29,11 @@ import kotlin.collections.groupBy
  */
 @HiltViewModel
 class SopJobViewModel @Inject constructor(
-    val workstationRepository: IWorkstationRepository,
-    val sopRepository: ISopRepository,
-    val jobTicketRepository: IJobTicketRepository,
-    val workflowRepository: IWorkflowRepository,
-    override val userRepository: IUserRepository
+    val workstationRepository: IWorkstationLogic,
+    val sopRepository: ISopLogic,
+    val jobTicketRepository: IJobTicketLogic,
+    val workflowRepository: IWorkflowLogic,
+    override val userRepository: IUserLogic
 ) : BaseViewModel(userRepository) {
     var workstationData: List<WorkstationManageVo> = listOf()
     var sopData: List<SopManageVo> = listOf()

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/SopManageViewModel.kt

@@ -4,8 +4,8 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.enums.JobTicketStatusEnum
 import com.grkj.data.model.vo.SopManageVo
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.data.repository.ISopRepository
+import com.grkj.data.logic.IJobTicketLogic
+import com.grkj.data.logic.ISopLogic
 import com.grkj.ui_base.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -16,8 +16,8 @@ import kotlinx.coroutines.Dispatchers
  */
 @HiltViewModel
 class SopManageViewModel @Inject constructor(
-    val sopRepository: ISopRepository,
-    val jobTicketRepository: IJobTicketRepository
+    val sopRepository: ISopLogic,
+    val jobTicketRepository: IJobTicketLogic
 ) : BaseViewModel() {
     var sopManageDataList: MutableList<SopManageVo> = mutableListOf()
     private var current: Int = 0

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/SopViewModel.kt

@@ -3,7 +3,6 @@ package com.grkj.iscs.features.main.viewmodel.job_manage
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
 import com.grkj.data.model.dos.IsSopGroup
-import com.grkj.data.model.dos.IsWorkstation
 import com.grkj.data.model.dos.WorkflowMode
 import com.grkj.data.model.dos.WorkflowStep
 import com.grkj.data.model.vo.JobPointVo
@@ -12,10 +11,10 @@ import com.grkj.data.model.vo.JobUserVo
 import com.grkj.data.model.vo.SopManageVo
 import com.grkj.data.model.vo.SysBiometricDataVo
 import com.grkj.data.model.vo.WorkstationManageVo
-import com.grkj.data.repository.ISopRepository
-import com.grkj.data.repository.IWorkflowRepository
-import com.grkj.data.repository.IWorkstationRepository
-import com.grkj.data.repository.impl.standard.UserRepository
+import com.grkj.data.logic.ISopLogic
+import com.grkj.data.logic.IWorkflowLogic
+import com.grkj.data.logic.IWorkstationLogic
+import com.grkj.data.logic.impl.standard.UserLogic
 import com.grkj.ui_base.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -26,10 +25,10 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class SopViewModel @Inject constructor(
-    val workstationRepository: IWorkstationRepository,
-    val sopRepository: ISopRepository,
-    val workflowRepository: IWorkflowRepository,
-    override val userRepository: UserRepository
+    val workstationRepository: IWorkstationLogic,
+    val sopRepository: ISopLogic,
+    val workflowRepository: IWorkflowLogic,
+    override val userRepository: UserLogic
 ) : BaseViewModel(userRepository) {
     var workstationData: List<WorkstationManageVo> = listOf()
     var selectedSopData: SopManageVo? = null

app/src/main/java/com/grkj/iscs/features/main/viewmodel/user_info/UserInfoViewModel.kt

@@ -7,8 +7,8 @@ import com.grkj.data.model.dos.IsJobCard
 import com.grkj.data.model.dos.SysUserCharacteristicDo
 import com.grkj.data.model.vo.FingerprintDataVo
 import com.grkj.data.model.vo.SysBiometricDataVo
-import com.grkj.data.repository.IHardwareRepository
-import com.grkj.data.repository.IUserRepository
+import com.grkj.data.logic.IHardwareLogic
+import com.grkj.data.logic.IUserLogic
 import com.grkj.shared.utils.ArcSoftUtil
 import com.grkj.shared.utils.BCryptUtils
 import com.grkj.ui_base.base.BaseViewModel
@@ -18,8 +18,8 @@ import javax.inject.Inject
 
 @HiltViewModel
 class UserInfoViewModel @Inject constructor(
-    override val userRepository: IUserRepository,
-    val hardwareRepository: IHardwareRepository
+    override val userRepository: IUserLogic,
+    val hardwareRepository: IHardwareLogic
 ) : BaseViewModel(userRepository) {
     /**
      * 生物数据

app/src/main/java/com/grkj/iscs/features/splash/viewmodel/SplashViewModel.kt

@@ -2,7 +2,7 @@ package com.grkj.iscs.features.splash.viewmodel
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
-import com.grkj.data.repository.ISysMenuRepository
+import com.grkj.data.logic.ISysMenuLogic
 import com.grkj.ui_base.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -10,7 +10,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class SplashViewModel @Inject constructor(
-    val sysMenuRepository: ISysMenuRepository
+    val sysMenuRepository: ISysMenuLogic
 ) : BaseViewModel() {
 
 

data/src/main/java/com/grkj/data/converters/Converters.kt

@@ -3,18 +3,30 @@ package com.grkj.data.converters
 import androidx.room.TypeConverter
 
 class Converters {
+    /**
+     * Long转String
+     */
     @TypeConverter
     fun fromIdString(value: String?): List<Long> =
         value?.split(",")?.mapNotNull { it.toLongOrNull() } ?: emptyList()
 
+    /**
+     * Long列表转String
+     */
     @TypeConverter
     fun idListToString(list: List<Long>?): String =
         list?.joinToString(",") ?: ""
 
+    /**
+     * string转String列表
+     */
     @TypeConverter
     fun fromNameString(value: String?): List<String> =
         value?.split(",") ?: emptyList()
 
+    /**
+     * String列表转String
+     */
     @TypeConverter
     fun nameListToString(list: List<String>?): String =
         list?.joinToString(",") ?: ""

data/src/main/java/com/grkj/data/dao/ExceptionDao.kt

@@ -4,11 +4,9 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Transaction
 import androidx.room.Update
 import com.grkj.data.model.dos.IsExceptionSourceStandard
 import com.grkj.data.model.dos.IsExceptionStandard
-import com.grkj.data.model.vo.IsExceptionStandardVo
 
 /**
  * 异常数据库
@@ -24,16 +22,14 @@ interface ExceptionDao {
     /**
      * 获取异常数据
      */
-    @Transaction
     @Query("select * from is_exception_standard order by exception_status asc")
-    fun getExceptionData(): List<IsExceptionStandardVo>
+    fun getExceptionData(): List<IsExceptionStandard>
 
     /**
      * 根据异常id获取异常数据
      */
-    @Transaction
     @Query("select * from is_exception_standard where exception_id = :exceptionId")
-    fun getExceptionDataById(exceptionId: Long): IsExceptionStandardVo?
+    fun getExceptionDataById(exceptionId: Long): IsExceptionStandard?
 
     /**
      * 添加异常数据
@@ -48,10 +44,10 @@ interface ExceptionDao {
     fun saveExceptionSourceData(exceptionSourceData: IsExceptionSourceStandard)
 
     /**
-     * 根据作业id获取异常id
+     * 根据数据源id获取异常id
      */
-    @Query("select exception_id from is_exception_source_standard where source_data_id = :ticketId")
-    fun getExceptionIdByTicketId(ticketId: Long): Long
+    @Query("select exception_id from is_exception_source_standard where source_data_id = :exceptionSourceDataId")
+    fun getExceptionIdBySourceDataId(exceptionSourceDataId: Long): Long
 
     /**
      * 根据异常数据源获取异常数据源数据
@@ -70,4 +66,10 @@ interface ExceptionDao {
      */
     @Query("delete from is_exception_source_standard where source_id in (:sourceIds)")
     fun deleteExceptionSourceDataById(sourceIds: List<Long>)
+
+    /**
+     * 根据异常id获取异常数据源
+     */
+    @Query("select * from is_exception_source_standard where exception_id = :exceptionId")
+    fun getExceptionSourceDataByExceptionId(exceptionId: Long): List<IsExceptionSourceStandard>
 }

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

@@ -1,17 +1,16 @@
 package com.grkj.data.di
 
-import com.grkj.data.database.ISCSDatabase
-import com.grkj.data.repository.IExceptionRepository
-import com.grkj.data.repository.IHardwareRepository
-import com.grkj.data.repository.IIsolationPointRepository
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.data.repository.IRfidTokenRepository
-import com.grkj.data.repository.IRoleRepository
-import com.grkj.data.repository.ISopRepository
-import com.grkj.data.repository.ISysMenuRepository
-import com.grkj.data.repository.IUserRepository
-import com.grkj.data.repository.IWorkflowRepository
-import com.grkj.data.repository.IWorkstationRepository
+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 dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
@@ -19,15 +18,15 @@ import dagger.hilt.components.SingletonComponent
 @EntryPoint
 @InstallIn(SingletonComponent::class)
 interface AppEntryPoint {
-    fun hardwareRepo(): IHardwareRepository
-    fun isolationPointRepo(): IIsolationPointRepository
-    fun jobTicketRepo(): IJobTicketRepository
-    fun rfidTokenRepo(): IRfidTokenRepository
-    fun roleRepo(): IRoleRepository
-    fun sopRepo(): ISopRepository
-    fun userRepo(): IUserRepository
-    fun workstationRepo(): IWorkstationRepository
-    fun sysMenuRepo(): ISysMenuRepository
-    fun workflowRepo(): IWorkflowRepository
-    fun exceptionRepo(): IExceptionRepository
+    fun hardwareRepo(): IHardwareLogic
+    fun isolationPointRepo(): IIsolationPointLogic
+    fun jobTicketRepo(): IJobTicketLogic
+    fun rfidTokenRepo(): IRfidTokenLogic
+    fun roleRepo(): IRoleLogic
+    fun sopRepo(): ISopLogic
+    fun userRepo(): IUserLogic
+    fun workstationRepo(): IWorkstationLogic
+    fun sysMenuRepo(): ISysMenuLogic
+    fun workflowRepo(): IWorkflowLogic
+    fun exceptionRepo(): IExceptionLogic
 }

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

@@ -1,34 +1,34 @@
 package com.grkj.data.di
 
 import android.app.Application
-import com.grkj.data.repository.IExceptionRepository
-import com.grkj.data.repository.IHardwareRepository
-import com.grkj.data.repository.IIsolationPointRepository
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.data.repository.IRfidTokenRepository
-import com.grkj.data.repository.IRoleRepository
-import com.grkj.data.repository.ISopRepository
-import com.grkj.data.repository.ISysMenuRepository
-import com.grkj.data.repository.IUserRepository
-import com.grkj.data.repository.IWorkflowRepository
-import com.grkj.data.repository.IWorkstationRepository
+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 dagger.hilt.android.EntryPointAccessors
 
 /**
- * 仓储层管理
+ * 业务层管理
  */
 object RepositoryManager {
-    lateinit var hardwareRepo: IHardwareRepository
-    lateinit var isolationPointRepo: IIsolationPointRepository
-    lateinit var jobTicketRepo: IJobTicketRepository
-    lateinit var rfidTokenRepo: IRfidTokenRepository
-    lateinit var roleRepo: IRoleRepository
-    lateinit var sopRepo: ISopRepository
-    lateinit var userRepo: IUserRepository
-    lateinit var workstationRepo: IWorkstationRepository
-    lateinit var sysMenuRepository: ISysMenuRepository
-    lateinit var workflowRepository: IWorkflowRepository
-    lateinit var exceptionRepository: IExceptionRepository
+    lateinit var hardwareRepo: IHardwareLogic
+    lateinit var isolationPointRepo: IIsolationPointLogic
+    lateinit var jobTicketRepo: IJobTicketLogic
+    lateinit var rfidTokenRepo: IRfidTokenLogic
+    lateinit var roleRepo: IRoleLogic
+    lateinit var sopRepo: ISopLogic
+    lateinit var userRepo: IUserLogic
+    lateinit var workstationRepo: IWorkstationLogic
+    lateinit var sysMenuRepository: ISysMenuLogic
+    lateinit var workflowRepository: IWorkflowLogic
+    lateinit var exceptionRepository: IExceptionLogic
 
     fun init(app: Application) {
         val ep = EntryPointAccessors.fromApplication(app, AppEntryPoint::class.java)

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

@@ -1,40 +1,39 @@
 package com.grkj.data.di
 
 import com.grkj.data.data.MMKVConstants
-import com.grkj.data.repository.IExceptionRepository
-import com.grkj.data.repository.IHardwareRepository
-import com.grkj.data.repository.IIsolationPointRepository
-import com.grkj.data.repository.IJobTicketRepository
-import com.grkj.data.repository.IRfidTokenRepository
-import com.grkj.data.repository.IRoleRepository
-import com.grkj.data.repository.ISopRepository
-import com.grkj.data.repository.ISysMenuRepository
-import com.grkj.data.repository.IUserRepository
-import com.grkj.data.repository.IWorkflowRepository
-import com.grkj.data.repository.IWorkstationRepository
-import com.grkj.data.repository.impl.*
-import com.grkj.data.repository.impl.network.NetworkExceptionRepository
-import com.grkj.data.repository.impl.network.NetworkHardwareRepository
-import com.grkj.data.repository.impl.network.NetworkIsolationPointRepository
-import com.grkj.data.repository.impl.network.NetworkJobTicketRepository
-import com.grkj.data.repository.impl.network.NetworkRfidTokenRepository
-import com.grkj.data.repository.impl.network.NetworkRoleRepository
-import com.grkj.data.repository.impl.network.NetworkSopRepository
-import com.grkj.data.repository.impl.network.NetworkSysMenuRepository
-import com.grkj.data.repository.impl.network.NetworkUserRepository
-import com.grkj.data.repository.impl.network.NetworkWorkflowRepository
-import com.grkj.data.repository.impl.network.NetworkWorkstationRepository
-import com.grkj.data.repository.impl.standard.ExceptionRepository
-import com.grkj.data.repository.impl.standard.HardwareRepository
-import com.grkj.data.repository.impl.standard.IsolationPointRepository
-import com.grkj.data.repository.impl.standard.JobTicketRepository
-import com.grkj.data.repository.impl.standard.RfidTokenRepository
-import com.grkj.data.repository.impl.standard.RoleRepository
-import com.grkj.data.repository.impl.standard.SopRepository
-import com.grkj.data.repository.impl.standard.SysMenuRepository
-import com.grkj.data.repository.impl.standard.UserRepository
-import com.grkj.data.repository.impl.standard.WorkflowRepository
-import com.grkj.data.repository.impl.standard.WorkstationRepository
+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
@@ -49,88 +48,88 @@ object RepositoryModule {
     @Provides
     @Singleton
     fun provideHardwareRepository(
-        standard: HardwareRepository,
-        network: NetworkHardwareRepository,
-    ): IHardwareRepository =
+        standard: HardwareLogic,
+        network: NetworkHardwareLogic,
+    ): IHardwareLogic =
         if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
 
     @Provides
     @Singleton
     fun provideIsolationPointRepository(
-        standard: IsolationPointRepository,
-        network: NetworkIsolationPointRepository,
-    ): IIsolationPointRepository =
+        standard: IsolationPointLogic,
+        network: NetworkIsolationPointLogic,
+    ): IIsolationPointLogic =
         if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
 
     @Provides
     @Singleton
     fun provideJobTicketRepository(
-        standard: JobTicketRepository,
-        network: NetworkJobTicketRepository,
-    ): IJobTicketRepository =
+        standard: JobTicketLogic,
+        network: NetworkJobTicketLogic,
+    ): IJobTicketLogic =
         if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
 
     @Provides
     @Singleton
     fun provideRfidTokenRepository(
-        standard: RfidTokenRepository,
-        network: NetworkRfidTokenRepository,
-    ): IRfidTokenRepository =
+        standard: RfidTokenLogic,
+        network: NetworkRfidTokenLogic,
+    ): IRfidTokenLogic =
         if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
 
     @Provides
     @Singleton
     fun provideRoleRepository(
-        standard: RoleRepository,
-        network: NetworkRoleRepository,
-    ): IRoleRepository =
+        standard: RoleLogic,
+        network: NetworkRoleLogic,
+    ): IRoleLogic =
         if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
 
     @Provides
     @Singleton
     fun provideSopRepository(
-        standard: SopRepository,
-        network: NetworkSopRepository,
-    ): ISopRepository =
+        standard: SopLogic,
+        network: NetworkSopLogic,
+    ): ISopLogic =
         if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
 
     @Provides
     @Singleton
     fun provideUserRepository(
-        standard: UserRepository,
-        network: NetworkUserRepository,
-    ): IUserRepository =
+        standard: UserLogic,
+        network: NetworkUserLogic,
+    ): IUserLogic =
         if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
 
     @Provides
     @Singleton
     fun provideWorkstationRepository(
-        standard: WorkstationRepository,
-        network: NetworkWorkstationRepository,
-    ): IWorkstationRepository =
+        standard: WorkstationLogic,
+        network: NetworkWorkstationLogic,
+    ): IWorkstationLogic =
         if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
 
     @Provides
     @Singleton
     fun provideSysMenuRepository(
-        standard: SysMenuRepository,
-        network: NetworkSysMenuRepository,
-    ): ISysMenuRepository =
+        standard: SysMenuLogic,
+        network: NetworkSysMenuLogic,
+    ): ISysMenuLogic =
         if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
 
     @Provides
     @Singleton
     fun provideWorkflowRepository(
-        standard: WorkflowRepository,
-        network: NetworkWorkflowRepository,
-    ): IWorkflowRepository =
+        standard: WorkflowLogic,
+        network: NetworkWorkflowLogic,
+    ): IWorkflowLogic =
         if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
 
     @Provides
     @Singleton
     fun provideExceptionRepository(
-        standard: ExceptionRepository,
-        network: NetworkExceptionRepository,
-    ): IExceptionRepository =
+        standard: ExceptionLogic,
+        network: NetworkExceptionLogic,
+    ): IExceptionLogic =
         if (MMKVConstants.SERVER_ADDRESS.getMMKVData("").isNotEmpty()) network else standard
 }

data/src/main/java/com/grkj/data/repository/BaseRepository.kt → data/src/main/java/com/grkj/data/logic/BaseLogic.kt

@@ -1,11 +1,11 @@
-package com.grkj.data.repository
+package com.grkj.data.logic
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
 /**
- * 基础仓储，主要还是通用的东西的初始化
+ * 基础业务层，主要还是通用的东西的初始化
  */
-abstract class BaseRepository {
+abstract class BaseLogic {
     protected val logger: Logger = LoggerFactory.getLogger(this::class.java)
 }

data/src/main/java/com/grkj/data/repository/IExceptionRepository.kt → data/src/main/java/com/grkj/data/logic/IExceptionLogic.kt

@@ -1,13 +1,13 @@
-package com.grkj.data.repository
+package com.grkj.data.logic
 
 import com.grkj.data.model.dos.IsExceptionSourceStandard
 import com.grkj.data.model.dos.IsExceptionStandard
 import com.grkj.data.model.vo.IsExceptionStandardVo
 
 /**
- * 异常仓储层
+ * 异常业务层
  */
-interface IExceptionRepository {
+interface IExceptionLogic {
     /**
      * 取消异常
      */

data/src/main/java/com/grkj/data/repository/IHardwareRepository.kt → data/src/main/java/com/grkj/data/logic/IHardwareLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository
+package com.grkj.data.logic
 
 import com.grkj.data.model.dos.IsJobCard
 import com.grkj.data.model.dos.IsKey
@@ -21,9 +21,9 @@ import com.grkj.data.model.vo.LockManageFilterVo
 import com.grkj.data.model.vo.RfidTokenManageFilterVo
 
 /**
- * 硬件相关仓储
+ * 硬件相关业务层
  */
-interface IHardwareRepository {
+interface IHardwareLogic {
     /**
      * 获取锁信息
      */

data/src/main/java/com/grkj/data/repository/IIsolationPointRepository.kt → data/src/main/java/com/grkj/data/logic/IIsolationPointLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository
+package com.grkj.data.logic
 
 import com.grkj.data.model.dos.IsIsolationPoint
 import com.grkj.data.model.vo.AddPointManageVo
@@ -7,9 +7,9 @@ import com.grkj.data.model.vo.PointManageVo
 import com.grkj.data.model.vo.UpdatePointManageVo
 
 /**
- * 隔离点仓储
+ * 隔离点业务层
  */
-interface IIsolationPointRepository {
+interface IIsolationPointLogic {
     /**
      * 根据隔离点id删除隔离点
      */

data/src/main/java/com/grkj/data/repository/IJobTicketRepository.kt → data/src/main/java/com/grkj/data/logic/IJobTicketLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository
+package com.grkj.data.logic
 
 import com.grkj.data.enums.NextJobPrompt
 import com.grkj.data.model.dos.IsJobTicket
@@ -20,9 +20,9 @@ import com.grkj.data.model.vo.JobUserVo
 import com.grkj.data.model.vo.LockedPointVo
 
 /**
- * 作业票仓储
+ * 作业票业务层
  */
-interface IJobTicketRepository {
+interface IJobTicketLogic {
     /**
      * 创建作业
      */

data/src/main/java/com/grkj/data/repository/IRfidTokenRepository.kt → data/src/main/java/com/grkj/data/logic/IRfidTokenLogic.kt

@@ -1,11 +1,11 @@
-package com.grkj.data.repository
+package com.grkj.data.logic
 
 import com.grkj.data.model.dos.IsRfidToken
 
 /**
- * RFID标签仓储
+ * RFID标签业务层
  */
-interface IRfidTokenRepository {
+interface IRfidTokenLogic {
     /**
      * 获取rfid数据
      */

data/src/main/java/com/grkj/data/repository/IRoleRepository.kt → data/src/main/java/com/grkj/data/logic/IRoleLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository
+package com.grkj.data.logic
 
 import com.grkj.data.model.dos.SysRole
 import com.grkj.data.model.vo.AddRoleDo
@@ -7,9 +7,9 @@ import com.grkj.data.model.vo.RoleManageVo
 import com.grkj.data.model.vo.UpdateRoleDo
 
 /**
- * 角色仓储
+ * 角色业务层
  */
-interface IRoleRepository {
+interface IRoleLogic {
     /**
      * 获取角色数据
      */

data/src/main/java/com/grkj/data/repository/ISopRepository.kt → data/src/main/java/com/grkj/data/logic/ISopLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository
+package com.grkj.data.logic
 
 import com.grkj.data.model.dos.IsSopGroup
 import com.grkj.data.model.dos.IsSopWorkflowStep
@@ -8,9 +8,9 @@ import com.grkj.data.model.vo.JobUserVo
 import com.grkj.data.model.vo.SopManageVo
 
 /**
- * sop仓储层
+ * sop业务层
  */
-interface ISopRepository {
+interface ISopLogic {
     /**
      * 保存sop
      */

data/src/main/java/com/grkj/data/repository/ISysMenuRepository.kt → data/src/main/java/com/grkj/data/logic/ISysMenuLogic.kt

@@ -1,11 +1,11 @@
-package com.grkj.data.repository
+package com.grkj.data.logic
 
 import com.grkj.data.model.dos.SysMenu
 
 /**
- * 菜单仓储
+ * 菜单业务层
  */
-interface ISysMenuRepository {
+interface ISysMenuLogic {
     /**
      * 检查系统菜单
      */

data/src/main/java/com/grkj/data/repository/IUserRepository.kt → data/src/main/java/com/grkj/data/logic/IUserLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository
+package com.grkj.data.logic
 
 import com.grkj.data.enums.LoginResultEnum
 import com.grkj.data.model.dos.SysUserCharacteristicDo
@@ -12,9 +12,9 @@ import com.grkj.data.model.vo.UserManageVo
 import com.grkj.data.model.vo.UserManageFilterVo
 
 /**
- * 用户仓储层
+ * 用户业务层
  */
-interface IUserRepository {
+interface IUserLogic {
     /**
      * 账号密码登录
      */

data/src/main/java/com/grkj/data/repository/IWorkflowRepository.kt → data/src/main/java/com/grkj/data/logic/IWorkflowLogic.kt

@@ -1,12 +1,12 @@
-package com.grkj.data.repository
+package com.grkj.data.logic
 
 import com.grkj.data.model.dos.WorkflowMode
 import com.grkj.data.model.dos.WorkflowStep
 
 /**
- * 工作流仓储
+ * 工作流业务层
  */
-interface IWorkflowRepository {
+interface IWorkflowLogic {
 
     fun insertStep(step: WorkflowStep): Long
 

data/src/main/java/com/grkj/data/repository/IWorkstationRepository.kt → data/src/main/java/com/grkj/data/logic/IWorkstationLogic.kt

@@ -1,12 +1,12 @@
-package com.grkj.data.repository
+package com.grkj.data.logic
 
 import com.grkj.data.model.dos.IsWorkstation
 import com.grkj.data.model.vo.WorkstationManageVo
 
 /**
- * 岗位仓储
+ * 岗位业务层
  */
-interface IWorkstationRepository {
+interface IWorkstationLogic {
 
     /**
      * 添加角色岗位关联

data/src/main/java/com/grkj/data/repository/impl/network/NetworkExceptionRepository.kt → data/src/main/java/com/grkj/data/logic/impl/network/NetworkExceptionLogic.kt

@@ -1,18 +1,18 @@
-package com.grkj.data.repository.impl.network
+package com.grkj.data.logic.impl.network
 
 import com.grkj.data.model.dos.IsExceptionSourceStandard
 import com.grkj.data.model.dos.IsExceptionStandard
 import com.grkj.data.model.vo.IsExceptionStandardVo
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IExceptionRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IExceptionLogic
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * 联网版异常管理仓储
+ * 联网版异常管理业务层
  */
 @Singleton
-class NetworkExceptionRepository @Inject constructor() : BaseRepository(), IExceptionRepository {
+class NetworkExceptionLogic @Inject constructor() : BaseLogic(), IExceptionLogic {
     override fun cancelException(exceptionData: List<IsExceptionStandardVo>) {
         TODO("Not yet implemented")
     }

data/src/main/java/com/grkj/data/repository/impl/network/NetworkHardwareRepository.kt → data/src/main/java/com/grkj/data/logic/impl/network/NetworkHardwareLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository.impl.network
+package com.grkj.data.logic.impl.network
 
 import com.grkj.data.model.dos.IsJobCard
 import com.grkj.data.model.dos.IsKey
@@ -19,16 +19,16 @@ import com.grkj.data.model.vo.CardManageFilterVo
 import com.grkj.data.model.vo.KeyManageFilterVo
 import com.grkj.data.model.vo.LockManageFilterVo
 import com.grkj.data.model.vo.RfidTokenManageFilterVo
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IHardwareRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IHardwareLogic
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * 联网版硬件仓储
+ * 联网版硬件业务层
  */
 @Singleton
-class NetworkHardwareRepository  @Inject constructor() : BaseRepository(), IHardwareRepository {
+class NetworkHardwareLogic  @Inject constructor() : BaseLogic(), IHardwareLogic {
     override fun getLockInfo(
         rfid: String,
         callback: (LockInfoRes?) -> Unit

data/src/main/java/com/grkj/data/repository/impl/network/NetworkIsolationPointRepository.kt → data/src/main/java/com/grkj/data/logic/impl/network/NetworkIsolationPointLogic.kt

@@ -1,20 +1,20 @@
-package com.grkj.data.repository.impl.network
+package com.grkj.data.logic.impl.network
 
 import com.grkj.data.model.dos.IsIsolationPoint
 import com.grkj.data.model.vo.AddPointManageVo
 import com.grkj.data.model.vo.PointManageFilterVo
 import com.grkj.data.model.vo.PointManageVo
 import com.grkj.data.model.vo.UpdatePointManageVo
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IIsolationPointRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IIsolationPointLogic
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * 联网版隔离点仓储
+ * 联网版隔离点业务层
  */
 @Singleton
-class NetworkIsolationPointRepository  @Inject constructor() : BaseRepository(), IIsolationPointRepository {
+class NetworkIsolationPointLogic  @Inject constructor() : BaseLogic(), IIsolationPointLogic {
     override fun deletePointByPointIds(pointIds: List<Long>) {
         TODO("Not yet implemented")
     }

data/src/main/java/com/grkj/data/repository/impl/network/NetworkJobTicketRepository.kt → data/src/main/java/com/grkj/data/logic/impl/network/NetworkJobTicketLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository.impl.network
+package com.grkj.data.logic.impl.network
 
 import com.grkj.data.enums.NextJobPrompt
 import com.grkj.data.model.dos.IsJobTicket
@@ -18,16 +18,16 @@ import com.grkj.data.model.vo.JobTicketGroupDataVo
 import com.grkj.data.model.vo.JobTicketManageVo
 import com.grkj.data.model.vo.JobUserVo
 import com.grkj.data.model.vo.LockedPointVo
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IJobTicketRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IJobTicketLogic
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * 联网版作业票仓储
+ * 联网版作业票业务层
  */
 @Singleton
-class NetworkJobTicketRepository @Inject constructor() : BaseRepository(), IJobTicketRepository {
+class NetworkJobTicketLogic @Inject constructor() : BaseLogic(), IJobTicketLogic {
     override fun createJob(
         selectedPointsData: List<JobTicketGroupDataVo<JobPointVo>>,
         selectedLockerData: List<JobTicketGroupDataVo<JobUserVo>>,

data/src/main/java/com/grkj/data/logic/impl/network/NetworkRfidTokenLogic.kt

@@ -0,0 +1,17 @@
+package com.grkj.data.logic.impl.network
+
+import com.grkj.data.model.dos.IsRfidToken
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IRfidTokenLogic
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * 联网版rfid标签
+ */
+@Singleton
+class NetworkRfidTokenLogic  @Inject constructor() : BaseLogic(), IRfidTokenLogic{
+    override fun getRfidData(): List<IsRfidToken> {
+        TODO("Not yet implemented")
+    }
+}

data/src/main/java/com/grkj/data/repository/impl/network/NetworkRoleRepository.kt → data/src/main/java/com/grkj/data/logic/impl/network/NetworkRoleLogic.kt

@@ -1,20 +1,20 @@
-package com.grkj.data.repository.impl.network
+package com.grkj.data.logic.impl.network
 
 import com.grkj.data.model.dos.SysRole
 import com.grkj.data.model.vo.AddRoleDo
 import com.grkj.data.model.vo.RoleManageFilterVo
 import com.grkj.data.model.vo.RoleManageVo
 import com.grkj.data.model.vo.UpdateRoleDo
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IRoleRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IRoleLogic
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * 联网版角色仓储
+ * 联网版角色业务层
  */
 @Singleton
-class NetworkRoleRepository @Inject constructor() : BaseRepository(), IRoleRepository {
+class NetworkRoleLogic @Inject constructor() : BaseLogic(), IRoleLogic {
     override fun getRoleData(): List<SysRole> {
         TODO("Not yet implemented")
     }

data/src/main/java/com/grkj/data/repository/impl/network/NetworkSopRepository.kt → data/src/main/java/com/grkj/data/logic/impl/network/NetworkSopLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository.impl.network
+package com.grkj.data.logic.impl.network
 
 import com.grkj.data.model.dos.IsSopGroup
 import com.grkj.data.model.dos.IsSopWorkflowStep
@@ -6,16 +6,16 @@ import com.grkj.data.model.vo.JobPointVo
 import com.grkj.data.model.vo.JobTicketGroupDataVo
 import com.grkj.data.model.vo.JobUserVo
 import com.grkj.data.model.vo.SopManageVo
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.ISopRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.ISopLogic
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * 联网版sop仓储
+ * 联网版sop业务层
  */
 @Singleton
-class NetworkSopRepository @Inject constructor()  : BaseRepository(), ISopRepository{
+class NetworkSopLogic @Inject constructor()  : BaseLogic(), ISopLogic{
     override fun saveSop(
         sopId: Long,
         sopName: String,

data/src/main/java/com/grkj/data/repository/impl/network/NetworkSysMenuRepository.kt → data/src/main/java/com/grkj/data/logic/impl/network/NetworkSysMenuLogic.kt

@@ -1,8 +1,8 @@
-package com.grkj.data.repository.impl.network
+package com.grkj.data.logic.impl.network
 
 import com.grkj.data.model.dos.SysMenu
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.ISysMenuRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.ISysMenuLogic
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -10,7 +10,7 @@ import javax.inject.Singleton
  * 联网版系统菜单
  */
 @Singleton
-class NetworkSysMenuRepository @Inject constructor()  : BaseRepository(), ISysMenuRepository{
+class NetworkSysMenuLogic @Inject constructor()  : BaseLogic(), ISysMenuLogic{
     override fun checkSysMenuAndRole() {
         TODO("Not yet implemented")
     }

data/src/main/java/com/grkj/data/repository/impl/network/NetworkUserRepository.kt → data/src/main/java/com/grkj/data/logic/impl/network/NetworkUserLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository.impl.network
+package com.grkj.data.logic.impl.network
 
 import com.grkj.data.enums.LoginResultEnum
 import com.grkj.data.model.dos.SysUserCharacteristicDo
@@ -10,16 +10,16 @@ import com.grkj.data.model.vo.SysUserVo
 import com.grkj.data.model.vo.UpdateUserDataVo
 import com.grkj.data.model.vo.UserManageFilterVo
 import com.grkj.data.model.vo.UserManageVo
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IUserRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IUserLogic
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * 联网版用户仓储
+ * 联网版用户业务层
  */
 @Singleton
-class NetworkUserRepository @Inject constructor() : BaseRepository(), IUserRepository {
+class NetworkUserLogic @Inject constructor() : BaseLogic(), IUserLogic {
     override fun loginWithAccount(
         username: String,
         password: String

data/src/main/java/com/grkj/data/repository/impl/network/NetworkWorkflowRepository.kt → data/src/main/java/com/grkj/data/logic/impl/network/NetworkWorkflowLogic.kt

@@ -1,17 +1,17 @@
-package com.grkj.data.repository.impl.network
+package com.grkj.data.logic.impl.network
 
 import com.grkj.data.model.dos.WorkflowMode
 import com.grkj.data.model.dos.WorkflowStep
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IWorkflowRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IWorkflowLogic
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * 联网版工作流仓储
+ * 联网版工作流业务层
  */
 @Singleton
-class NetworkWorkflowRepository @Inject constructor()  : BaseRepository(), IWorkflowRepository{
+class NetworkWorkflowLogic @Inject constructor()  : BaseLogic(), IWorkflowLogic{
     override fun insertStep(step: WorkflowStep): Long {
         TODO("Not yet implemented")
     }

data/src/main/java/com/grkj/data/repository/impl/network/NetworkWorkstationRepository.kt → data/src/main/java/com/grkj/data/logic/impl/network/NetworkWorkstationLogic.kt

@@ -1,17 +1,17 @@
-package com.grkj.data.repository.impl.network
+package com.grkj.data.logic.impl.network
 
 import com.grkj.data.model.dos.IsWorkstation
 import com.grkj.data.model.vo.WorkstationManageVo
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IWorkstationRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IWorkstationLogic
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * 联网版区域仓储
+ * 联网版区域业务层
  */
 @Singleton
-class NetworkWorkstationRepository @Inject constructor()  : BaseRepository(), IWorkstationRepository{
+class NetworkWorkstationLogic @Inject constructor()  : BaseLogic(), IWorkstationLogic{
 
     override fun addUserWorkstationData(
         userId: Long,

data/src/main/java/com/grkj/data/repository/impl/standard/ExceptionRepository.kt → data/src/main/java/com/grkj/data/logic/impl/standard/ExceptionLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository.impl.standard
+package com.grkj.data.logic.impl.standard
 
 import com.grkj.data.dao.ExceptionDao
 import com.grkj.data.dao.HardwareDao
@@ -9,9 +9,8 @@ import com.grkj.data.enums.JobTicketStatusEnum
 import com.grkj.data.model.dos.IsExceptionSourceStandard
 import com.grkj.data.model.dos.IsExceptionStandard
 import com.grkj.data.model.vo.IsExceptionStandardVo
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IExceptionRepository
-import com.grkj.data.repository.IHardwareRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IExceptionLogic
 import com.sik.sikcore.data.BeanUtils
 import com.sik.sikcore.date.TimeUtils
 import com.sik.sikcore.extension.toJson
@@ -19,16 +18,17 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * 异常仓储实现
+ * 异常业务层实现
  */
 @Singleton
-class ExceptionRepository @Inject constructor(
+class ExceptionLogic @Inject constructor(
     val exceptionDao: ExceptionDao,
     val jobTicketDao: JobTicketDao,
     val hardwareDao: HardwareDao,
     val workflowStepDao: WorkflowStepDao
-) : BaseRepository(),
-    IExceptionRepository {
+) : BaseLogic(),
+    IExceptionLogic {
+
     override fun cancelException(exceptionData: List<IsExceptionStandardVo>) {
         exceptionData.forEach {
             it.exceptionStatus =
@@ -83,7 +83,18 @@ class ExceptionRepository @Inject constructor(
     }
 
     override fun getExceptionData(): List<IsExceptionStandardVo> {
-        return exceptionDao.getExceptionData()
+        val exceptionData = exceptionDao.getExceptionData()
+        val result: List<IsExceptionStandardVo> = exceptionData.mapNotNull {
+            BeanUtils.copyProperties(
+                it,
+                IsExceptionStandardVo::class.java
+            )
+        }
+        result.forEach {
+            val sourceData = exceptionDao.getExceptionSourceDataByExceptionId(it.exceptionId)
+            it.sourceData = sourceData
+        }
+        return result
     }
 
     override fun handleException(exceptionData: List<IsExceptionStandardVo>) {
@@ -132,11 +143,15 @@ class ExceptionRepository @Inject constructor(
                             CommonDictDataEnum.JOB_TICKET_STATUS.commonDictRes.find { it.dictLabel == "异常" }?.dictValue?.toInt()
                         jobTicketData?.remark = exceptionSource.remark
                         logger.info("异常处理作业票1:${exceptionDataItem.toJson()}")
-                        logger.info("异常处理作业票2:${CommonDictDataEnum.EXCEPTION_PROCESS_APPLICATION_JOB.commonDictRes.find {
-                            it.dictLabel.contains(
-                                "结束作业"
-                            )
-                        }?.dictValue}")
+                        logger.info(
+                            "异常处理作业票2:${
+                                CommonDictDataEnum.EXCEPTION_PROCESS_APPLICATION_JOB.commonDictRes.find {
+                                    it.dictLabel.contains(
+                                        "结束作业"
+                                    )
+                                }?.dictValue
+                            }"
+                        )
                         if (exceptionDataItem.processApplication == CommonDictDataEnum.EXCEPTION_PROCESS_APPLICATION_JOB.commonDictRes.find {
                                 it.dictLabel.contains(
                                     "结束作业"
@@ -164,7 +179,11 @@ class ExceptionRepository @Inject constructor(
     }
 
     override fun getExceptionDataById(exceptionId: Long): IsExceptionStandardVo? {
-        return exceptionDao.getExceptionDataById(exceptionId)
+        val exceptionData = exceptionDao.getExceptionDataById(exceptionId)
+        val result = BeanUtils.copyProperties(exceptionData, IsExceptionStandardVo::class.java)
+        val exceptionSourceData = exceptionDao.getExceptionSourceDataByExceptionId(exceptionId)
+        result?.sourceData = exceptionSourceData
+        return result
     }
 
     override fun reportException(exceptionData: IsExceptionStandard): Long {

data/src/main/java/com/grkj/data/repository/impl/standard/HardwareRepository.kt → data/src/main/java/com/grkj/data/logic/impl/standard/HardwareLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository.impl.standard
+package com.grkj.data.logic.impl.standard
 
 import com.grkj.data.dao.HardwareDao
 import com.grkj.data.dao.IsolationPointDao
@@ -15,7 +15,7 @@ import com.grkj.data.model.dos.IsLockCabinetSlots
 import com.grkj.data.model.dos.IsRfidToken
 import com.grkj.data.model.local.LockData
 import com.grkj.data.model.local.PointData
-import com.grkj.data.repository.IHardwareRepository
+import com.grkj.data.logic.IHardwareLogic
 import com.grkj.data.model.req.LockPointUpdateReq
 import com.grkj.data.model.req.LockTakeUpdateReq
 import com.grkj.data.model.res.CabinetSlotsRecord
@@ -31,7 +31,7 @@ import com.grkj.data.model.vo.CardManageFilterVo
 import com.grkj.data.model.vo.KeyManageFilterVo
 import com.grkj.data.model.vo.LockManageFilterVo
 import com.grkj.data.model.vo.RfidTokenManageFilterVo
-import com.grkj.data.repository.BaseRepository
+import com.grkj.data.logic.BaseLogic
 import com.sik.sikcore.data.BeanUtils
 import com.sik.sikcore.date.TimeUtils
 import com.sik.sikcore.extension.saveMMKVData
@@ -40,14 +40,14 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * 硬件仓储
+ * 硬件业务层
  */
 @Singleton
-class HardwareRepository @Inject constructor(
+class HardwareLogic @Inject constructor(
     val hardwareDao: HardwareDao,
     val isolationPointDao: IsolationPointDao,
     val jobTicketDao: JobTicketDao
-) : BaseRepository(), IHardwareRepository {
+) : BaseLogic(), IHardwareLogic {
     private val updateLock = Any()
 
     /**

data/src/main/java/com/grkj/data/repository/impl/standard/IsolationPointRepository.kt → data/src/main/java/com/grkj/data/logic/impl/standard/IsolationPointLogic.kt

@@ -1,27 +1,26 @@
-package com.grkj.data.repository.impl.standard
+package com.grkj.data.logic.impl.standard
 
 import com.grkj.data.dao.IsolationPointDao
 import com.grkj.data.dao.JobTicketDao
 import com.grkj.data.model.dos.IsIsolationPoint
 import com.grkj.data.model.vo.AddPointManageVo
-import com.grkj.data.model.vo.JobPointVo
 import com.grkj.data.model.vo.PointManageFilterVo
 import com.grkj.data.model.vo.PointManageVo
 import com.grkj.data.model.vo.UpdatePointManageVo
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IIsolationPointRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IIsolationPointLogic
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * 隔离点仓储实现
+ * 隔离点业务层实现
  */
 @Singleton
-class IsolationPointRepository @Inject constructor(
+class IsolationPointLogic @Inject constructor(
     val isolationPointDao: IsolationPointDao,
     val jobTicketDao: JobTicketDao
 ) :
-    BaseRepository(), IIsolationPointRepository {
+    BaseLogic(), IIsolationPointLogic {
 
     override fun deletePointByPointIds(pointIds: List<Long>) {
         isolationPointDao.deletePointByPointIds(pointIds)

data/src/main/java/com/grkj/data/repository/impl/standard/JobTicketRepository.kt → data/src/main/java/com/grkj/data/logic/impl/standard/JobTicketLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository.impl.standard
+package com.grkj.data.logic.impl.standard
 
 import com.grkj.data.check_data.ICheckDataMode
 import com.grkj.data.dao.ExceptionDao
@@ -39,8 +39,8 @@ import com.grkj.data.model.vo.JobTicketGroupDataVo
 import com.grkj.data.model.vo.JobTicketManageVo
 import com.grkj.data.model.vo.JobUserVo
 import com.grkj.data.model.vo.LockedPointVo
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IJobTicketRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IJobTicketLogic
 import com.sik.sikcore.data.BeanUtils
 import com.sik.sikcore.date.TimeUtils
 import javax.inject.Inject
@@ -50,13 +50,13 @@ import javax.inject.Singleton
  * 作业票实现
  */
 @Singleton
-class JobTicketRepository @Inject constructor(
+class JobTicketLogic @Inject constructor(
     val jobTicketDao: JobTicketDao,
     val hardwareDao: HardwareDao,
     val isolationPointDao: IsolationPointDao,
     val workflowStepDao: WorkflowStepDao,
     val exceptionDao: ExceptionDao
-) : BaseRepository(), IJobTicketRepository {
+) : BaseLogic(), IJobTicketLogic {
     override fun createJob(
         selectedPointsData: List<JobTicketGroupDataVo<JobPointVo>>,
         selectedLockerData: List<JobTicketGroupDataVo<JobUserVo>>,
@@ -1218,7 +1218,7 @@ class JobTicketRepository @Inject constructor(
     }
 
     override fun getExceptionIdByTicketId(ticketId: Long): Long {
-        return exceptionDao.getExceptionIdByTicketId(ticketId)
+        return exceptionDao.getExceptionIdBySourceDataId(ticketId)
     }
 
     override fun getLockedPointsCount(realTimeDataZoneId: Long?, selectedWorkflowMode: Long?): Int {

data/src/main/java/com/grkj/data/logic/impl/standard/RfidTokenLogic.kt

@@ -0,0 +1,18 @@
+package com.grkj.data.logic.impl.standard
+
+import com.grkj.data.dao.RfidTokenDao
+import com.grkj.data.model.dos.IsRfidToken
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IRfidTokenLogic
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * RFID标签业务层实现
+ */
+@Singleton
+class RfidTokenLogic @Inject constructor(val rfidTokenDao: RfidTokenDao): BaseLogic(), IRfidTokenLogic {
+    override fun getRfidData(): List<IsRfidToken> {
+        return rfidTokenDao.getRfidData()
+    }
+}

data/src/main/java/com/grkj/data/repository/impl/standard/RoleRepository.kt → data/src/main/java/com/grkj/data/logic/impl/standard/RoleLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository.impl.standard
+package com.grkj.data.logic.impl.standard
 
 import com.grkj.data.dao.RoleDao
 import com.grkj.data.dao.SysMenuDao
@@ -9,18 +9,18 @@ import com.grkj.data.model.vo.AddRoleDo
 import com.grkj.data.model.vo.RoleManageFilterVo
 import com.grkj.data.model.vo.RoleManageVo
 import com.grkj.data.model.vo.UpdateRoleDo
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IRoleRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IRoleLogic
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * 岗位仓储
+ * 岗位业务层
  */
 @Singleton
-class RoleRepository @Inject constructor(val roleDao: RoleDao, val sysMenuDao: SysMenuDao) :
-    BaseRepository(),
-    IRoleRepository {
+class RoleLogic @Inject constructor(val roleDao: RoleDao, val sysMenuDao: SysMenuDao) :
+    BaseLogic(),
+    IRoleLogic {
 
     override fun getRoleData(): List<SysRole> {
         return roleDao.getRoleData()

data/src/main/java/com/grkj/data/repository/impl/standard/SopRepository.kt → data/src/main/java/com/grkj/data/logic/impl/standard/SopLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository.impl.standard
+package com.grkj.data.logic.impl.standard
 
 import com.grkj.data.dao.IsSopDao
 import com.grkj.data.dao.WorkflowStepDao
@@ -12,20 +12,20 @@ import com.grkj.data.model.vo.JobPointVo
 import com.grkj.data.model.vo.JobTicketGroupDataVo
 import com.grkj.data.model.vo.JobUserVo
 import com.grkj.data.model.vo.SopManageVo
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.ISopRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.ISopLogic
 import com.sik.sikcore.data.BeanUtils
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * sop仓储实现
+ * sop业务层实现
  */
 @Singleton
-class SopRepository @Inject constructor(
+class SopLogic @Inject constructor(
     val isSopDao: IsSopDao,
     val workflowStepDao: WorkflowStepDao
-) : BaseRepository(), ISopRepository {
+) : BaseLogic(), ISopLogic {
 
     override fun saveSop(
         sopId: Long,

data/src/main/java/com/grkj/data/repository/impl/standard/SysMenuRepository.kt → data/src/main/java/com/grkj/data/logic/impl/standard/SysMenuLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository.impl.standard
+package com.grkj.data.logic.impl.standard
 
 import com.grkj.data.dao.RoleDao
 import com.grkj.data.dao.SysMenuDao
@@ -6,17 +6,17 @@ import com.grkj.data.enums.RoleEnum
 import com.grkj.data.enums.RoleFunctionalPermissionsEnum
 import com.grkj.data.model.dos.SysMenu
 import com.grkj.data.model.dos.SysRoleMenu
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.ISysMenuRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.ISysMenuLogic
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * 菜单仓储实现
+ * 菜单业务层实现
  */
 @Singleton
-class SysMenuRepository @Inject constructor(val sysMenuDao: SysMenuDao, val roleDao: RoleDao) :
-    BaseRepository(), ISysMenuRepository {
+class SysMenuLogic @Inject constructor(val sysMenuDao: SysMenuDao, val roleDao: RoleDao) :
+    BaseLogic(), ISysMenuLogic {
     override fun checkSysMenuAndRole() {
         // 找出所有顶层菜单（level == 0），依次递归插入/更新
         RoleFunctionalPermissionsEnum.values()

data/src/main/java/com/grkj/data/repository/impl/standard/UserRepository.kt → data/src/main/java/com/grkj/data/logic/impl/standard/UserLogic.kt

@@ -1,4 +1,4 @@
-package com.grkj.data.repository.impl.standard
+package com.grkj.data.logic.impl.standard
 
 import com.grkj.data.dao.HardwareDao
 import com.grkj.data.dao.RoleDao
@@ -18,8 +18,8 @@ import com.grkj.data.model.vo.SysUserVo
 import com.grkj.data.model.vo.UpdateUserDataVo
 import com.grkj.data.model.vo.UserManageVo
 import com.grkj.data.model.vo.UserManageFilterVo
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IUserRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IUserLogic
 import com.grkj.shared.utils.BCryptUtils
 import com.grkj.shared.utils.BiometricVerifier
 import com.sik.sikcore.extension.deleteIfExists
@@ -32,15 +32,15 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * 用户仓储层
+ * 用户业务层
  */
 @Singleton
-class UserRepository @Inject constructor(
+class UserLogic @Inject constructor(
     private val hardwareDao: HardwareDao,
     private val userDao: UserDao,
     private val roleDao: RoleDao,
     private val sysMenuDao: SysMenuDao,
-) : BaseRepository(), IUserRepository {
+) : BaseLogic(), IUserLogic {
 
     override fun loginWithAccount(
         username: String, password: String

data/src/main/java/com/grkj/data/repository/impl/standard/WorkflowRepository.kt → data/src/main/java/com/grkj/data/logic/impl/standard/WorkflowLogic.kt

@@ -1,19 +1,19 @@
-package com.grkj.data.repository.impl.standard
+package com.grkj.data.logic.impl.standard
 
 import com.grkj.data.dao.WorkflowStepDao
 import com.grkj.data.model.dos.WorkflowMode
 import com.grkj.data.model.dos.WorkflowStep
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IWorkflowRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IWorkflowLogic
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * 工作流仓储事件
+ * 工作流业务层事件
  */
 @Singleton
-class WorkflowRepository @Inject constructor(val workflowStepDao: WorkflowStepDao) :
-    BaseRepository(), IWorkflowRepository {
+class WorkflowLogic @Inject constructor(val workflowStepDao: WorkflowStepDao) :
+    BaseLogic(), IWorkflowLogic {
     override fun insertStep(step: WorkflowStep): Long = workflowStepDao.insertStep(step)
 
     override fun updateStep(step: WorkflowStep) = workflowStepDao.updateStep(step)

data/src/main/java/com/grkj/data/repository/impl/standard/WorkstationRepository.kt → data/src/main/java/com/grkj/data/logic/impl/standard/WorkstationLogic.kt

@@ -1,21 +1,21 @@
-package com.grkj.data.repository.impl.standard
+package com.grkj.data.logic.impl.standard
 
 import com.grkj.data.dao.WorkstationDao
 import com.grkj.data.model.dos.IsUserWorkstation
 import com.grkj.data.model.dos.IsWorkstation
 import com.grkj.data.model.vo.WorkstationManageVo
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IWorkstationRepository
+import com.grkj.data.logic.BaseLogic
+import com.grkj.data.logic.IWorkstationLogic
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.collections.get
 
 /**
- * 岗位仓储
+ * 岗位业务层
  */
 @Singleton
-class WorkstationRepository @Inject constructor(val workstationDao: WorkstationDao) :
-    BaseRepository(), IWorkstationRepository {
+class WorkstationLogic @Inject constructor(val workstationDao: WorkstationDao) :
+    BaseLogic(), IWorkstationLogic {
 
     override fun addUserWorkstationData(userId: Long, workstationIds: List<Long>) {
         val isUserWorkstation = workstationIds.map { workstationId ->

data/src/main/java/com/grkj/data/model/local/WorkTicketGet.kt

@@ -1,10 +1,8 @@
 package com.grkj.data.model.local
 
 import com.grkj.data.di.RepositoryManager
-import com.grkj.data.repository.IJobTicketRepository
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import kotlin.collections.forEach
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 

data/src/main/java/com/grkj/data/repository/impl/network/NetworkRfidTokenRepository.kt

@@ -1,17 +0,0 @@
-package com.grkj.data.repository.impl.network
-
-import com.grkj.data.model.dos.IsRfidToken
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IRfidTokenRepository
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/**
- * 联网版rfid标签
- */
-@Singleton
-class NetworkRfidTokenRepository  @Inject constructor() : BaseRepository(), IRfidTokenRepository{
-    override fun getRfidData(): List<IsRfidToken> {
-        TODO("Not yet implemented")
-    }
-}

data/src/main/java/com/grkj/data/repository/impl/standard/RfidTokenRepository.kt

@@ -1,18 +0,0 @@
-package com.grkj.data.repository.impl.standard
-
-import com.grkj.data.dao.RfidTokenDao
-import com.grkj.data.model.dos.IsRfidToken
-import com.grkj.data.repository.BaseRepository
-import com.grkj.data.repository.IRfidTokenRepository
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/**
- * RFID标签仓储实现
- */
-@Singleton
-class RfidTokenRepository @Inject constructor(val rfidTokenDao: RfidTokenDao): BaseRepository(), IRfidTokenRepository {
-    override fun getRfidData(): List<IsRfidToken> {
-        return rfidTokenDao.getRfidData()
-    }
-}

ui-base/src/main/java/com/grkj/ui_base/base/BaseViewModel.kt

@@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.liveData
 import androidx.lifecycle.viewModelScope
 import com.grkj.data.enums.LoginResultEnum
-import com.grkj.data.repository.IUserRepository
+import com.grkj.data.logic.IUserLogic
 import com.grkj.ui_base.utils.event.LoadingEvent
 import com.grkj.ui_base.utils.event.UiEvent
 import com.grkj.ui_base.utils.extension.tip
@@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory
  * 界面模型基类
  */
 open class BaseViewModel constructor(
-    open val userRepository: IUserRepository? = null
+    open val userRepository: IUserLogic? = null
 ) : ViewModel() {
     protected val logger: Logger = LoggerFactory.getLogger(this::class.java)