时间戳数据类型更改为Long型

baishou
1 parent 489f5cd5
Showing 1 changed file with 3 additions and 4 deletions Show diff stats
springboot/src/main/java/com/sincre/springboot/controller/YinShiController.java
@@ -430,8 +430,8 @@ public class YinShiController {
     @ApiImplicitParams({
             @ApiImplicitParam(name="deviceSerial",value = "设备序列号",required = true),
             @ApiImplicitParam(name="channelNo",value = "通道号，非必选，默认为1",dataType = "Integer"),
-            @ApiImplicitParam(name= "startTime",value = "起始时间，时间格式为：1378345128000。非必选，默认为当天0点",dataType = "Long"),
-            @ApiImplicitParam(name= "endTime",value = "结束时间，时间格式为：1378345128000。非必选，默认为当前时间",dataType = "Long"),
+            @ApiImplicitParam(name= "startTime",value = "起始时间，时间格式为：1558950045000。非必选，默认为当天0点",dataType = "Integer",format = "int64",defaultValue = "0"),
+            @ApiImplicitParam(name= "endTime",value = "结束时间，时间格式为：1558950045000。非必选，默认为当前时间",dataType = "Integer",format = "int64",defaultValue = "0"),
             @ApiImplicitParam(name = "recType",value = "回放源，0-系统自动选择，1-云存储，2-本地录像。非必选，默认为0")
     })
     @GetMapping("getVideoFileByTime")
@@ -454,10 +454,9 @@ public class YinShiController {
         String result = ApiHelper.doPost(url, new HashMap<String, String>(), map);
         YinShiResResult yinShiResResult = JSON.parseObject(result,YinShiResResult.class);
-        yinShiResResult.getData();
         JSONArray jsonStr = (JSONArray)yinShiResResult.getData();
-        if(jsonStr.size()>0){
+        if(jsonStr!=null&&jsonStr.size()>0){
             Page page = new Page();
             page.setTotal(jsonStr.size());
             yinShiResResult.setPage(page);