Merge remote-tracking branch 'origin/master'

fuliqi

2023-12-16 12ada3a7e6680d5ab92901410e3cedd9b8077e56

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

@@ -72,7 +72,7 @@
    @PostMapping("/HK/alarmReport")
    @LogSave(operationType = "报警管理", contain = "海康视频报警推送")
    public CommonResult hkAlarmReport(@RequestBody @Validated HKAlarmParam alarmParam) {
        System.out.println("海康视频报警推送API：" + JSONObject.toJSONString(alarmParam));
//        System.out.println("海康视频报警推送API：" + JSONObject.toJSONString(alarmParam));
        videoAlarmReportService.saveFromHK(alarmParam);
        return new CommonResult(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage());
    }
@@ -157,7 +157,7 @@
            if (sessionDic.get(sessionId) < 10) {
                sessionDic.remove(sessionId);
                fileUrl = fileUrl.replace("Expires", "v");
                System.out.println("getImages获取图片地址：" + fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
//                System.out.println("getImages获取图片地址：" + fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
                URL url = null;
                if (StringUtils.isNotBlank(OSSAccessKeyId) && StringUtils.isNotBlank(Signature)) {
                    url = new URL(fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
@@ -172,7 +172,7 @@
                InputStream inputStream = conn.getInputStream();// 通过输入流获取图片数据

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

                return data;
            }