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 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 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 paramMap) { + getDoorEvents(paramMap); + } + + @Async + public void getCrossRecordsAsync(HashMap 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()); } /**