refactor(network): 移除设备认证和登录相关API接口

- 注释掉设备获取token的API接口和服务端点
- 移除设备信息查询相关的API接口和服务端点
- 删除登录功能的API接口和服务端点
- 移除部分收货功能的API接口和服务端点
- 注释掉添加物品采购单位的API接口和服务端点
- 相应移除ViewModel中的设备认证和登录逻辑
- 删除Repository中对应的网络请求方法
This commit is contained in:
2026-05-26 14:10:00 +08:00
parent 1092a7c43d
commit fa58304ca1
4 changed files with 87 additions and 88 deletions
@@ -39,31 +39,30 @@ interface ApiService {
/**
* device获取token
*/
@GET("sys/getEquipmentToken")
suspend fun getDeviceToken(
@Query("qrcodeId") qrcodeId: String,
@Query("appVersion") appVersion: String = GlobalData.appVersion
): ApiResponse<String>
// @GET("sys/getEquipmentToken")
// suspend fun getDeviceToken(
// @Query("qrcodeId") qrcodeId: String,
// @Query("appVersion") appVersion: String = GlobalData.appVersion
// ): ApiResponse<String>
/**
*获取配置信息
*/
@GET("equipment/stEquipment/queryByEquipmentCode")
suspend fun getDeviceInfo(
@Query("equipmentCode") equipmentCode: String,
@Query("appVersion") appVersion: String = GlobalData.appVersion,
@Header("X-Access-Token") token: String
): ApiResponse<EquipmentInfo>
// @GET("equipment/stEquipment/queryByEquipmentCode")
// suspend fun getDeviceInfo(
// @Query("equipmentCode") equipmentCode: String,
// @Query("appVersion") appVersion: String = GlobalData.appVersion,
// @Header("X-Access-Token") token: String
// ): ApiResponse<EquipmentInfo>
/**
* 登录
*/
@POST//("sys/loginPad")
suspend fun login(
@Url url: String = "${GlobalData.appBaseUrl}/sys/loginPad",
@Body body: LoginParam,
): ApiResponse<User>
// @POST//("sys/loginPad")
// suspend fun login(
// @Url url: String = "${GlobalData.appBaseUrl}/sys/loginPad",
// @Body body: LoginParam,
// ): ApiResponse<User>
/**
* 采购单入库-列表
@@ -94,11 +93,11 @@ interface ApiService {
/**
* 部分收货
*/
@POST//("pad/partialReceiptGoods")
suspend fun partialReceipt(
@Url url: String = "${GlobalData.appBaseUrl}${apiPrefix}/pad/partialReceiptGoods",
@Body uploadInfo: UploadInfo
): ApiResponse<Boolean>
// @POST//("pad/partialReceiptGoods")
// suspend fun partialReceipt(
// @Url url: String = "${GlobalData.appBaseUrl}${apiPrefix}/pad/partialReceiptGoods",
// @Body uploadInfo: UploadInfo
// ): ApiResponse<Boolean>
/**
* 确认收货
@@ -195,11 +194,11 @@ interface ApiService {
/**
* 添加物品采购单位
*/
@POST//("pad/goodsAddUnit")
suspend fun goodsAddUnit(
@Url url: String = "${GlobalData.appBaseUrl}${apiPrefix}/pad/goodsAddUnit",
@Body purchaseUnitParam: GoodsPurchaseUnitParam,
): ApiResponse<Boolean>
// @POST//("pad/goodsAddUnit")
// suspend fun goodsAddUnit(
// @Url url: String = "${GlobalData.appBaseUrl}${apiPrefix}/pad/goodsAddUnit",
// @Body purchaseUnitParam: GoodsPurchaseUnitParam,
// ): ApiResponse<Boolean>
/**
* 自采入库
@@ -38,29 +38,29 @@ class RemoteRepository @Inject constructor(
/**
* 生成token
*/
suspend fun getDeviceToken(qrcodeId: String): ApiResponse<String> {
return safeApiCall {
apiService.getDeviceToken(
qrcodeId
)
}
}
// suspend fun getDeviceToken(qrcodeId: String): ApiResponse<String> {
// return safeApiCall {
// apiService.getDeviceToken(
// qrcodeId
// )
// }
// }
/**
* 获取设备信息
*/
suspend fun getDeviceInfo(equipmentCode: String, token: String): ApiResponse<EquipmentInfo> {
return safeApiCall {
apiService.getDeviceInfo(
equipmentCode = equipmentCode,
token = token
)
}
}
// suspend fun getDeviceInfo(equipmentCode: String, token: String): ApiResponse<EquipmentInfo> {
// return safeApiCall {
// apiService.getDeviceInfo(
// equipmentCode = equipmentCode,
// token = token
// )
// }
// }
suspend fun login(loginParam: LoginParam): ApiResponse<User> {
return safeApiCall { apiService.login(body = loginParam) }
}
// suspend fun login(loginParam: LoginParam): ApiResponse<User> {
// return safeApiCall { apiService.login(body = loginParam) }
// }
suspend fun getReceiveList(pageNum: Int, pageSize: Int): ApiResponse<List<SupplierInfo>?> {
return safeApiCall {
@@ -153,11 +153,11 @@ class RemoteRepository @Inject constructor(
/**
* 部分收货
*/
suspend fun partialReceipt(uploadInfo: UploadInfo): ApiResponse<Boolean> {
return safeApiCall {
apiService.partialReceipt(uploadInfo = uploadInfo)
}
}
// suspend fun partialReceipt(uploadInfo: UploadInfo): ApiResponse<Boolean> {
// return safeApiCall {
// apiService.partialReceipt(uploadInfo = uploadInfo)
// }
// }
/**
* 全部收货
@@ -198,11 +198,11 @@ class RemoteRepository @Inject constructor(
}
}
suspend fun selfPurchaseGoodsAddUnit(addParam: GoodsPurchaseUnitParam): ApiResponse<Boolean> {
return safeApiCall {
apiService.goodsAddUnit(purchaseUnitParam = addParam)
}
}
// suspend fun selfPurchaseGoodsAddUnit(addParam: GoodsPurchaseUnitParam): ApiResponse<Boolean> {
// return safeApiCall {
// apiService.goodsAddUnit(purchaseUnitParam = addParam)
// }
// }
/**
* 自采购-入库
@@ -27,29 +27,29 @@ class DeviceViewModel @Inject constructor(
/**
* 获取token
*/
fun getDeviceToken(deviceId: String = GlobalData.deviceId) {
launchWithLoading {
val response = repository.getDeviceToken(deviceId)
if (parseResponse(response)) {
val response1 = repository.getDeviceInfo(deviceId, response.result!!)
if (parseResponse(response1)) {
val equipmentInfo = response1.result
if (equipmentInfo == null) return@launchWithLoading
try {
parseEquipmentInfo(equipmentInfo)
SPUtil.getInstance()
.put(GlobalKey.KEY_EQUIPMENT_INFO, GsonUtils.toJson(equipmentInfo))
_deviceInfoResult.value = true
} catch (e: Exception) {
Timber.e(e)
}
} else {
//ToastUtils.showToast("获取设备信息失败")
}
}
}
}
// fun getDeviceToken(deviceId: String = GlobalData.deviceId) {
// launchWithLoading {
// val response = repository.getDeviceToken(deviceId)
// if (parseResponse(response)) {
// val response1 = repository.getDeviceInfo(deviceId, response.result!!)
//
// if (parseResponse(response1)) {
// val equipmentInfo = response1.result
// if (equipmentInfo == null) return@launchWithLoading
// try {
// parseEquipmentInfo(equipmentInfo)
// SPUtil.getInstance()
// .put(GlobalKey.KEY_EQUIPMENT_INFO, GsonUtils.toJson(equipmentInfo))
// _deviceInfoResult.value = true
// } catch (e: Exception) {
// Timber.e(e)
// }
// } else {
// //ToastUtils.showToast("获取设备信息失败")
// }
// }
// }
// }
/**
* 检查缓存数据
@@ -39,16 +39,16 @@ class UserViewModel @Inject constructor(
//}
}
fun login(userName: String, password: String) = launchWithLoading {
val loginParam = LoginParam(userName = userName, password = password)
val response = repo.login(loginParam)
if (parseResponse(response)) {
SPUtil.getInstance().put(GlobalKey.KEY_USER_NAME, userName)
_user.value = response.result
saveToken(response.result)
response.result?.token
}
}
// fun login(userName: String, password: String) = launchWithLoading {
// val loginParam = LoginParam(userName = userName, password = password)
// val response = repo.login(loginParam)
// if (parseResponse(response)) {
// SPUtil.getInstance().put(GlobalKey.KEY_USER_NAME, userName)
// _user.value = response.result
// saveToken(response.result)
// response.result?.token
// }
// }
fun getUserInfo() {
val userInfo = SPUtil.getInstance().get(GlobalKey.KEY_USER_INFO, "")