From 63608b5dca9eebb6fa2cb1a8652b395f1d910c3e Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期一, 02 九月 2024 13:52:17 +0800
Subject: [PATCH] 对新接口进行了适配
---
app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java | 195 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 166 insertions(+), 29 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java b/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java
index 5dbf681..b51af92 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java
@@ -7,19 +7,7 @@
import com.application.zhangshi_app_android.bean.CertificateOfHonorBean;
import com.application.zhangshi_app_android.bean.CleanStorageBean;
import com.application.zhangshi_app_android.bean.ContactsDetailBean;
-import com.application.zhangshi_app_android.bean.HealthCareBaseInfoBean;
-import com.application.zhangshi_app_android.bean.HealthCareExistingProblemsBean;
-import com.application.zhangshi_app_android.bean.HealthCareLifeHabitsBean;
-import com.application.zhangshi_app_android.bean.HealthCareNotesContentBean;
-import com.application.zhangshi_app_android.bean.HealthCareNursingExaminationBean;
-import com.application.zhangshi_app_android.bean.HomeDevicesBean;
-import com.application.zhangshi_app_android.bean.HomeMemberBean;
-import com.application.zhangshi_app_android.bean.HomeRootBean;
-import com.application.zhangshi_app_android.bean.HundredWishBean;
-import com.application.zhangshi_app_android.bean.IncomeAndExpensesBean;
-import com.application.zhangshi_app_android.bean.MarriageInfoBean;
-import com.application.zhangshi_app_android.bean.MemoBean;
-import com.application.zhangshi_app_android.bean.PageResponseBean;
+import com.application.zhangshi_app_android.bean.ExaminationInfoBean;
import com.application.zhangshi_app_android.bean.FamilyAssetsBean;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
import com.application.zhangshi_app_android.bean.GrowthExperienceAbroadConditionBean;
@@ -28,20 +16,36 @@
import com.application.zhangshi_app_android.bean.GrowthExperienceHolderConditionBean;
import com.application.zhangshi_app_android.bean.GrowthExperienceInformationBean;
import com.application.zhangshi_app_android.bean.GrowthExperienceRelationshipBean;
+import com.application.zhangshi_app_android.bean.HealthCareBaseInfoBean;
+import com.application.zhangshi_app_android.bean.HealthCareExistingProblemsBean;
+import com.application.zhangshi_app_android.bean.HealthCareLifeHabitsBean;
+import com.application.zhangshi_app_android.bean.HealthCareNotesContentBean;
+import com.application.zhangshi_app_android.bean.HealthCareNursingExaminationBean;
+import com.application.zhangshi_app_android.bean.HomeDevicesBean;
+import com.application.zhangshi_app_android.bean.HomeMemberBean;
+import com.application.zhangshi_app_android.bean.HomeRootBean;
import com.application.zhangshi_app_android.bean.HonorCollectionResponseBean;
+import com.application.zhangshi_app_android.bean.HundredWishBean;
+import com.application.zhangshi_app_android.bean.IncomeAndExpensesBean;
import com.application.zhangshi_app_android.bean.LittleDoctorBean;
import com.application.zhangshi_app_android.bean.LoginRequestBean;
import com.application.zhangshi_app_android.bean.LoginResponseBean;
+import com.application.zhangshi_app_android.bean.MarriageInfoBean;
+import com.application.zhangshi_app_android.bean.MeetingBean;
+import com.application.zhangshi_app_android.bean.MeetingStaBean;
+import com.application.zhangshi_app_android.bean.MemoBean;
+import com.application.zhangshi_app_android.bean.PageResponseBean;
import com.application.zhangshi_app_android.bean.PersonalNotepadBean;
import com.application.zhangshi_app_android.bean.PetBean;
import com.application.zhangshi_app_android.bean.PetMemoBean;
-import com.application.zhangshi_app_android.bean.PetOwnerBean;
import com.application.zhangshi_app_android.bean.PrivacyBean;
import com.application.zhangshi_app_android.bean.PropertyBean;
import com.application.zhangshi_app_android.bean.TourismBean;
import com.application.zhangshi_app_android.bean.TourismExperienceBean;
import com.application.zhangshi_app_android.bean.UpdateVersionBean;
import com.application.zhangshi_app_android.bean.UploadFileResponseBean;
+import com.application.zhangshi_app_android.bean.WebbackBean;
+import com.application.zhangshi_app_android.bean.WebcastBean;
import java.util.List;
import java.util.Map;
@@ -58,7 +62,6 @@
import retrofit2.http.Path;
import retrofit2.http.Query;
import retrofit2.http.QueryMap;
-import retrofit2.http.QueryName;
/**
* @author Ljj
@@ -98,11 +101,88 @@
*/
@DELETE("/family/zfEvent/{ids}")
Observable<ResultData<String>> deleteFamilyMemorabilia(@Path("ids") String ids);
+
+
+
+
+ /**
+ * 鑾峰彇瀹跺ぇ浜嬩欢
+ */
+ @GET("/zMeeting/all")
+ Observable<ResultData<PageResponseBean<MeetingBean>>> getMeeting(@QueryMap Map<String,Object> paramsMap);
+ /**
+ * 澧炲姞瀹跺ぇ浜嬭
+ */
+ @POST("/zMeeting")
+ Observable<ResultData<String>> addMeeting(@Body MeetingBean meetingBean);
+ /**
+ * 鍒犻櫎瀹跺ぇ浜嬭
+ */
+ @DELETE("/zMeeting/{ids}")
+ Observable<ResultData<String>> deleteMeeting(@Path("ids") String ids);
+ /**
+ * 淇敼瀹跺ぇ浜嬭
+ */
+ @PUT("/zMeeting")
+ Observable<ResultData<String>> updateMeeting(@Body MeetingBean meetingBean);
+
+ @PUT("/zMeetingRatify")
+ Observable<ResultData<String>> approveMeeting(@Body Integer statu);
+
+ @GET("/zMeetingStatistic/all")
+ Observable<ResultData<PageResponseBean<MeetingStaBean>>> getMeetingSta(@QueryMap Map<String,Object> paramsMap);
+
+ /**
+ * 澧炲姞瀹跺ぇ浜嬭
+ */
+ @POST("/zMeetingStatistic")
+ Observable<ResultData<String>> addMeetingSta(@Body MeetingStaBean meetingStaBean);
+ /**
+ * 鍒犻櫎瀹跺ぇ浜嬭
+ */
+ @DELETE("/zMeetingStatistic/{ids}")
+ Observable<ResultData<String>> deleteMeetingSta(@Path("ids") String ids);
+ /**
+ * 淇敼瀹跺ぇ浜嬭
+ */
+ @PUT("/zMeetingStatistic")
+ Observable<ResultData<String>> updateMeetingSta(@Body MeetingStaBean meetingStaBean);
+
+
+
+
+
+//鐩存挱鐢宠
+ @POST("/zLiveStreaming")
+ Observable<ResultData<String>> addWebcast(@Body WebcastBean webcastBean);
+ @GET("/zLiveStreaming/all")
+ Observable<ResultData<PageResponseBean<WebcastBean>>> getWebcast(@QueryMap Map<String,Object> paramsMap);
+
+ //鐩存挱鍥炴斁
+ @GET("/zLiveStreamingBack/all")
+ Observable<ResultData<PageResponseBean<WebbackBean>>> getWebback(@QueryMap Map<String,Object> paramsMap);
+
+
+
+
+
+
+
+
+
+ /**
+ * 鍒犻櫎淇濆吇
+ */
+ @DELETE("/zMeeting/{ids}")
+ Observable<ResultData<String>> deleteText(@Path("ids") String ids);
+
+
/**
* 淇敼瀹跺ぇ浜嬭
*/
@PUT("/family/zfEvent")
Observable<ResultData<String>> updateFamilyMemorabilia(@Body FamilyMemorabiliaBean familyMemorabiliaBean);
+
/**
@@ -118,8 +198,11 @@
@GET("/family/property/all")
Observable<ResultData<PageResponseBean<FamilyAssetsBean>>> getFamilyAssets(@QueryMap Map<String, Object> paramsMap);
- /**
- * 鑾峰彇瀹跺涵璁惧
+
+
+
+
+ /** * 鑾峰彇瀹跺涵璁惧
*/
@GET("/zfEquipment/all")
Observable<ResultData<PageResponseBean<HomeDevicesBean>>> getHomeDevices(@QueryMap Map<String, Object> paramsMap);
@@ -207,7 +290,7 @@
* 淇敼鎴愰暱缁忓巻涓汉淇℃伅
*/
@PUT("/self/user")
-Observable<ResultData<String>> updateGrowthExperienceInformation(@Body GrowthExperienceInformationBean growthExperienceInformationBean);
+ Observable<ResultData<String>> updateGrowthExperienceInformation(@Body GrowthExperienceInformationBean growthExperienceInformationBean);
/**
* 鑾峰彇鎴愰暱缁忓巻锛堜富瑕佸涔犲強宸ヤ綔缁忓巻锛�
@@ -245,6 +328,12 @@
Observable<ResultData<PageResponseBean<ContactsDetailBean>>> getContacts(@QueryMap Map<String, Object> paramsMap);
/**
+ * 娣诲姞閫氳褰�
+ */
+ @POST("/zfContact")
+ Observable<ResultData<String>> addContacts(@Body ContactsDetailBean contactsDetailBean);
+
+ /**
* 鑾峰彇淇濇磥鏀剁撼
*/
@GET("/zfClean/all")
@@ -272,7 +361,7 @@
/**
* 鑾峰彇涓汉濠氬Щ淇℃伅
*/
- @GET("/zMarry/list")
+ @GET("/marrySelf")
Observable<ResultData<MarriageInfoBean>> getMarriageInfo();
/**
@@ -339,49 +428,54 @@
/**
* 鑾峰彇鏃呮父璐圭敤璁板綍
*/
- @GET("/zTravelPrice/all")
+ @GET("/travel/count/all")
Observable<ResultData<PageResponseBean<TourismBean>>> getTourism(@QueryMap Map<String, Object> toMap);
+
+ /**鏍规嵁id鑾峰彇鏃呮父璐圭敤璁板綍
+ */
+ @GET("/travel/count/{id}")
+ Observable<ResultData<TourismBean>> getTourismById(@Path("id") String id);
/**
* 娣诲姞鏃呮父璐圭敤璁板綍
*/
- @POST("/zTravelPrice")
+ @POST("/travel/count")
Observable<ResultData<String>> addTourism(@Body TourismBean tourismBean);
/**
* 鍒犻櫎鏃呮父璐圭敤璁板綍
*/
- @DELETE("/zTravelPrice/{ids}")
+ @DELETE("/travel/count/{ids}")
Observable<ResultData<String>> deleteTourism(@Path("ids") String ids);
/**
* 淇敼鏃呮父璐圭敤璁板綍
*/
- @PUT("/zTravelPrice")
+ @PUT("/travel/count")
Observable<ResultData<String>> updateTourism(@Body TourismBean tourismBean);
/**
* 鑾峰彇鏃呮父缁忓巻
*/
- @GET("/zTravelBase/all")
- Observable<ResultData<PageResponseBean<TourismExperienceBean>>> getTourismExperience(@QueryMap Map<String, Object> toMap);
+ @GET("/travel/detail")
+ Observable<ResultData<List<TourismExperienceBean>>> getTourismExperience(@QueryMap Map<String, Object> toMap);
/**
* 鏂板鏃呮父缁忓巻
*/
- @POST("/zTravelBase")
+ @POST("/travel/detail")
Observable<ResultData<String>> addTourismExperience(@Body TourismExperienceBean tourismExperienceBean);
/**
* 鍒犻櫎鏃呮父缁忓巻
*/
- @DELETE("/zTravelBase/{ids}")
+ @DELETE("/travel/detail/{ids}")
Observable<ResultData<String>> deleteTourismExperience(@Path("ids") String ids);
/**
* 淇敼鏃呮父缁忓巻
*/
- @PUT("/zTravelBase")
+ @PUT("/travel/detail")
Observable<ResultData<String>> updateTourismExperience(@Body TourismExperienceBean tourismExperienceBean);
/**
@@ -421,7 +515,7 @@
* @return
*/
@GET("/self/user/root")
- Observable<ResultData<List<HomeRootBean>>> getHomeRoot(@Query("depth") String depth);
+ Observable<ResultData<List<HomeRootBean>>> getHomeRoot(@Query("depth") String depth, @Query("clanId") String clanId);
/**
* 鑾峰彇骞村害鍋ュ悍鐘跺喌
@@ -453,6 +547,23 @@
@GET("/rotation/all")
Observable<ResultData<List<BannerBean>>> getBannerData();
+ /**
+ * 娣诲姞杞挱鍥炬暟鎹�
+ */
+ @POST("/rotation/add")
+ Observable<ResultData<String>> addBannerData(@Body BannerBean bannerBean);
+
+ /**
+ * 鍒犻櫎杞挱鍥炬暟鎹�
+ */
+ @DELETE("/rotation/delete/{ids}")
+ Observable<ResultData<String>> deleteBannerData(@Path("ids") String ids);
+
+ /**
+ * 淇敼杞挱鍥炬暟鎹�
+ */
+ @PUT("/rotation")
+ Observable<ResultData<String>> updateBannerData(@Body BannerBean bannerBean);
/**
* 鑾峰彇鍋ュ悍淇濆仴鍩烘湰淇℃伅
@@ -519,4 +630,30 @@
*/
@GET("/version")
Observable<ResultData<UpdateVersionBean>> getUpdateVersion();
+
+ /**
+ * 鑾峰彇鍘嗗勾浣撴鎶ュ憡
+ */
+ @GET("/physcial/all")
+ Observable<ResultData<PageResponseBean<ExaminationInfoBean>>> getExaminationInfo(@QueryMap Map<String, Object> toMap);
+
+ /**
+ * 鍒犻櫎鍘嗗勾浣撴鎶ュ憡
+ */
+ @DELETE("/physcial/{ids}")
+ Observable<ResultData<String>> deleteExaminationInfo(@Path("ids") String ids);
+
+ /**
+ * 淇敼鍘嗗勾浣撴鎶ュ憡
+ */
+ @PUT("/physcial")
+ Observable<ResultData<String>> updateExaminationInfo(@Body ExaminationInfoBean examinationInfoBean);
+
+ /**
+ * 娣诲姞鍘嗗勾浣撴鎶ュ憡
+ */
+ @POST("/physcial")
+ Observable<ResultData<String>> addExaminationInfo(@Body ExaminationInfoBean examinationInfoBean);
+
+
}
--
Gitblit v1.9.1