Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

6 天以前 dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/http/Apis.java

@@ -21,12 +21,14 @@
import retrofit2.http.Query;

public interface Apis {
    String HTTP = "http://192.168.0.112:8086/";
    //测试服
    //String HTTP = "http://192.168.1.45:10010/";
    String HTTP = "http://192.168.0.212/system_gateway/";
    String HEAT_HTTP = "do?c=220301";
    /**
     * 查询版本信息
     */
    @GET("/visitsAdmin/cloudService/web/cabinet/getLastVersion")
    @GET("visitsAdmin/cloudService/web/cabinet/getLastVersion")
    Observable<BaseResponse<AndroidVersionBean>> getVersion();

    /**
@@ -34,13 +36,13 @@
     * @param code
     * @return
     */
    @GET("/visitsAdmin/cloudService/web/cabinet/getCabinetInfoForDriver")
    @GET("visitsAdmin/cloudService/web/cabinet/getCabinetInfoForDriver")
    Observable<BaseResponse<DevConfigBean>> getCabinetInfoForDriver(@Query("code")String code);

    /**
     * 心跳
     */
    @GET("/visitsAdmin/cloudService/web/cabinet/updateRunStatusById")
    @GET("visitsAdmin/cloudService/web/cabinet/updateRunStatusById")
    Observable<BaseResponse> heart(@Query("id")Integer id);

    /**
@@ -52,67 +54,79 @@
    /**
     * 人脸列表
     */
    @POST("/visitsAdmin/cloudService/web/cabinet/getCabinetFaceVO")
    Observable<BaseResponse<CabinetFaceBean>> allFaceList(@Body RequestBody requestBody);
    @GET("visitsAdmin/cloudService/web/cabinet/getCabinetFaceVO")
    Observable<BaseResponse<CabinetFaceBean>> allFaceList(@Query("code")String code);

     /**
     * 获取可操作柜格 - 司机
     * 获取IC卡用户主键 - 司机
     */
    @POST("/visitsAdmin/cloudService/web/cabinet/getMemberIdByCode")
    Observable<BaseResponse<Integer>> getMemberIdByCode(@Body RequestBody requestBody);
    @POST("visitsAdmin/cloudService/web/cabinet/getMemberIdByCode")
    Observable<BaseResponse<Integer>> getMemberIdByCode(@Query("code")String code);

    /**
     * 酒精检测告警
     */
    @POST("visitsAdmin/cloudService/web/cabinet/alcoholTestAlarm")
    Observable<BaseResponse> alcoholTestAlarm(@Body RequestBody requestBody);

    /**
     * 获取可操作柜格 - 司机
     */
    @POST("/visitsAdmin/cloudService/web/cabinet/getDriverGrid")
    @POST("visitsAdmin/cloudService/web/cabinet/getDriverGrid")
    Observable<BaseResponse<List<KeyCabinetBean>>> getDriverGrid(@Body RequestBody requestBody);

    /**
     * 开启柜格 - 司机
     */
    @POST("/visitsAdmin/cloudService/web/cabinet/openGridDriver")
    @POST("visitsAdmin/cloudService/web/cabinet/openGridDriver")
    Observable<BaseResponse> openGridDriver(@Body RequestBody requestBody);

    /**
     * 关闭柜格 - 司机
     * 柜格开门超时未关闭告警
     */
    @POST("/visitsAdmin/cloudService/web/cabinet/closeGrid")
    @POST("visitsAdmin/cloudService/web/cabinet/timeOutUnCloseAlarm")
    Observable<BaseResponse> timeOutUnCloseAlarm(@Body RequestBody requestBody);

    /**
     * 关闭柜格
     */
    @POST("visitsAdmin/cloudService/web/cabinet/closeGrid")
    Observable<BaseResponse> closeGrid(@Body RequestBody requestBody);

    /**
     * 获取钥匙柜详情 - 管理员
     */
    @GET("/visitsAdmin/cloudService/web/cabinet/getCabinetDetail")
    @GET("visitsAdmin/cloudService/web/cabinet/getCabinetDetail")
    Observable<BaseResponse<CabinetDetailBean>> getCabinetDetail(@Header("dm_user_token") String token,@Query("cabinetId")Integer cabinetId);

    /**
     * 批量开门 - 管理员
     */
    @POST("/visitsAdmin/cloudService/web/cabinet/batchOpenGridAdmin")
    @POST("visitsAdmin/cloudService/web/cabinet/batchOpenGridAdmin")
    Observable<BaseResponse> batchOpenGridAdmin(@Header("dm_user_token") String token,@Body RequestBody requestBody);

    /**
     * 标记柜格正常 - 管理员
     */
    @POST("/visitsAdmin/cloudService/web/cabinet/cancelFault")
    @POST("visitsAdmin/cloudService/web/cabinet/cancelFault")
    Observable<BaseResponse> cancelFault(@Header("dm_user_token") String token,@Body RequestBody requestBody);

    /**
     * 标记柜格故障 - 管理员
     */
    @POST("/visitsAdmin/cloudService/web/cabinet/markFault")
    @POST("visitsAdmin/cloudService/web/cabinet/markFault")
    Observable<BaseResponse> markFault(@Header("dm_user_token") String token,@Body RequestBody requestBody);

    /**
     * 标记维修保养 - 管理员
     */
    @POST("/visitsAdmin/cloudService/web/cabinet/markRepair")
    @POST("visitsAdmin/cloudService/web/cabinet/markRepair")
    Observable<BaseResponse> markRepair(@Header("dm_user_token") String token,@Body RequestBody requestBody);

    /**
     * 标记维修保养 - 管理员
     * 登陆 - 管理员
     */
    @POST("/loginCabinet")
    @POST("loginCabinet")
    Observable<BaseResponse<String>> loginCabinet(@Body RequestBody requestBody);

}