From 586bde7001dac24376668b8d5e0f9458c57098f3 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Wed, 6 Dec 2023 09:11:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?#=20=E7=AC=AC=E4=B8=80=E7=A7=8D=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=A5=A8=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzims/ticket/utils/ObjectUtils.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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; } From e486101d1b793fcfe88af5cc662ec1040c9bfd71 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Wed, 6 Dec 2023 09:47:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?#=20=E6=B5=B7=E5=BA=B7=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E4=B8=BAflv=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operational/station/controller/StationVideoTypeController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 -> {