Merge remote-tracking branch 'origin/master'

fuliqi

2023-12-04 38b44e0c9996f06524903417f1d0a3f746b4550b

Merge remote-tracking branch 'origin/master'

 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}")

 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());
    }


 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));
    }


 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)));

 ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java

@@ -39,7 +39,7 @@

    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();


 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);


}

 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();


 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java

@@ -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

 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);
}

 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);
}

 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);
    }
}

 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

 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>

 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>