admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
GUO 2024-05-10 00:52:30 +08:00
parent 5aa2d22342
commit 82306238dc
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
View File

@ -116,6 +116,9 @@ public class HikvisionCall {
@Autowired @Autowired
private XzHikvisionSyncMapper xzHikvisionSyncMapper; private XzHikvisionSyncMapper xzHikvisionSyncMapper;
@Lazy
@Autowired
HikvisionCall hikvisionCall;
/** /**
* 获取图片 * 获取图片
* *
@ -323,7 +326,6 @@ public class HikvisionCall {
@ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "body", required = true, dataType = "String"),
}) })
@PostMapping(value = "/getDoorEvents") @PostMapping(value = "/getDoorEvents")
@Async
public Result getDoorEvents(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) { public Result getDoorEvents(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
String startTime = MapUtils.getString(paramMap, "startTime"); String startTime = MapUtils.getString(paramMap, "startTime");
String endTime = MapUtils.getString(paramMap, "endTime"); String endTime = MapUtils.getString(paramMap, "endTime");
@ -349,6 +351,7 @@ public class HikvisionCall {
for (UfaceDev ufaceDev : ufaceDevs) { for (UfaceDev ufaceDev : ufaceDevs) {
param.put("doorIndexCodes", Collections.singletonList(ufaceDev.getDevSn())); param.put("doorIndexCodes", Collections.singletonList(ufaceDev.getDevSn()));
param.put("pageNo", 1); param.put("pageNo", 1);
param.put("pageSize", 1000);
Integer total = 0; Integer total = 0;
JSONArray listJa = new JSONArray(); JSONArray listJa = new JSONArray();
do { do {
@ -436,7 +439,6 @@ public class HikvisionCall {
@ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "body", required = true, dataType = "String"),
}) })
@PostMapping(value = "/getCrossRecords") @PostMapping(value = "/getCrossRecords")
@Async
public Result getCrossRecords(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) { public Result getCrossRecords(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
String startTime = MapUtils.getString(paramMap, "startTime"); String startTime = MapUtils.getString(paramMap, "startTime");
String endTime = MapUtils.getString(paramMap, "endTime"); String endTime = MapUtils.getString(paramMap, "endTime");
@ -566,11 +568,22 @@ public class HikvisionCall {
map.put("projectSn", project.getProjectSn()); map.put("projectSn", project.getProjectSn());
map.put("startTime", startTime); map.put("startTime", startTime);
map.put("endTime", endTime); map.put("endTime", endTime);
getDoorEvents(map); hikvisionCall.getDoorEventsAsync(map);
getCrossRecords(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 ARTEMIS_PATH = "/artemis";
final String path = ARTEMIS_PATH + "/api/acs/v2/door/events"; final String path = ARTEMIS_PATH + "/api/acs/v2/door/events";
String host = "https://" + project.getArtemisConfigHost(); String host = "https://" + project.getArtemisConfigHost();
JSONObject jo = new JSONObject(); return HikvisionUtil.doPost(host, path, param.toJSONString(), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
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());
} }
/** /**