From f80d013f6d4d7278b6a01324ddd659a7d0e83233 Mon Sep 17 00:00:00 2001 From: baishou <2710684311@qq.com> Date: Mon, 27 May 2019 18:15:01 +0800 Subject: [PATCH] 时间戳数据类型更改为Long型 --- springboot/src/main/java/com/sincre/springboot/controller/YinShiController.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/springboot/src/main/java/com/sincre/springboot/controller/YinShiController.java b/springboot/src/main/java/com/sincre/springboot/controller/YinShiController.java index 3710acf..de5217b 100644 --- a/springboot/src/main/java/com/sincre/springboot/controller/YinShiController.java +++ b/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(), 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); -- libgit2 0.21.0