From 43b783fb178055a95b7b3ff4b33004364d7d9255 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 09 十二月 2022 14:29:04 +0800
Subject: [PATCH] fix: 视频点位和预警研判
---
ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java | 4 +---
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 5 +----
ycl-platform/src/main/java/com/ycl/util/VideoUtil.java | 5 +++++
ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java | 13 +++++++++++--
ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java | 4 ++--
5 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java b/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java
index f0e99e0..e2e04f2 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java
@@ -1,12 +1,14 @@
package com.ycl.controller.video;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.video.VideoPoint;
import com.ycl.service.video.impl.IVideoPointService;
+import com.ycl.util.VideoUtil;
+import com.ycl.vo.equipment.VideoPointVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +29,8 @@
@Autowired
IVideoPointService iVideoPointService;
+ @Autowired
+ VideoUtil videoUtil;
@GetMapping("/query")
@ApiOperation("鏌ヨ")
@@ -35,7 +39,12 @@
@RequestParam Long current,
@RequestParam(required = false) Integer streetId,
@RequestParam(required = false) Integer communityId) {
- return CommonResult.success(iVideoPointService.getList(streetId,communityId, current.intValue(), size.intValue()));
+
+ IPage<VideoPointVo> pointVoIPage = iVideoPointService.getList(streetId, communityId, current.intValue(), size.intValue());
+ pointVoIPage.getRecords()
+ .stream()
+ .forEach(item -> item.setUrlAddress(videoUtil.getVideo(item.getPlatResourceId(), "HLS", 0)));
+ return CommonResult.success(pointVoIPage);
}
@PostMapping("/addition")
diff --git a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java
index b9ddd78..63e408f 100644
--- a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java
@@ -24,8 +24,6 @@
@Override
public IPage<VideoPointVo> getList(Integer streetId, Integer communityId, Integer current, Integer size) {
- Page<VideoPointVo> page = new Page<>(current, size);
- IPage<VideoPointVo> page1 = baseMapper.search(page, streetId, communityId);
- return page1;
+ return baseMapper.search(new Page<>(current, size), streetId, communityId);
}
}
diff --git a/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java b/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java
index 00fdbb1..5617455 100644
--- a/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java
+++ b/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java
@@ -33,6 +33,11 @@
@Value("${videoPoint.ip}")
private String ip;
+ /*
+ * @Description subType:绫诲瀷int锛岄�夊～銆傜爜娴佺被鍨嬶紝0:涓荤爜娴併��1:杈呮祦1銆�2:杈呮祦2銆傞粯璁や负0涓荤爜娴併�俿cheme:绫诲瀷string锛岄�夊～銆傚崗璁被鍨嬶紝鏀寔RTSP銆丗LV_HTTP銆丠LS涓夌锛岄粯璁TSP銆�
+ * @Param [code, scheme, subType]
+ * @return java.lang.String
+ **/
@SneakyThrows
public String getVideo(String code, String scheme,Integer subType) {
String clientType = "winpc";
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java
index bab317b..c3abe5f 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java
@@ -7,6 +7,7 @@
@Data
public class BaseCaseVO {
+
private Integer baseId;
private String code;
private String name;
@@ -15,8 +16,7 @@
private String latitude;
private String picData;
private String grade;
- private String street;
- private String community;
+ private String address;
@JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime alarmTime;
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 17ff751..231ef26 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -237,16 +237,13 @@
t3.latitude,
t4.pic_data,
t5.`name` as grade,
- t6.`region_name` as street,
- t7.`region_name` as community,
+ t3.address,
t1.alarm_time as alarmTime
FROM ums_base_case t1
LEFT JOIN ums_violations t2 ON t1.id = t2.id
LEFT JOIN ums_video_point t3 on t2.video_point_id = t3.id
LEFT JOIN ums_video_alarm_report t4 on t4.id = t2.video_alarm_report_id
LEFT JOIN ums_data_dictionary t5 on t5.id = t2.grade_id
- LEFT JOIN ums_sccg_region t6 on t6.id = t1.street_id
- LEFT JOIN ums_sccg_region t7 on t7.id = t1.community_id
WHERE t1.state = 1
group by t1.id
</select>
--
Gitblit v1.8.0