|
|
@@ -3,12 +3,13 @@ package com.grkj.iscs.util
|
|
|
import com.grkj.iscs.MyApplication
|
|
|
import com.grkj.iscs.model.Token
|
|
|
import com.grkj.iscs.model.UrlConsts
|
|
|
-import com.grkj.iscs.model.vo.DeptListRespVO
|
|
|
-import com.grkj.iscs.model.vo.SopInfoRespVO
|
|
|
-import com.grkj.iscs.model.vo.SopPageRespVO
|
|
|
-import com.grkj.iscs.model.vo.TicketPageRespVO
|
|
|
-import com.grkj.iscs.model.vo.TicketTypeRespVO
|
|
|
-import com.grkj.iscs.model.vo.UserListRespVO
|
|
|
+import com.grkj.iscs.model.vo.card.CardInfoRespVO
|
|
|
+import com.grkj.iscs.model.vo.dept.DeptListRespVO
|
|
|
+import com.grkj.iscs.model.vo.sop.SopInfoRespVO
|
|
|
+import com.grkj.iscs.model.vo.sop.SopPageRespVO
|
|
|
+import com.grkj.iscs.model.vo.ticket.TicketPageRespVO
|
|
|
+import com.grkj.iscs.model.vo.ticket.TicketTypeRespVO
|
|
|
+import com.grkj.iscs.model.vo.user.UserListRespVO
|
|
|
|
|
|
/**
|
|
|
* 网络请求
|
|
|
@@ -25,7 +26,7 @@ object NetApi {
|
|
|
"username" to username,
|
|
|
"password" to password
|
|
|
),
|
|
|
- { res, errMsg, codeInt ->
|
|
|
+ { res, _, _ ->
|
|
|
res?.let {
|
|
|
val newToken = it.toBean(Token::class.java)
|
|
|
newToken.saveToSp(MyApplication.instance!!.applicationContext)
|
|
|
@@ -44,7 +45,7 @@ object NetApi {
|
|
|
mapOf(
|
|
|
"cardNfc" to cardNfc
|
|
|
),
|
|
|
- { res, errMsg, codeInt ->
|
|
|
+ { res, _, _ ->
|
|
|
res?.let {
|
|
|
val newToken = it.toBean(Token::class.java)
|
|
|
newToken.saveToSp(MyApplication.instance!!.applicationContext)
|
|
|
@@ -64,7 +65,7 @@ object NetApi {
|
|
|
"current" to current,
|
|
|
"size" to size
|
|
|
),
|
|
|
- { res, errMsg, codeInt ->
|
|
|
+ { res, _, _ ->
|
|
|
res?.let {
|
|
|
callBack.invoke(getRefBean(it))
|
|
|
}
|
|
|
@@ -79,7 +80,7 @@ object NetApi {
|
|
|
UrlConsts.TICKET_TYPE,
|
|
|
false,
|
|
|
mapOf<String,String>(),
|
|
|
- { res, errMsg, codeInt ->
|
|
|
+ { res, _, _ ->
|
|
|
res?.let {
|
|
|
callBack.invoke(getRefBean(it))
|
|
|
}
|
|
|
@@ -94,7 +95,7 @@ object NetApi {
|
|
|
UrlConsts.AUTO_CODE + "/" +type,
|
|
|
false,
|
|
|
mapOf<String, String>(),
|
|
|
- { res, errMsg, codeInt ->
|
|
|
+ { res, _, _ ->
|
|
|
res?.let {
|
|
|
callBack.invoke(it.toString())
|
|
|
}
|
|
|
@@ -111,7 +112,7 @@ object NetApi {
|
|
|
mapOf(
|
|
|
"sopId" to sopId
|
|
|
),
|
|
|
- { res, errMsg, codeInt ->
|
|
|
+ { res, _, _ ->
|
|
|
res?.let {
|
|
|
callBack.invoke(getRefBean(it))
|
|
|
}
|
|
|
@@ -129,7 +130,7 @@ object NetApi {
|
|
|
"pageNum" to pageNum,
|
|
|
"pageSize" to pageSize
|
|
|
),
|
|
|
- { res, errMsg, codeInt ->
|
|
|
+ { res, _, _ ->
|
|
|
res?.let {
|
|
|
callBack.invoke(it.toBean(UserListRespVO::class.java))
|
|
|
}
|
|
|
@@ -147,7 +148,7 @@ object NetApi {
|
|
|
"pageNum" to pageNum,
|
|
|
"pageSize" to pageSize
|
|
|
),
|
|
|
- { res, errMsg, codeInt ->
|
|
|
+ { res, _, _ ->
|
|
|
res?.let {
|
|
|
callBack.invoke(getRefBean(it))
|
|
|
}
|
|
|
@@ -163,7 +164,7 @@ object NetApi {
|
|
|
UrlConsts.CREATE_TICKET,
|
|
|
false,
|
|
|
mapOf<String, String>(),
|
|
|
- { res, errMsg, codeInt ->
|
|
|
+ { res, _, _ ->
|
|
|
res?.let {
|
|
|
//TODO 创建工作票结果
|
|
|
}
|
|
|
@@ -174,15 +175,36 @@ object NetApi {
|
|
|
/**
|
|
|
* 获取工作票分页
|
|
|
*/
|
|
|
- fun getTicketPage(pageNum: Int, pageSize: Int, callBack: (TicketPageRespVO?) -> Unit) {
|
|
|
+ fun getTicketPage(pageNum: Int, pageSize: Int, userId: Long, ticketStatus: Int?, callBack: (TicketPageRespVO?) -> Unit) {
|
|
|
+ val map = mutableMapOf(
|
|
|
+ "pageNum" to pageNum,
|
|
|
+ "pageSize" to pageSize,
|
|
|
+ "userId" to userId
|
|
|
+ )
|
|
|
+ if (ticketStatus != null) {
|
|
|
+ map["ticketStatus"] = ticketStatus
|
|
|
+ }
|
|
|
NetHttpManager.getInstance().doRequestNet(
|
|
|
UrlConsts.PAGE_TICKET,
|
|
|
false,
|
|
|
- mapOf(
|
|
|
- "pageNum" to pageNum,
|
|
|
- "pageSize" to pageSize
|
|
|
- ),
|
|
|
- { res, errMsg, codeInt ->
|
|
|
+ map,
|
|
|
+ { res, _, _ ->
|
|
|
+ res?.let {
|
|
|
+ callBack.invoke(getRefBean(it))
|
|
|
+ }
|
|
|
+ }, isGet = true, isAuth = true
|
|
|
+ )
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取刷卡信息
|
|
|
+ */
|
|
|
+ fun getCardInfo(callBack: (CardInfoRespVO?) -> Unit) {
|
|
|
+ NetHttpManager.getInstance().doRequestNet(
|
|
|
+ UrlConsts.CARD_INFO,
|
|
|
+ false,
|
|
|
+ mapOf<String, String>(),
|
|
|
+ { res, _, _ ->
|
|
|
res?.let {
|
|
|
callBack.invoke(getRefBean(it))
|
|
|
}
|