Merge branch 'hcp' into test

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceRecordsController.java

@@ -6,6 +6,7 @@ import com.xy.service.DeviceErrorsRecordService;
 import com.xy.service.DeviceNetRecordService;
 import com.xy.service.DeviceRecordsService;
 import com.xy.service.DeviceTempRecordsService;
+import com.xy.utils.Emptys;
 import com.xy.utils.MercAuthUtils;
 import com.xy.utils.PageBean;
 import com.xy.utils.R;
@@ -67,8 +68,12 @@ public class MercMiniDeviceRecordsController {
     @ApiOperation("设备详情首页-联网记录")
     @PostMapping("indexDeviceNetRecords")
     public R<List<DeviceNetRecordDto.Vo>> indexDeviceNetRecords(@RequestBody @Validated MiniDeviceRecordsDto.DeviceIdDto dto) {
-        DeviceNetRecordDto.Page page = (DeviceNetRecordDto.Page) new DeviceNetRecordDto.Page().setMercId(MercAuthUtils.getMercId())
-                .setDeviceId(dto.getDeviceId());
+        DeviceNetRecordDto.Page page =
+                (DeviceNetRecordDto.Page) new DeviceNetRecordDto.Page()
+                        .setMercId(MercAuthUtils.getMercId());
+        if(Emptys.check(dto.getDeviceId())){
+            page.setDeviceId(dto.getDeviceId());
+        }
         page.setPage(getPageBean(INDEX_RECORDS_COUNT));
         List<DeviceNetRecordDto.Vo> recordsList = deviceNetRecordPage(page).getData().getRecords();
         return R.ok(recordsList);

device-api-service-merc-mini/src/main/java/com/xy/dto/MiniDeviceRecordsDto.java

@@ -30,7 +30,6 @@ public class MiniDeviceRecordsDto {
     @Accessors(chain = true)
     public static class DeviceErrorPageDto{
         @ApiModelProperty("设备ID")
-        @NotNull(message = "设备ID不能为空")
         private Long deviceId;
 
         @ApiModelProperty("故障类型")