diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java index 13e8950..8647c33 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java @@ -215,11 +215,12 @@ public class StationVideoTypeController extends BladeController { public R> getHikVisionStations() { return R.data(stationVideoTypeService.getHikVisionStations()); } + @ApiLog - @GetMapping("/getHikVideo") + @GetMapping("/getFlvVideos") @ApiOperationSupport(order = 120) @ApiOperation(value = "获取海康视频区域列表", notes = "获取海康视频区域列表") - public R getVideoMonitor(StationVideoTypeEntity req,Query query) { + public R getFlvVideos(StationVideoTypeEntity req,Query query) { LambdaQueryWrapper queryWrapper = com.hnac.hzims.common.utils.Condition.getQueryWrapper(StationVideoTypeEntity.class, req); IPage page = stationVideoTypeService.page(com.hnac.hzims.common.utils.Condition.getPage(query), queryWrapper); Consumer getFlvVideo = video -> { diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/ObjectUtils.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/ObjectUtils.java index dd508bb..ac273f5 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/ObjectUtils.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/ObjectUtils.java @@ -48,6 +48,21 @@ public class ObjectUtils { result.put(dateTimeToMap.prefix()+dateTimeToMap.split()+"second",time.getSecond()); } } + else if(value instanceof Date) { + DateTimeToMap dateTimeToMap = field.getAnnotation(DateTimeToMap.class); + Date time = (Date) value; + if(ObjectUtil.isEmpty(dateTimeToMap)) { + result.put(field.getName(),DateUtil.format(time,DateUtil.PATTERN_DATETIME)); + } + else { + result.put(dateTimeToMap.prefix()+dateTimeToMap.split()+"year",time.getYear()); + result.put(dateTimeToMap.prefix()+dateTimeToMap.split()+"month",time.getMonth()); + result.put(dateTimeToMap.prefix()+dateTimeToMap.split()+"day",time.getDay()); + result.put(dateTimeToMap.prefix()+dateTimeToMap.split()+"hour",time.getHours()); + result.put(dateTimeToMap.prefix()+dateTimeToMap.split()+"minute",time.getMinutes()); + result.put(dateTimeToMap.prefix()+dateTimeToMap.split()+"second",time.getSeconds()); + } + } }); return result; }