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

bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-06-04 21:23:01 +08:00
parent bbe711972d
commit a739a82a2a
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}

23
src/main/java/com/zhgd/xmgl/util/HikvisionUtil.java
View File

@ -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());
}
}