Commit f80d013f6d4d7278b6a01324ddd659a7d0e83233
1 parent
489f5cd5
Exists in
master
时间戳数据类型更改为Long型
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 { |
| 430 | 430 | @ApiImplicitParams({ |
| 431 | 431 | @ApiImplicitParam(name="deviceSerial",value = "设备序列号",required = true), |
| 432 | 432 | @ApiImplicitParam(name="channelNo",value = "通道号，非必选，默认为1",dataType = "Integer"), |
| 433 | - @ApiImplicitParam(name= "startTime",value = "起始时间，时间格式为：1378345128000。非必选，默认为当天0点",dataType = "Long"), | |
| 434 | - @ApiImplicitParam(name= "endTime",value = "结束时间，时间格式为：1378345128000。非必选，默认为当前时间",dataType = "Long"), | |
| 433 | + @ApiImplicitParam(name= "startTime",value = "起始时间，时间格式为：1558950045000。非必选，默认为当天0点",dataType = "Integer",format = "int64",defaultValue = "0"), | |
| 434 | + @ApiImplicitParam(name= "endTime",value = "结束时间，时间格式为：1558950045000。非必选，默认为当前时间",dataType = "Integer",format = "int64",defaultValue = "0"), | |
| 435 | 435 | @ApiImplicitParam(name = "recType",value = "回放源，0-系统自动选择，1-云存储，2-本地录像。非必选，默认为0") |
| 436 | 436 | }) |
| 437 | 437 | @GetMapping("getVideoFileByTime") |
| ... | ... | @@ -454,10 +454,9 @@ public class YinShiController { |
| 454 | 454 | String result = ApiHelper.doPost(url, new HashMap<String, String>(), map); |
| 455 | 455 | YinShiResResult yinShiResResult = JSON.parseObject(result,YinShiResResult.class); |
| 456 | 456 | |
| 457 | - yinShiResResult.getData(); | |
| 458 | 457 | JSONArray jsonStr = (JSONArray)yinShiResResult.getData(); |
| 459 | 458 | |
| 460 | - if(jsonStr.size()>0){ | |
| 459 | + if(jsonStr!=null&&jsonStr.size()>0){ | |
| 461 | 460 | Page page = new Page(); |
| 462 | 461 | page.setTotal(jsonStr.size()); |
| 463 | 462 | yinShiResResult.setPage(page); | ... | ... |