From 38b44e0c9996f06524903417f1d0a3f746b4550b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 04 十二月 2023 17:47:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java | 4 +-
ycl-platform/src/main/java/com/ycl/service/video/impl/IVideoPointService.java | 2
ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java | 3 +
ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java | 2
ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java | 2
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 3 +
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 3 +
ycl-platform/src/main/java/com/ycl/service/video/impl/VideoInspectionServiceImpl.java | 4 +-
ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java | 3 +
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 24 ++++++------
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java | 4 +-
ycl-platform/src/main/resources/mapper/equipment/VideoMapper.xml | 3 +
ycl-platform/src/main/java/com/ycl/controller/video/VideoInspectionController.java | 3 +
ycl-platform/src/main/java/com/ycl/service/video/IVideoInspectionService.java | 2
14 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
index 6a3c479..3082a29 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -491,11 +491,12 @@
@ApiOperation("棰勮鐮斿垽")
public CommonResult searchVideoInspection(@RequestParam Integer current,
@RequestParam Integer pageSize,
+ @RequestParam(required = false) Integer type,
@RequestParam(required = false) Long gradeId,
@RequestParam(required = false) Long videoId,
@RequestParam(required = false) String beginTime,
@RequestParam(required = false) String endTime) {
- return CommonResult.success(baseCaseService.selectVideoInspection(current, pageSize, gradeId, videoId, beginTime, endTime));
+ return CommonResult.success(baseCaseService.selectVideoInspection(current, pageSize, gradeId, videoId, beginTime, endTime, type));
}
@GetMapping("/video_inspection/{id}")
diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
index 330f40c..ebd3043 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
@@ -189,7 +189,7 @@
@GetMapping("/video_point")
public CommonResult<List<VideoPointVo>> videoPoint(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
- IPage<VideoPointVo> page = videoPointService.getList(null, null, 1, 500);
+ IPage<VideoPointVo> page = videoPointService.getList(null, null, null, 1, 500);
return CommonResult.success(page.getRecords());
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/video/VideoInspectionController.java b/ycl-platform/src/main/java/com/ycl/controller/video/VideoInspectionController.java
index eb8132a..afd6672 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/video/VideoInspectionController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/video/VideoInspectionController.java
@@ -31,9 +31,10 @@
@GetMapping("page")
public CommonResult page(@RequestParam(value = "size", required = false) Long size,
@RequestParam(value = "current", required = false) Long current,
+ @RequestParam(value = "type", required = false) Integer type,
@RequestParam(value = "regionId", required = false) Integer streetId,
@RequestParam(value = "regionId", required = false) Integer communityId) {
- Page<VideoPointVo> list = videoInspectionService.page(size, current, streetId, communityId);
+ Page<VideoPointVo> list = videoInspectionService.page(size, current, streetId, communityId, type);
return CommonResult.success(CommonPage.restPage(list));
}
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 6de5eb9..7d22e90 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
@@ -37,10 +37,11 @@
@LogSave(operationType = "鐐逛綅绠＄悊", contain = "鏌ヨ鐐逛綅")
public CommonResult searchVideoPoint(@RequestParam Long size,
@RequestParam Long current,
+ @RequestParam(required = false) Integer type,
@RequestParam(required = false) Integer streetId,
@RequestParam(required = false) Integer communityId) {
- IPage<VideoPointVo> pointVoIPage = iVideoPointService.getList(streetId, communityId, current.intValue(), size.intValue());
+ IPage<VideoPointVo> pointVoIPage = iVideoPointService.getList(streetId, communityId, type, current.intValue(), size.intValue());
// pointVoIPage.getRecords()
// .stream()
// .forEach(item -> item.setUrlAddress(videoUtil.getVideo(item.getPlatResourceId(), "HLS", 0)));
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
index 4b64c17..94f9a67 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
@@ -33,13 +33,13 @@
BaseCase selectCondMap(Map map);
- Page<BaseCase> selectBaseCasePage(Page<BaseCase> page, @Param("code") String number, @Param("communityId") Integer communityId, @Param("categories") Integer categories, @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime, @Param("site") String site, @Param("state") Integer state, @Param("streetId")Integer streetId);
+ Page<BaseCase> selectBaseCasePage(Page<BaseCase> page, @Param("code") String number, @Param("communityId") Integer communityId, @Param("categories") Integer categories, @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime, @Param("site") String site, @Param("state") Integer state, @Param("streetId") Integer streetId);
Page<QueryForViolationVO> selectViolationPage(Page<QueryForViolationVO> setCurrent, @Param(value = "queryForViolationParam") QueryForViolationParam queryForViolationParam);
List<QueryForViolationVO> selectViolationPage(@Param(value = "queryForViolationParam") QueryForViolationParam queryForViolationParam);
- Page<BaseCaseVO> selectVideoInspection(Page<Object> objectPage, @Param("gradeId") Long gradeId, @Param("videoId") Long videoId, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+ Page<BaseCaseVO> selectVideoInspection(Page<Object> objectPage, @Param("gradeId") Long gradeId, @Param("videoId") Long videoId, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("type") Integer type);
Integer dayCount();
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java
index c119559..5e821f1 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java
@@ -19,7 +19,8 @@
@Mapper
public interface VideoPointMapper extends BaseMapper<VideoPoint> {
- IPage<VideoPointVo> search(Page<VideoPointVo> page, @Param("streetId") Integer streetId, @Param("communityId") Integer communityId);
+ IPage<VideoPointVo> search(Page<VideoPointVo> page, @Param("streetId") Integer streetId,
+ @Param("communityId") Integer communityId, @Param("type") Integer type);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
index 6288ec9..22ad078 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
@@ -70,7 +70,7 @@
List<QueryForViolationVO> selectViolationList(QueryForViolationParam queryForViolationParam);
- Page<BaseCaseVO> selectVideoInspection(Integer current, Integer pageSize, Long gradeId, Long videoId, String beginTime, String endTime);
+ Page<BaseCaseVO> selectVideoInspection(Integer current, Integer pageSize, Long gradeId, Long videoId, String beginTime, String endTime, Integer type);
Map<String, Object> selectCount();
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index 962e0e9..b2c5762 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -427,25 +427,25 @@
Integer stateInt = baseCase.getState();
if (stateInt == 0) {
baseCase.setStateName("寰呭鐞�");
- }else if(stateInt == 1){
+ } else if (stateInt == 1) {
baseCase.setStateName("鎶ヨ");
- }else if(stateInt == 2){
+ } else if (stateInt == 2) {
baseCase.setStateName("涓婃姤");
- }else if(stateInt == 3){
+ } else if (stateInt == 3) {
baseCase.setStateName("鍦ㄥ涔�");
- }else if(stateInt == 4){
+ } else if (stateInt == 4) {
baseCase.setStateName("鏆備笉澶勭悊");
- }else if(stateInt == 5){
+ } else if (stateInt == 5) {
baseCase.setStateName("绔嬫");
- }else if(stateInt == 6 ){
+ } else if (stateInt == 6) {
baseCase.setStateName("璋冨害");
- }else if(stateInt == 7 ){
+ } else if (stateInt == 7) {
baseCase.setStateName("澶勭疆");
- }else if(stateInt == 8 ){
+ } else if (stateInt == 8) {
baseCase.setStateName("鏍告煡");
- }else if(stateInt == 9 ){
+ } else if (stateInt == 9) {
baseCase.setStateName("缁撴");
- }else if(stateInt == 10 ){
+ } else if (stateInt == 10) {
baseCase.setStateName("寰呬笂鎶�");
}
});
@@ -473,8 +473,8 @@
}
@Override
- public Page<BaseCaseVO> selectVideoInspection(Integer current, Integer pageSize, Long gradeId, Long videoId, String beginTime, String endTime) {
- return baseCaseMapper.selectVideoInspection(new Page<>(current, pageSize), gradeId, videoId, beginTime, endTime);
+ public Page<BaseCaseVO> selectVideoInspection(Integer current, Integer pageSize, Long gradeId, Long videoId, String beginTime, String endTime, Integer type) {
+ return baseCaseMapper.selectVideoInspection(new Page<>(current, pageSize), gradeId, videoId, beginTime, endTime, type);
}
@Override
diff --git a/ycl-platform/src/main/java/com/ycl/service/video/IVideoInspectionService.java b/ycl-platform/src/main/java/com/ycl/service/video/IVideoInspectionService.java
index 50cc700..4cb31c8 100644
--- a/ycl-platform/src/main/java/com/ycl/service/video/IVideoInspectionService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/video/IVideoInspectionService.java
@@ -10,5 +10,5 @@
* @date 2022/11/08
*/
public interface IVideoInspectionService {
- Page<VideoPointVo> page(Long size, Long current, Integer streetId, Integer communityId);
+ Page<VideoPointVo> page(Long size, Long current, Integer streetId, Integer communityId,Integer type);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/video/impl/IVideoPointService.java b/ycl-platform/src/main/java/com/ycl/service/video/impl/IVideoPointService.java
index 6350430..92c9d7f 100644
--- a/ycl-platform/src/main/java/com/ycl/service/video/impl/IVideoPointService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/video/impl/IVideoPointService.java
@@ -19,7 +19,7 @@
*/
public interface IVideoPointService extends IService<VideoPoint> {
- IPage<VideoPointVo> getList(Integer streetId, Integer communityId, Integer current, Integer size);
+ IPage<VideoPointVo> getList(Integer streetId, Integer communityId, Integer type, Integer current, Integer size);
VideoPoint getByCode(String code);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoInspectionServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoInspectionServiceImpl.java
index 39b7fab..6c9801f 100644
--- a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoInspectionServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoInspectionServiceImpl.java
@@ -19,8 +19,8 @@
private VideoPointMapper videoPointMapper;
@Override
- public Page<VideoPointVo> page(Long size, Long current, Integer streetId, Integer communityId) {
+ public Page<VideoPointVo> page(Long size, Long current, Integer streetId, Integer communityId, Integer type) {
Page<VideoPointVo> page = new Page<>(current, size);
- return (Page<VideoPointVo>) videoPointMapper.search(page, streetId, communityId);
+ return (Page<VideoPointVo>) videoPointMapper.search(page, streetId, communityId, type);
}
}
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 ab6c578..b5bc79a 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
@@ -25,8 +25,8 @@
public class VideoPointServiceImpl extends ServiceImpl<VideoPointMapper, VideoPoint> implements IVideoPointService {
@Override
- public IPage<VideoPointVo> getList(Integer streetId, Integer communityId, Integer current, Integer size) {
- return baseMapper.search(new Page<>(current, size), streetId, communityId);
+ public IPage<VideoPointVo> getList(Integer streetId, Integer communityId, Integer type, Integer current, Integer size) {
+ return baseMapper.search(new Page<>(current, size), streetId, communityId, type);
}
@Override
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index bec8da2..472f35e 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -299,6 +299,9 @@
<if test="beginTime!=null and beginTime!=''">
and t1.alarm_time between #{beginTime} and #{endTime}
</if>
+ <if test="type!=null">
+ and t3.type = #{type}
+ </if>
group by t1.id
order by t1.id desc
</select>
diff --git a/ycl-platform/src/main/resources/mapper/equipment/VideoMapper.xml b/ycl-platform/src/main/resources/mapper/equipment/VideoMapper.xml
index 6c8e36c..962d2a3 100644
--- a/ycl-platform/src/main/resources/mapper/equipment/VideoMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/equipment/VideoMapper.xml
@@ -39,6 +39,9 @@
<if test="communityId!=null">
and vp.community_id = #{communityId}
</if>
+ <if test="type!=null">
+ and vp.type = #{type}
+ </if>
</where>
ORDER BY vp.code DESC
</select>
--
Gitblit v1.8.0