接口联调

app/src/main/java/com/sw/dualscreen/network/api/ApiService.kt

@@ -3,16 +3,16 @@ package com.sw.dualscreen.network.api
 import com.sw.dualscreen.GlobalData
 import com.sw.dualscreen.model.request.UserNutritionParam
 import com.sw.dualscreen.model.response.ApiResponse
-import com.sw.dualscreen.model.response.DinnerTypeInfo
-import com.sw.dualscreen.model.response.EquipmentInfo
+import com.sw.dualscreen.model.response.DinnerType
 import com.sw.dualscreen.model.response.FoodInfo
-import com.sw.dualscreen.model.response.UserFaceInfo
+import com.sw.dualscreen.model.response.FoodSearchReq
+import com.sw.dualscreen.model.response.UserFaceModel
 import com.sw.dualscreen.model.response.UserNutritionData
+import com.sw.dualscreen.objbox.CollectedFoodInfo
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import retrofit2.http.Body
 import retrofit2.http.GET
-import retrofit2.http.Header
 import retrofit2.http.Multipart
 import retrofit2.http.POST
 import retrofit2.http.Part
@@ -25,41 +25,54 @@ 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>
 
     /**
      * 获取业务服务器token
      */
-    @GET
-    suspend fun getEquipmentToken(
-        @Url url: String = "${GlobalData.appBaseUrl}/sys/getEquipmentToken",
-        @Query("appVersion") appVersion: String = GlobalData.appVersion,
-        @Query("qrcodeId") qrcodeId: String
-    ): ApiResponse<String>
+//    @GET
+//    suspend fun getEquipmentToken(
+//        @Url url: String = "${GlobalData.appBaseUrl}/sys/getEquipmentToken",
+//        @Query("appVersion") appVersion: String = GlobalData.appVersion,
+//        @Query("qrcodeId") qrcodeId: String
+//    ): ApiResponse<String>
 
     /**
      * 获取人脸数据
      */
-    @GET
+    @POST
     suspend fun getUserFaceCache(
-        @Url url: String = "${GlobalData.appBaseUrl}/stapi/cquser/getUserFaceCache/v2",
-        @Query("appVersion") appVersion: String = GlobalData.appVersion,
-        @Query("pageIndex") pageIndex: Int
-    ): ApiResponse<UserFaceInfo>
+//        @Url url: String = "${GlobalData.appBaseUrl}/stapi/cquser/getUserFaceCache/v2",
+        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/common/app/faceFeature/list",
+//        @Query("appVersion") appVersion: String = GlobalData.appVersion,
+//        @Query("pageIndex") pageIndex: Int
+        @Body param: Map<String, Int>
+//        @Query("pageNum") pageNum: Int,
+//        @Query("pageSize") pageSize: Int
+    ): ApiResponse<List<UserFaceModel>>
+
+    /**
+     * 获取已采集数据列表
+     */
+    @POST
+    suspend fun getCollectedFoodList(
+        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/boothMachine/app/dishPage",
+        @Body param: Map<String, Int>
+    ): ApiResponse<List<CollectedFoodInfo>>
 
 
     /**
@@ -67,11 +80,14 @@ interface ApiService {
      */
     @GET
     suspend fun getRestInfoFoodsByType(
-        @Url url: String = "${GlobalData.appBaseUrl}/zhstapi/zhst/getRestInfoFoodsByType/stall",
-        @Query("appVersion") appVersion: String = GlobalData.appVersion,
-        @Query("restId") restId: String,
-        @Query("type") type: Int,
-        @Query("foodName") foodName: String,
+//        @Url url: String = "${GlobalData.appBaseUrl}/zhstapi/zhst/getRestInfoFoodsByType/stall",
+//        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/boothMachine/app/getFoodsByFoodNamePage",
+        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/boothMachine/app/getFoodsByFoodNameList",
+        @Query("name") foodName: String,
+//        @Query("appVersion") appVersion: String = GlobalData.appVersion,
+//        @Query("restId") restId: String,
+//        @Query("type") type: Int,
+//        @Query("foodName") foodName: String,
     ): ApiResponse<List<FoodInfo>>
 
     /**
@@ -91,10 +107,11 @@ interface ApiService {
      */
     @GET
     suspend fun getDinnerType(
-        @Url url: String = "${GlobalData.appBaseUrl}/zhstapi/zhst/getCanteenDinnerType",
-        @Query("appVersion") appVersion: String = GlobalData.appVersion,
-        @Query("canteenId") restId: String,
-    ): ApiResponse<DinnerTypeInfo>
+//        @Url url: String = "${GlobalData.appBaseUrl}/zhstapi/zhst/getCanteenDinnerType",
+        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/boothMachine/app/getRegionRule",
+//        @Query("appVersion") appVersion: String = GlobalData.appVersion,
+//        @Query("canteenId") restId: String,
+    ): ApiResponse<DinnerType>
 
     /**
      * 提交就餐数据
@@ -108,11 +125,13 @@ interface ApiService {
     /**
      * 获取菜品信息
      */
-    @GET
+    @POST
     suspend fun getFoodInfo(
-        @Url url: String = "${GlobalData.appBaseUrl}/zhstapi/zhst/getRestInfoFoodsByType/stall/v2",
-        @Query("restId") restId: String,
-        @Query("foodNames") foodName: String,
+//        @Url url: String = "${GlobalData.appBaseUrl}/zhstapi/zhst/getRestInfoFoodsByType/stall/v2",
+        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/boothMachine/app/goodsList",
+//        @Query("restId") restId: String,
+//        @Query("foodNames") foodName: String
+        @Body req: FoodSearchReq
     ): ApiResponse<List<FoodInfo>>
 
 
@@ -121,10 +140,11 @@ interface ApiService {
      */
     @Multipart
     @POST
-    suspend fun postImageData(
-        @Url url: String = "http://192.168.1.201:14801/terminal/neglect/dishCollectionVectorData/add",
-        @PartMap params: Map<String, @JvmSuppressWildcards RequestBody>,
-        @Part image: MultipartBody.Part?
+    suspend fun uploadCollectFoodPics(
+//        @Url url: String = "http://192.168.1.201:14801/terminal/neglect/dishCollectionVectorData/add",
+        @Url url: String = "http://192.168.1.201:14801/terminal/neglect/boothMachine/app/dishCollectionVectorData/add",
+        @PartMap params: HashMap<String, RequestBody>,
+        @Part foodPics: List<MultipartBody.Part>
     ): ApiResponse<String>
 
 }

app/src/main/java/com/sw/dualscreen/network/interceptor/RequestInterceptor.kt

@@ -1,6 +1,7 @@
 package com.sw.dualscreen.network.interceptor
 
 import android.text.TextUtils
+import com.sw.dualscreen.GlobalData
 import com.sw.dualscreen.GlobalKey
 import com.sw.dualscreen.utils.SPUtil
 import com.sw.plate.App
@@ -18,7 +19,10 @@ class RequestInterceptor : Interceptor {
             .header("Content-Type", "application/json")
             .header("Accept", "application/json")
 //            .header("Authorization", "Bearer ${getToken()}")
-            .header("X-Access-Token", getToken(originalRequest))
+//            .header("X-Access-Token", getToken(originalRequest))
+//            .header("X-DEVICE-CODE", "bcf396ed-78f6-3864-9837-7c37c5b2ec41")
+            .header("X-DEVICE-CODE", GlobalData.deviceId)
+            .header("authorization", "57ee87183f2a4fa59683ec9ef41c8f5d")
 
         val newRequest = requestBuilder.build()