diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt index 10c25b4..91d3adc 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt @@ -172,12 +172,17 @@ override fun onConfirmClick( spinnerValue: String, inputValue: String ) { - val alarmId = fragment.dataBeans[position].id + val rowsBean = fragment.dataBeans[position] + val alarmId = rowsBean.jobId if (alarmId.toString().isBlank()) { "操作失败，告警ID异常".show() return } - fragment.alarmViewModel.obtainOperationResult(alarmId!!) + fragment.alarmViewModel.obtainOperationResult( + alarmId!!, + rowsBean.jobStatus, + inputValue + ) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt index 10c25b4..91d3adc 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt @@ -172,12 +172,17 @@ override fun onConfirmClick( spinnerValue: String, inputValue: String ) { - val alarmId = fragment.dataBeans[position].id + val rowsBean = fragment.dataBeans[position] + val alarmId = rowsBean.jobId if (alarmId.toString().isBlank()) { "操作失败，告警ID异常".show() return } - fragment.alarmViewModel.obtainOperationResult(alarmId!!) + fragment.alarmViewModel.obtainOperationResult( + alarmId!!, + rowsBean.jobStatus, + inputValue + ) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt index 40f503b..81764d3 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt @@ -220,10 +220,12 @@ * * @param alarmId 告警ID */ - @GET("/alarm/cancelAlarmById") + @GET("/alarm/cancelAlarm") suspend fun obtainOperationResult( @Header("token") token: String, - @Query("alarmId") alarmId: String + @Query("id") alarmId: String, + @Query("jobStatus") jobStatus: String, + @Query("handleMessage") handleMessage: String ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt index 10c25b4..91d3adc 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt @@ -172,12 +172,17 @@ override fun onConfirmClick( spinnerValue: String, inputValue: String ) { - val alarmId = fragment.dataBeans[position].id + val rowsBean = fragment.dataBeans[position] + val alarmId = rowsBean.jobId if (alarmId.toString().isBlank()) { "操作失败，告警ID异常".show() return } - fragment.alarmViewModel.obtainOperationResult(alarmId!!) + fragment.alarmViewModel.obtainOperationResult( + alarmId!!, + rowsBean.jobStatus, + inputValue + ) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt index 40f503b..81764d3 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt @@ -220,10 +220,12 @@ * * @param alarmId 告警ID */ - @GET("/alarm/cancelAlarmById") + @GET("/alarm/cancelAlarm") suspend fun obtainOperationResult( @Header("token") token: String, - @Query("alarmId") alarmId: String + @Query("id") alarmId: String, + @Query("jobStatus") jobStatus: String, + @Query("handleMessage") handleMessage: String ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt index 4d2727f..bcf1d4d 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt @@ -218,8 +218,12 @@ /** * 消警 */ - suspend fun obtainOperationResult(alarmId: String): String { - return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId) + suspend fun obtainOperationResult( + alarmId: String, jobStatus: String, handleMessage: String + ): String { + return api.obtainOperationResult( + AuthenticationHelper.token!!, alarmId, jobStatus, handleMessage + ) } // /** diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt index 10c25b4..91d3adc 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt @@ -172,12 +172,17 @@ override fun onConfirmClick( spinnerValue: String, inputValue: String ) { - val alarmId = fragment.dataBeans[position].id + val rowsBean = fragment.dataBeans[position] + val alarmId = rowsBean.jobId if (alarmId.toString().isBlank()) { "操作失败，告警ID异常".show() return } - fragment.alarmViewModel.obtainOperationResult(alarmId!!) + fragment.alarmViewModel.obtainOperationResult( + alarmId!!, + rowsBean.jobStatus, + inputValue + ) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt index 40f503b..81764d3 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt @@ -220,10 +220,12 @@ * * @param alarmId 告警ID */ - @GET("/alarm/cancelAlarmById") + @GET("/alarm/cancelAlarm") suspend fun obtainOperationResult( @Header("token") token: String, - @Query("alarmId") alarmId: String + @Query("id") alarmId: String, + @Query("jobStatus") jobStatus: String, + @Query("handleMessage") handleMessage: String ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt index 4d2727f..bcf1d4d 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt @@ -218,8 +218,12 @@ /** * 消警 */ - suspend fun obtainOperationResult(alarmId: String): String { - return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId) + suspend fun obtainOperationResult( + alarmId: String, jobStatus: String, handleMessage: String + ): String { + return api.obtainOperationResult( + AuthenticationHelper.token!!, alarmId, jobStatus, handleMessage + ) } // /** diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/vm/AlarmViewModel.kt index 18bdef3..77bc686 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/vm/AlarmViewModel.kt @@ -122,9 +122,10 @@ it.printStackTrace() }) - fun obtainOperationResult(alarmId: String) = launch({ + fun obtainOperationResult(alarmId: String, jobStatus: String, handleMessage: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainOperationResult(alarmId) + val response = + RetrofitServiceManager.obtainOperationResult(alarmId, jobStatus, handleMessage) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success