修复耳标流水分页查询

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/controller/DeviceController.java

@@ -210,7 +210,7 @@ public class DeviceController {
     @RequestMapping(value = "/listDeviceEartagOnlineCountByDeviceCodeInPager",method = RequestMethod.GET)
     public Result listDeviceEartagOnlineCountByDeviceCodeInPager(@RequestParam(value = "deviceCode",required = true) String deviceCode,
                                                                  @RequestParam(value = "earmark",required = false) String earmark,
-                                                                 @RequestParam(value = "addDate",required = true) String addDate,
+                                                                 @RequestParam(value = "addDate",required = false) String addDate,
                                                                  @RequestParam(value = "pageNo",required = true) Integer pageNo,
                                                                  @RequestParam(value = "pageSize",required = true) Integer pageSize) throws ParseException {
         log.info("<listDeviceEartagOnlineCountByDeviceCodeInPager>输入参数 deviceCode>>"+deviceCode);
@@ -255,13 +255,17 @@ public class DeviceController {
      */
     @RequestMapping(value = "/listHeartbeatByDeviceCodeAndDateInPager",method = RequestMethod.GET)
     public Result listHeartbeatByDeviceCodeAndDateInPager(@RequestParam(value = "deviceCode",required = true) String deviceCode,
-                                                          @RequestParam(value = "addDate",required = true) String addDate,
+                                                          @RequestParam(value = "addDate",required = false) String addDate,
                                                           @RequestParam(value = "pageNo",required = true) Integer pageNo,
                                                           @RequestParam(value = "pageSize",required = true) Integer pageSize) throws ParseException {
         log.info("<listHeartbeatByDeviceCodeAndDateInPager>输入参数 deviceCode>>"+deviceCode);
         log.info("<listHeartbeatByDeviceCodeAndDateInPager>输入参数 addDate>>"+addDate);
         log.info("<listHeartbeatByDeviceCodeAndDateInPager>输入参数 pageNo>>"+pageNo);
         log.info("<listHeartbeatByDeviceCodeAndDateInPager>输入参数 pageSize>>"+pageSize);
+        //
+        if(addDate == null){
+            addDate  =  new DateUtil().getTodayDateText();
+        }
         //显示设备心跳
         return deviceService.listHeartbeatByDeviceCodeAndDateInPager(deviceCode,addDate,pageNo,pageSize);
     }