Просмотр исходного кода

作业票下发json密码优先使用后端配置的keyCode

Frankensteinly 1 год назад
Родитель
Сommit
f3c76cebb3

+ 2 - 2
app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -968,8 +968,8 @@ object BusinessManager {
         CommonUtils.getDiffHours(vo.ticketEndTime)?.let {
             bo.effectiveTime = it
         }
-        // 填充默认密码
-        bo.password = "123456"
+        // 有配置则用配置,没用则填充默认密码
+        bo.password = SPUtils.getLoginUser(MyApplication.instance!!.applicationContext)?.keyCode ?: "123456"
         val dataBO = WorkTicketSendBO.DataBO(
             taskCode = vo.ticketId.toString(),
             codeId = 1

+ 1 - 0
app/src/main/java/com/grkj/iscs/model/bo/LoginUserBO.kt

@@ -3,6 +3,7 @@ package com.grkj.iscs.model.bo
 data class LoginUserBO(
     val userId: Long?,
     val userName: String?,
+    val keyCode: String?,
     val roleKeyList: MutableList<String>?,
     val userCardList: MutableList<String>?
 )

+ 2 - 0
app/src/main/java/com/grkj/iscs/model/vo/user/UserInfoRespVO.kt

@@ -34,6 +34,8 @@ data class UserInfoRespVO(
 
         val password: String?,
 
+        val keyCode: String?,
+
         val salt: String?,
 
         val status: String?,

+ 5 - 0
app/src/main/java/com/grkj/iscs/util/SPUtils.kt

@@ -24,6 +24,7 @@ object SPUtils {
     private const val KEY_LOGIN_USER_CARD_TYPE = "card_type"
     private const val KEY_LOGIN_USER_USER_ID = "user_id"
     private const val KEY_LOGIN_USER_USER_NAME = "user_name"
+    private const val KEY_LOGIN_USER_KEY_CODE = "key_code"
     private const val KEY_LOGIN_USER_ROLE_KEY = "role_key"
 
     private const val KEY_DOCK_CONFIG = "dock_config"
@@ -42,6 +43,7 @@ object SPUtils {
         return LoginUserBO(
             userId = sp.getLong(KEY_LOGIN_USER_USER_ID, 0),
             userName = sp.getString(KEY_LOGIN_USER_USER_NAME, null),
+            keyCode = sp.getString(KEY_LOGIN_USER_KEY_CODE, null),
             roleKeyList = sp.getString(KEY_LOGIN_USER_ROLE_KEY, null)?.split(",")?.toMutableList(),
             userCardList = sp.getString(KEY_LOGIN_USER_CARD_NFC, null)?.split(",")?.toMutableList()
         )
@@ -56,6 +58,9 @@ object SPUtils {
         userInfoRespVO.user?.userName?.let {
             edit.putString(KEY_LOGIN_USER_USER_NAME, it)
         }
+        userInfoRespVO.user?.keyCode?.let {
+            edit.putString(KEY_LOGIN_USER_KEY_CODE, it)
+        }
         userInfoRespVO.roles?.let {
             edit.putString(KEY_LOGIN_USER_ROLE_KEY, it.toString().replace("[", "").replace("]", ""))
         }