From 82306238dc4bfdd4bba4de7822bc9af15f7f17b3 Mon Sep 17 00:00:00 2001
From: GUO <1923636941@qq.com>
Date: Fri, 10 May 2024 00:52:30 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhgd/xmgl/call/HikvisionCall.java     | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
index 71beb9030..e6f69cdc5 100644
--- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
+++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
@@ -116,6 +116,9 @@ public class HikvisionCall {
     @Autowired
     private XzHikvisionSyncMapper xzHikvisionSyncMapper;
 
+    @Lazy
+    @Autowired
+    HikvisionCall hikvisionCall;
     /**
      * 获取图片
      *
@@ -323,7 +326,6 @@ public class HikvisionCall {
             @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "body", required = true, dataType = "String"),
     })
     @PostMapping(value = "/getDoorEvents")
-    @Async
     public Result getDoorEvents(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
         String startTime = MapUtils.getString(paramMap, "startTime");
         String endTime = MapUtils.getString(paramMap, "endTime");
@@ -349,6 +351,7 @@ public class HikvisionCall {
                 for (UfaceDev ufaceDev : ufaceDevs) {
                     param.put("doorIndexCodes", Collections.singletonList(ufaceDev.getDevSn()));
                     param.put("pageNo", 1);
+                    param.put("pageSize", 1000);
                     Integer total = 0;
                     JSONArray listJa = new JSONArray();
                     do {
@@ -436,7 +439,6 @@ public class HikvisionCall {
             @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "body", required = true, dataType = "String"),
     })
     @PostMapping(value = "/getCrossRecords")
-    @Async
     public Result getCrossRecords(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
         String startTime = MapUtils.getString(paramMap, "startTime");
         String endTime = MapUtils.getString(paramMap, "endTime");
@@ -566,11 +568,22 @@ public class HikvisionCall {
             map.put("projectSn", project.getProjectSn());
             map.put("startTime", startTime);
             map.put("endTime", endTime);
-            getDoorEvents(map);
-            getCrossRecords(map);
+            hikvisionCall.getDoorEventsAsync(map);
+            hikvisionCall.getCrossRecordsAsync(map);
         }
     }
 
+    @Async
+    public void getDoorEventsAsync(HashMap<String, Object> paramMap) {
+        getDoorEvents(paramMap);
+    }
+
+    @Async
+    public void getCrossRecordsAsync(HashMap<String, Object> paramMap) {
+        getCrossRecords(paramMap);
+    }
+
+
     /**
      * 定时重试失败的记录
      */
@@ -2050,14 +2063,7 @@ public class HikvisionCall {
         final String ARTEMIS_PATH = "/artemis";
         final String path = ARTEMIS_PATH + "/api/acs/v2/door/events";
         String host = "https://" + project.getArtemisConfigHost();
-        JSONObject jo = new JSONObject();
-        jo.put("pageNo", param.getIntValue("pageNo"));
-        jo.put("pageSize", 1000);
-        //ISO8601时间格式
-        jo.put("startTime", param.getString("startTime"));
-        jo.put("endTime", param.getString("endTime"));
-        jo.put("doorIndexCode", param.getString("doorIndexCode"));
-        return HikvisionUtil.doPost(host, path, jo.toJSONString(), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
+        return HikvisionUtil.doPost(host, path, param.toJSONString(), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
     }
 
     /**