|
@@ -71,7 +71,7 @@ public class MercMiniDeviceRecordsController {
|
|
|
DeviceNetRecordDto.Page page =
|
|
|
(DeviceNetRecordDto.Page) new DeviceNetRecordDto.Page()
|
|
|
.setMercId(MercAuthUtils.getMercId());
|
|
|
- if(Emptys.check(dto.getDeviceId())){
|
|
|
+ if (Emptys.check(dto.getDeviceId())) {
|
|
|
page.setDeviceId(dto.getDeviceId());
|
|
|
}
|
|
|
page.setPage(getPageBean(INDEX_RECORDS_COUNT));
|
|
@@ -88,8 +88,10 @@ public class MercMiniDeviceRecordsController {
|
|
|
@ApiOperation("设备详情首页-故障记录")
|
|
|
@PostMapping("indexDeviceError")
|
|
|
public R<List<DeviceErrorsRecordDto.Vo>> indexDeviceError(@RequestBody @Validated MiniDeviceRecordsDto.DeviceErrorPageDto dto) {
|
|
|
- DeviceErrorsRecordDto.Page page = (DeviceErrorsRecordDto.Page) new DeviceErrorsRecordDto.Page().setMercId(MercAuthUtils.getMercId())
|
|
|
- .setDeviceId(dto.getDeviceId()).setErrorType(dto.getErrorType());
|
|
|
+ DeviceErrorsRecordDto.Page page = (DeviceErrorsRecordDto.Page) new DeviceErrorsRecordDto.Page()
|
|
|
+ .setMercId(MercAuthUtils.getMercId())
|
|
|
+ .setDeviceId(dto.getDeviceId())
|
|
|
+ .setCode(dto.getCode());
|
|
|
page.setPage(getPageBean(INDEX_RECORDS_COUNT));
|
|
|
List<DeviceErrorsRecordDto.Vo> recordsList = deviceErrorPage(page).getData().getRecords();
|
|
|
return R.ok(recordsList);
|