优化

zhanghua

2023-09-08 7ef4892f9f24f941aca37e6b3991b808a0aca619

 ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java

@@ -2,12 +2,15 @@

import cn.hutool.json.JSONConverter;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.dto.video.AlarmParam;
import com.ycl.entity.video.VideoPoint;
import com.ycl.enums.common.ResultCode;
import com.ycl.service.video.IVideoAlarmReportService;
import com.ycl.service.video.impl.IVideoPointService;
import com.ycl.util.VideoUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -27,6 +30,7 @@
import java.util.Base64;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.List;

/**
 * @author admin
@@ -35,6 +39,7 @@
@RestController
@RequestMapping("/API")
public class AlarmController {
    private IVideoPointService videoPointService;
    private IVideoAlarmReportService videoAlarmReportService;

    private static Dictionary<String, Integer> sessionDic = new Hashtable<>();
@@ -45,6 +50,11 @@
    @Autowired
    public void setVideoAlarmReportService(IVideoAlarmReportService videoAlarmReportService) {
        this.videoAlarmReportService = videoAlarmReportService;
    }

    @Autowired
    public void setVideoPointService(IVideoPointService videoPointService) {
        this.videoPointService = videoPointService;
    }

    @ApiOperation("视频报警推送API")
@@ -62,6 +72,15 @@
    public CommonResult getMonitorAddress(@PathVariable String code, @PathVariable Integer subType,
                                          @RequestParam(required = false) String scheme) {

        LambdaQueryWrapper<VideoPoint> queryWrapper = new LambdaQueryWrapper<VideoPoint>()
                .eq(VideoPoint::getPlatResourceId, code)
                .or().eq(VideoPoint::getCode, code);
        List<VideoPoint> pointList = videoPointService.list(queryWrapper);
        if (pointList.size() > 0) {
            VideoPoint videoPoint = pointList.get(0);
            if (videoPoint.getType() == 1) {
                return CommonResult.successApi(videoUtil.getKHVideo(code));
            } else {
        if (subType == null) {
            subType = 1;
        }
@@ -70,6 +89,17 @@
        }
        return CommonResult.successApi(videoUtil.getVideo(code, scheme, subType));
    }
        } else {

            if (subType == null) {
                subType = 1;
            }
            if (!StringUtils.isNotBlank(scheme)) {
                scheme = "RTSP";
            }
            return CommonResult.successApi(videoUtil.getVideo(code, scheme, subType));
        }
    }


    @ApiOperation(value = "获取图片")