diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index af8ca7daa..cad69e0f7 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -2115,27 +2115,6 @@ public class HikvisionCall { HikvisionUtil.doPost(host, path, body, null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret()); } - /** - * 获取组织列表v2 - * - * @param project - * @param orgIndex - */ - public String getOrgV2(Project project, String orgIndex) throws Exception { - if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) { - return null; - } - final String ARTEMIS_PATH = "/artemis"; - final String path = ARTEMIS_PATH + "/api/resource/v2/org/advance/orgList"; - String host = "https://" + project.getArtemisConfigHost(); - JSONObject jo = new JSONObject(); - jo.put("pageNo", 1); - jo.put("pageSize", 100); - jo.put("orgIndexCodes", orgIndex); - String body = jo.toJSONString(); - return HikvisionUtil.doPost(host, path, body, null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret()); - } - /** * 组织存在? * @@ -2144,7 +2123,7 @@ public class HikvisionCall { * @return */ public boolean existOrg(Project project, String orgIndex) throws Exception { - String rs = getOrgV2(project, orgIndex); + String rs = HikvisionUtil.getOrgV2(project, orgIndex, project.getProjectSn()); JSONObject jo = HikvisionUtil.getJSONObjectData(rs); return jo.getJSONArray("list").size() > 0; } diff --git a/src/main/java/com/zhgd/xmgl/util/HikvisionUtil.java b/src/main/java/com/zhgd/xmgl/util/HikvisionUtil.java index 6dc95e743..81cddbdd0 100644 --- a/src/main/java/com/zhgd/xmgl/util/HikvisionUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/HikvisionUtil.java @@ -351,4 +351,27 @@ public class HikvisionUtil { hikvisionReservationCarInfo.setPageSize(999L); return hikvisionReservationCarInfo; } + + /** + * 获取组织列表v2 + * + * @param project + * @param orgIndex + * @param parentOrgIndexCode + */ + public static String getOrgV2(Project project, String orgIndex, String parentOrgIndexCode) throws Exception { + if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) { + return null; + } + final String ARTEMIS_PATH = "/artemis"; + final String path = ARTEMIS_PATH + "/api/resource/v2/org/advance/orgList"; + String host = "https://" + project.getArtemisConfigHost(); + JSONObject jo = new JSONObject(); + jo.put("pageNo", 1); + jo.put("pageSize", 100); + jo.put("orgIndexCodes", orgIndex); + jo.put("parentOrgIndexCodes", parentOrgIndexCode); + String body = jo.toJSONString(); + return doPost(host, path, body, null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret()); + } }