Browse Source

完善根据角色获取人员列表接口;修正上锁人列表接口

Frankensteinly 10 months ago
parent
commit
b0e636bd2a

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

@@ -1,8 +1,8 @@
 package com.grkj.iscs.model
 
 object UrlConsts {
-    //    const val BASE_URL = "http://192.168.1.127:9090"
-    const val BASE_URL = "http://192.168.1.11:9090"
+        const val BASE_URL = "http://192.168.1.127:9190"
+//    const val BASE_URL = "http://192.168.1.11:9090"
     const val WEB_SOCKET = "ws://192.168.1.127:9090/websocket/iot/127"
 
     const val AUTOCODE_TICKET_NUMBER = "JOB_TICKET_CODE"

+ 4 - 4
app/src/main/java/com/grkj/iscs/model/vo/user/RoleListRespVO.kt

@@ -76,10 +76,10 @@ data class RoleListRespVO(
         val roles: List<SysRoleVO>?,
 
         /** 角色组  */
-        val roleIds: Array<Long>?,
+        val roleIds: List<Long>?,
 
         /** 岗位组  */
-        val postIds: Array<Long>?,
+        val postIds: List<Long>?,
 
         /** 角色ID  */
         val roleId: Long?,
@@ -128,10 +128,10 @@ data class RoleListRespVO(
             val flag: Boolean?,
 
             /** 菜单组  */
-            val menuIds: Array<Long>?,
+            val menuIds: List<Long>?,
 
             /** 部门组(数据权限)  */
-            val deptIds: Array<Long>?
+            val deptIds: List<Long>?
         )
         
         data class SysDept(

+ 1 - 4
app/src/main/java/com/grkj/iscs/presenter/CreateTicketPresenter.kt

@@ -30,16 +30,13 @@ class CreateTicketPresenter : BasePresenter<ICreateTicketView>() {
             }
         }
 
-        NetApi.getUserList(0, 10) {
-            mvpView?.updateLockerList(it?.rows?.map { it.nickName })
-        }
-
         NetApi.getDeptList(0, 10) {
             println("getDeptList : $it")
         }
 
         NetApi.getRoleList(0, 10, USER_ROLE_LOCKER) {
             println("Locker getRoleList : $it")
+            mvpView?.updateLockerList(it?.rows?.map { it.nickName!! })
         }
         NetApi.getRoleList(0, 10, USER_ROLE_COLOCKER) {
             println("Colocker getRoleList : $it")

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

@@ -149,6 +149,7 @@ object NetApi {
     /**
      * 获取用户列表
      */
+    @Deprecated("不使用")
     fun getUserList(pageNum: Int, pageSize: Int, callBack: (UserListRespVO?) -> Unit) {
         NetHttpManager.getInstance().doRequestNet(
             UrlConsts.USER_LIST,
@@ -448,8 +449,7 @@ object NetApi {
             ),
             { res, _, _ ->
                 res?.let {
-//                    println("haha : $it")
-                    callBack.invoke(getRefBean(it))
+                    callBack.invoke(it.toBean(RoleListRespVO::class.java))
                 }
             }, isGet = true, isAuth = true
         )