diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index f70fc02f2..94269d38f 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -2553,5 +2553,37 @@ public class HikvisionCall { return JSON.parseObject(HikvisionUtil.doPost(host, path, JSON.toJSONString(param), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret())); } + /** + * 根据父组织编号获取下级组织列表 + * + * @param project + * @return + */ + public JSONObject getSubOrgListByParentOrg(Project project, JSONObject param) throws Exception { + if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) { + return null; + } + final String ARTEMIS_PATH = "/artemis"; + final String path = ARTEMIS_PATH + "/api/resource/v1/org/parentOrgIndexCode/subOrgList"; + String host = "https://" + project.getArtemisConfigHost(); + return JSON.parseObject(HikvisionUtil.doPost(host, path, JSON.toJSONString(param), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret())); + } + + /** + * 根据组织编号获取组织详细信息 + * + * @param project + * @return + */ + public JSONObject getOrgListByIndex(Project project, JSONObject param) throws Exception { + if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) { + return null; + } + final String ARTEMIS_PATH = "/artemis"; + final String path = ARTEMIS_PATH + "/api/resource/v1/org/orgIndexCodes/orgInfo"; + String host = "https://" + project.getArtemisConfigHost(); + return JSON.parseObject(HikvisionUtil.doPost(host, path, JSON.toJSONString(param), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret())); + } + } diff --git a/src/main/java/com/zhgd/xmgl/constant/Cts.java b/src/main/java/com/zhgd/xmgl/constant/Cts.java index 3c78fe384..ca4b4b2b5 100644 --- a/src/main/java/com/zhgd/xmgl/constant/Cts.java +++ b/src/main/java/com/zhgd/xmgl/constant/Cts.java @@ -14,4 +14,8 @@ public interface Cts { String EXPIRED = "expired"; String ID = "id"; String TODAY = "today"; + String REDIS_HIKVISION_COMPARE_DATA = "HIKVISION_COMPARE_DATA_"; + String SUCCESS = "success"; + String MSG = "msg"; + String ENTERPRISE_ID = "enterpriseId"; } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml index 59e64f918..cca8870dc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml @@ -30,6 +30,9 @@ and b.enterprise_type_id = #{map.enterpriseTypeId} + + and b.enterprise_id = #{map.enterpriseId} + order by b.sort_num