From 704e7207d74b6477c5f472c5aba92d484ab17f98 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 29 十一月 2023 17:07:11 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java b/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
index b36d4d7..40068e6 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
@@ -71,7 +71,7 @@
@PostMapping("/HK/alarmReport")
@LogSave(operationType = "鎶ヨ绠＄悊", contain = "娴峰悍瑙嗛鎶ヨ鎺ㄩ��")
public CommonResult hkAlarmReport(@RequestBody @Validated HKAlarmParam alarmParam) {
-// System.out.println("淇濆瓨鎶ヨ鏁版嵁锛�" + JSONObject.toJSONString(alarmParam));
+ System.out.println("娴峰悍瑙嗛鎶ヨ鎺ㄩ�丄PI锛�" + JSONObject.toJSONString(alarmParam));
videoAlarmReportService.saveFromHK(alarmParam);
return new CommonResult(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage());
}
@@ -126,6 +126,14 @@
}
+
+ @GetMapping(value = "/index")
+ @ResponseBody
+ public String getImages(HttpServletRequest request, HttpServletResponse response) {
+ return "閬傛槍缁煎悎鎵ф硶骞冲彴";
+
+ }
+
private byte[] getBytes(String fileUrl, String OSSAccessKeyId, String Signature, String sessionId) {
int index = sessionDic.get(sessionId);
try {
--
Gitblit v1.8.0