Merge remote-tracking branch 'origin/master'

baizonghao

2023-03-31 d3e5446447c79948eee93035900401aff50706fb

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

@@ -31,6 +31,8 @@
public class AlarmController {
    private IVideoAlarmReportService videoAlarmReportService;

    private static Integer index = 0;

    @Autowired
    private VideoUtil videoUtil;

@@ -67,8 +69,16 @@
//    @GetMapping(value = "/img")
    @ResponseBody
    public byte[] getImages(HttpServletResponse response, @RequestParam String fileUrl, @RequestParam String OSSAccessKeyId, @RequestParam String Signature) {
        try {

        index = 0;
        return getBytes(fileUrl, OSSAccessKeyId, Signature);

    }

    private byte[] getBytes(String fileUrl, String OSSAccessKeyId, String Signature) {
        try {
            if (index < 10) {
                index++;
            System.out.println("getImages获取图片地址：" + fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
            URL url = new URL(fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -78,17 +88,14 @@

            InputStream inputStream = conn.getInputStream();// 通过输入流获取图片数据


            byte[] data = readInputStream(inputStream);
            System.out.println("getImages获取图片成功");


            System.out.println("getImages -图片64");
            System.out.println(Base64.getEncoder().encodeToString(data));
            return data;

            }
        } catch (Exception e) {
            System.out.println("getImages获取图片失败：" + e.getMessage());
            System.out.println(index + "getImages获取图片失败：" + e.getMessage());
            getBytes(fileUrl, OSSAccessKeyId, Signature);
            // e.printStackTrace();
        }
        return null;