diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java index 86ac901..046cf0f 100644 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -79,13 +79,13 @@ private String jobStatusName; private String alarmValue; private String alarmId; - private int alarmLevel; + private String alarmLevel; private String handleJobTime; private String tel; private String id; private String wellId; private String jobType; - private int editable; + private String editable; private String alarmTime; private String alarmMessage; private String staff; @@ -235,11 +235,11 @@ this.alarmId = alarmId; } - public int getAlarmLevel() { + public String getAlarmLevel() { return alarmLevel; } - public void setAlarmLevel(int alarmLevel) { + public void setAlarmLevel(String alarmLevel) { this.alarmLevel = alarmLevel; } @@ -283,11 +283,11 @@ this.jobType = jobType; } - public int getEditable() { + public String getEditable() { return editable; } - public void setEditable(int editable) { + public void setEditable(String editable) { this.editable = editable; } diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java index 86ac901..046cf0f 100644 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -79,13 +79,13 @@ private String jobStatusName; private String alarmValue; private String alarmId; - private int alarmLevel; + private String alarmLevel; private String handleJobTime; private String tel; private String id; private String wellId; private String jobType; - private int editable; + private String editable; private String alarmTime; private String alarmMessage; private String staff; @@ -235,11 +235,11 @@ this.alarmId = alarmId; } - public int getAlarmLevel() { + public String getAlarmLevel() { return alarmLevel; } - public void setAlarmLevel(int alarmLevel) { + public void setAlarmLevel(String alarmLevel) { this.alarmLevel = alarmLevel; } @@ -283,11 +283,11 @@ this.jobType = jobType; } - public int getEditable() { + public String getEditable() { return editable; } - public void setEditable(int editable) { + public void setEditable(String editable) { this.editable = editable; } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 01fece1..fd32337 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.utils.retrofit import okhttp3.MultipartBody +import okhttp3.RequestBody import retrofit2.http.* interface RetrofitService { @@ -38,7 +39,7 @@ /** * 获取闸井类别 */ - @GET("/dict/code/sluicewellType") + @GET("/sys/dict/code/sluicewellType") suspend fun obtainWellType(@Header("token") token: String): String /** @@ -228,25 +229,19 @@ /** * 工单状态 * */ - @GET("/dict/code/jobStatus") + @GET("/sys/dict/code/jobStatus") suspend fun obtainOrderStatus( @Header("token") token: String ): String /** + * TODO 特定POST请求 * 查询工单 * */ - @GET("/job/searchList") + @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Query("keywords") keywords: String?, - @Query("alarmContent") alarmContent: String?, - @Query("alarmLevel") alarmLevel: String?, - @Query("jobStatus") jobStatus: String?, - @Query("beginTime") beginTime: String?, - @Query("endTime") endTime: String?, - @Query("limit") limit: Int, - @Query("offset") offset: Int + @Body requestBody: RequestBody ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java index 86ac901..046cf0f 100644 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -79,13 +79,13 @@ private String jobStatusName; private String alarmValue; private String alarmId; - private int alarmLevel; + private String alarmLevel; private String handleJobTime; private String tel; private String id; private String wellId; private String jobType; - private int editable; + private String editable; private String alarmTime; private String alarmMessage; private String staff; @@ -235,11 +235,11 @@ this.alarmId = alarmId; } - public int getAlarmLevel() { + public String getAlarmLevel() { return alarmLevel; } - public void setAlarmLevel(int alarmLevel) { + public void setAlarmLevel(String alarmLevel) { this.alarmLevel = alarmLevel; } @@ -283,11 +283,11 @@ this.jobType = jobType; } - public int getEditable() { + public String getEditable() { return editable; } - public void setEditable(int editable) { + public void setEditable(String editable) { this.editable = editable; } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 01fece1..fd32337 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.utils.retrofit import okhttp3.MultipartBody +import okhttp3.RequestBody import retrofit2.http.* interface RetrofitService { @@ -38,7 +39,7 @@ /** * 获取闸井类别 */ - @GET("/dict/code/sluicewellType") + @GET("/sys/dict/code/sluicewellType") suspend fun obtainWellType(@Header("token") token: String): String /** @@ -228,25 +229,19 @@ /** * 工单状态 * */ - @GET("/dict/code/jobStatus") + @GET("/sys/dict/code/jobStatus") suspend fun obtainOrderStatus( @Header("token") token: String ): String /** + * TODO 特定POST请求 * 查询工单 * */ - @GET("/job/searchList") + @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Query("keywords") keywords: String?, - @Query("alarmContent") alarmContent: String?, - @Query("alarmLevel") alarmLevel: String?, - @Query("jobStatus") jobStatus: String?, - @Query("beginTime") beginTime: String?, - @Query("endTime") endTime: String?, - @Query("limit") limit: Int, - @Query("offset") offset: Int + @Body requestBody: RequestBody ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index 99e655a..73e9801 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -190,26 +190,8 @@ /** * 查询工单 */ - suspend fun obtainSearchResult( - keywords: String?, - alarmContent: String?, - alarmLevel: String?, - jobStatus: String?, - beginTime: String?, - endTime: String?, - page: Int - ): String { - return api.obtainSearchResult( - AuthenticationHelper.token!!, - keywords, - alarmContent, - alarmLevel, - jobStatus, - beginTime, - endTime, - LocaleConstant.PAGE_LIMIT, - page - ) + suspend fun obtainSearchResult(requestBody: RequestBody): String { + return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java index 86ac901..046cf0f 100644 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -79,13 +79,13 @@ private String jobStatusName; private String alarmValue; private String alarmId; - private int alarmLevel; + private String alarmLevel; private String handleJobTime; private String tel; private String id; private String wellId; private String jobType; - private int editable; + private String editable; private String alarmTime; private String alarmMessage; private String staff; @@ -235,11 +235,11 @@ this.alarmId = alarmId; } - public int getAlarmLevel() { + public String getAlarmLevel() { return alarmLevel; } - public void setAlarmLevel(int alarmLevel) { + public void setAlarmLevel(String alarmLevel) { this.alarmLevel = alarmLevel; } @@ -283,11 +283,11 @@ this.jobType = jobType; } - public int getEditable() { + public String getEditable() { return editable; } - public void setEditable(int editable) { + public void setEditable(String editable) { this.editable = editable; } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 01fece1..fd32337 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.utils.retrofit import okhttp3.MultipartBody +import okhttp3.RequestBody import retrofit2.http.* interface RetrofitService { @@ -38,7 +39,7 @@ /** * 获取闸井类别 */ - @GET("/dict/code/sluicewellType") + @GET("/sys/dict/code/sluicewellType") suspend fun obtainWellType(@Header("token") token: String): String /** @@ -228,25 +229,19 @@ /** * 工单状态 * */ - @GET("/dict/code/jobStatus") + @GET("/sys/dict/code/jobStatus") suspend fun obtainOrderStatus( @Header("token") token: String ): String /** + * TODO 特定POST请求 * 查询工单 * */ - @GET("/job/searchList") + @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Query("keywords") keywords: String?, - @Query("alarmContent") alarmContent: String?, - @Query("alarmLevel") alarmLevel: String?, - @Query("jobStatus") jobStatus: String?, - @Query("beginTime") beginTime: String?, - @Query("endTime") endTime: String?, - @Query("limit") limit: Int, - @Query("offset") offset: Int + @Body requestBody: RequestBody ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index 99e655a..73e9801 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -190,26 +190,8 @@ /** * 查询工单 */ - suspend fun obtainSearchResult( - keywords: String?, - alarmContent: String?, - alarmLevel: String?, - jobStatus: String?, - beginTime: String?, - endTime: String?, - page: Int - ): String { - return api.obtainSearchResult( - AuthenticationHelper.token!!, - keywords, - alarmContent, - alarmLevel, - jobStatus, - beginTime, - endTime, - LocaleConstant.PAGE_LIMIT, - page - ) + suspend fun obtainSearchResult(requestBody: RequestBody): String { + return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 258566b..e6cc646 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -27,6 +27,9 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* +import okhttp3.MediaType.Companion.toMediaTypeOrNull +import okhttp3.RequestBody +import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -149,15 +152,19 @@ } private fun obtainSearchResult() { - searchOrderViewModel.obtainSearchResult( - keywords = args[0], - alarmContent = args[1], - alarmLevel = args[2], - jobStatus = args[3], - beginTime = args[4], - endTime = args[5], - page = pageIndex + val paramObject = JSONObject() + paramObject.put("keywords", args[0]) + paramObject.put("alarmContent", args[1]) + paramObject.put("alarmLevel", args[2]) + paramObject.put("jobStatus", args[3]) + paramObject.put("beginTime", args[4]) + paramObject.put("endTime", args[5]) + paramObject.put("limit", LocaleConstant.PAGE_LIMIT) + paramObject.put("offset", pageIndex) + val requestBody = RequestBody.create( + "application/json;charset=UTF-8".toMediaTypeOrNull(), paramObject.toString() ) + searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java index 86ac901..046cf0f 100644 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -79,13 +79,13 @@ private String jobStatusName; private String alarmValue; private String alarmId; - private int alarmLevel; + private String alarmLevel; private String handleJobTime; private String tel; private String id; private String wellId; private String jobType; - private int editable; + private String editable; private String alarmTime; private String alarmMessage; private String staff; @@ -235,11 +235,11 @@ this.alarmId = alarmId; } - public int getAlarmLevel() { + public String getAlarmLevel() { return alarmLevel; } - public void setAlarmLevel(int alarmLevel) { + public void setAlarmLevel(String alarmLevel) { this.alarmLevel = alarmLevel; } @@ -283,11 +283,11 @@ this.jobType = jobType; } - public int getEditable() { + public String getEditable() { return editable; } - public void setEditable(int editable) { + public void setEditable(String editable) { this.editable = editable; } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 01fece1..fd32337 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -1,6 +1,7 @@ package com.casic.app.smartwell.utils.retrofit import okhttp3.MultipartBody +import okhttp3.RequestBody import retrofit2.http.* interface RetrofitService { @@ -38,7 +39,7 @@ /** * 获取闸井类别 */ - @GET("/dict/code/sluicewellType") + @GET("/sys/dict/code/sluicewellType") suspend fun obtainWellType(@Header("token") token: String): String /** @@ -228,25 +229,19 @@ /** * 工单状态 * */ - @GET("/dict/code/jobStatus") + @GET("/sys/dict/code/jobStatus") suspend fun obtainOrderStatus( @Header("token") token: String ): String /** + * TODO 特定POST请求 * 查询工单 * */ - @GET("/job/searchList") + @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Query("keywords") keywords: String?, - @Query("alarmContent") alarmContent: String?, - @Query("alarmLevel") alarmLevel: String?, - @Query("jobStatus") jobStatus: String?, - @Query("beginTime") beginTime: String?, - @Query("endTime") endTime: String?, - @Query("limit") limit: Int, - @Query("offset") offset: Int + @Body requestBody: RequestBody ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index 99e655a..73e9801 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -190,26 +190,8 @@ /** * 查询工单 */ - suspend fun obtainSearchResult( - keywords: String?, - alarmContent: String?, - alarmLevel: String?, - jobStatus: String?, - beginTime: String?, - endTime: String?, - page: Int - ): String { - return api.obtainSearchResult( - AuthenticationHelper.token!!, - keywords, - alarmContent, - alarmLevel, - jobStatus, - beginTime, - endTime, - LocaleConstant.PAGE_LIMIT, - page - ) + suspend fun obtainSearchResult(requestBody: RequestBody): String { + return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 258566b..e6cc646 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -27,6 +27,9 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* +import okhttp3.MediaType.Companion.toMediaTypeOrNull +import okhttp3.RequestBody +import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -149,15 +152,19 @@ } private fun obtainSearchResult() { - searchOrderViewModel.obtainSearchResult( - keywords = args[0], - alarmContent = args[1], - alarmLevel = args[2], - jobStatus = args[3], - beginTime = args[4], - endTime = args[5], - page = pageIndex + val paramObject = JSONObject() + paramObject.put("keywords", args[0]) + paramObject.put("alarmContent", args[1]) + paramObject.put("alarmLevel", args[2]) + paramObject.put("jobStatus", args[3]) + paramObject.put("beginTime", args[4]) + paramObject.put("endTime", args[5]) + paramObject.put("limit", LocaleConstant.PAGE_LIMIT) + paramObject.put("offset", pageIndex) + val requestBody = RequestBody.create( + "application/json;charset=UTF-8".toMediaTypeOrNull(), paramObject.toString() ) + searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 3bcdf0d..7502991 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -12,25 +12,16 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +import okhttp3.RequestBody class SearchOrderViewModel : BaseViewModel() { private val gson = Gson() val listModel = MutableLiveData() - fun obtainSearchResult( - keywords: String?, - alarmContent: String?, - alarmLevel: String?, - jobStatus: String?, - beginTime: String?, - endTime: String?, - page: Int - ) = launch({ + fun obtainSearchResult(requestBody: RequestBody) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainSearchResult( - keywords, alarmContent, alarmLevel, jobStatus, beginTime, endTime, page - ) + val response = RetrofitServiceManager.obtainSearchResult(requestBody) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success