bug修复
This commit is contained in:
guo
parent
448aa2bf8d
commit
f1bd8c8067
@ -78,6 +78,11 @@ public class HikvisionCall {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加人员
|
||||
*
|
||||
* @param workerInfo
|
||||
*/
|
||||
public void addWorkerForHikvision(WorkerInfo workerInfo) {
|
||||
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, workerInfo.getProjectSn()));
|
||||
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
|
||||
@ -125,7 +130,11 @@ public class HikvisionCall {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 编辑人员
|
||||
*
|
||||
* @param workerInfo
|
||||
*/
|
||||
public void editWorkerForHikvision(WorkerInfo workerInfo) {
|
||||
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, workerInfo.getProjectSn()));
|
||||
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
|
||||
@ -140,6 +149,12 @@ public class HikvisionCall {
|
||||
editWorkerFace(workerInfo, project);
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑人脸
|
||||
*
|
||||
* @param workerInfo
|
||||
* @param project
|
||||
*/
|
||||
private void editWorkerFace(WorkerInfo workerInfo, Project project) {
|
||||
final String ARTEMIS_PATH = "/artemis";
|
||||
final String path = ARTEMIS_PATH + "/api/resource/v1/face/single/update";
|
||||
@ -150,7 +165,11 @@ public class HikvisionCall {
|
||||
HikvisionUtil.doPost(host, path, jo.toJSONString(), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 删除人员
|
||||
*
|
||||
* @param workerInfo
|
||||
*/
|
||||
public void deleteWorkerForHikvision(WorkerInfo workerInfo) {
|
||||
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, workerInfo.getProjectSn()));
|
||||
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
|
||||
@ -177,6 +196,12 @@ public class HikvisionCall {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除人脸
|
||||
*
|
||||
* @param project
|
||||
* @param workerFaceId
|
||||
*/
|
||||
private void sendDeleteWorkerFace(Project project, String workerFaceId) {
|
||||
final String ARTEMIS_PATH = "/artemis";
|
||||
final String path = ARTEMIS_PATH + "/api/resource/v1/face/single/delete";
|
||||
@ -186,6 +211,7 @@ public class HikvisionCall {
|
||||
HikvisionUtil.doPost(host, path, jo.toJSONString(), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
|
||||
}
|
||||
|
||||
|
||||
private ArrayList<String> getWorkerFaceIds(WorkerInfo workerInfo, Project project) {
|
||||
final String ARTEMIS_PATH = "/artemis";
|
||||
final String path = ARTEMIS_PATH + "/api/resource/v1/person/condition/personInfo";
|
||||
@ -210,6 +236,11 @@ public class HikvisionCall {
|
||||
return ids;
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加车辆
|
||||
*
|
||||
* @param carInfo
|
||||
*/
|
||||
public void addCarInfoForHikvision(CarInfo carInfo) {
|
||||
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, carInfo.getProjectSn()));
|
||||
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
|
||||
@ -280,6 +311,11 @@ public class HikvisionCall {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑车辆
|
||||
*
|
||||
* @param carInfo
|
||||
*/
|
||||
public void editCarInfoForHikvision(CarInfo carInfo) {
|
||||
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, carInfo.getProjectSn()));
|
||||
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
|
||||
@ -295,13 +331,18 @@ public class HikvisionCall {
|
||||
HikvisionUtil.doPost(host, path, body, null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除车辆
|
||||
*
|
||||
* @param carInfo
|
||||
*/
|
||||
public void deleteCarInfoForHikvision(CarInfo carInfo) {
|
||||
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, carInfo.getProjectSn()));
|
||||
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
|
||||
return;
|
||||
}
|
||||
final String ARTEMIS_PATH = "/artemis";
|
||||
final String path = ARTEMIS_PATH + "/api/resource/v1/vehicle/single/update";
|
||||
final String path = ARTEMIS_PATH + "/api/resource/v1/vehicle/batch/delete";
|
||||
String host = "https://" + project.getArtemisConfigHost();
|
||||
JSONObject jo = new JSONObject();
|
||||
JsonArray array = new JsonArray();
|
||||
@ -402,6 +443,15 @@ public class HikvisionCall {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取图片
|
||||
*
|
||||
* @param rq
|
||||
* @param artemisConfigHost
|
||||
* @param artemisConfigAppKey
|
||||
* @param artemisConfigAppSecret
|
||||
* @return
|
||||
*/
|
||||
public static String getHikvisionEventsPicture(HikvisionEventsPictureRq rq, String artemisConfigHost, String artemisConfigAppKey, String artemisConfigAppSecret) {//获取视频事件的图片
|
||||
final String ARTEMIS_PATH = "/artemis";
|
||||
final String path = ARTEMIS_PATH + "/api/video/v1/events/picture";
|
||||
@ -427,6 +477,11 @@ public class HikvisionCall {
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加组织
|
||||
*
|
||||
* @param enterpriseInfo
|
||||
*/
|
||||
public void addEnterpriseInfoForHikvision(EnterpriseInfo enterpriseInfo) {
|
||||
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, enterpriseInfo.getProjectSn()));
|
||||
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
|
||||
@ -451,6 +506,11 @@ public class HikvisionCall {
|
||||
return hikvisionOrganization;
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新组织
|
||||
*
|
||||
* @param enterpriseInfo
|
||||
*/
|
||||
public void editEnterpriseInfoForHikvision(EnterpriseInfo enterpriseInfo) {
|
||||
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, enterpriseInfo.getProjectSn()));
|
||||
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
|
||||
@ -463,7 +523,12 @@ public class HikvisionCall {
|
||||
HikvisionUtil.doPost(host, path, JSONArray.toJSONString(hikvisionOrganization), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 删除组织
|
||||
*
|
||||
* @param enterpriseInfo
|
||||
* @param projectSn
|
||||
*/
|
||||
public void deleteEnterpriseInfoForHikvision(String enterpriseInfo, String projectSn) {
|
||||
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, projectSn));
|
||||
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
|
||||
@ -478,6 +543,11 @@ public class HikvisionCall {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加组织
|
||||
*
|
||||
* @param teamInfo
|
||||
*/
|
||||
public void addTeamInfoForHikvision(TeamInfo teamInfo) {
|
||||
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, teamInfo.getProjectSn()));
|
||||
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
|
||||
@ -502,6 +572,11 @@ public class HikvisionCall {
|
||||
return hikvisionOrganization;
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑组织
|
||||
*
|
||||
* @param teamInfo
|
||||
*/
|
||||
public void editTeamInfoForHikvision(TeamInfo teamInfo) {
|
||||
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, teamInfo.getProjectSn()));
|
||||
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
|
||||
@ -514,6 +589,11 @@ public class HikvisionCall {
|
||||
HikvisionUtil.doPost(host, path, JSONArray.toJSONString(hikvisionOrganization), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除组织
|
||||
*
|
||||
* @param teamInfo
|
||||
*/
|
||||
public void deleteTeamInfoForHikvision(TeamInfo teamInfo) {
|
||||
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, teamInfo.getProjectSn()));
|
||||
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
|
||||
@ -527,6 +607,11 @@ public class HikvisionCall {
|
||||
HikvisionUtil.doPost(host, path, jo.toJSONString(), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加组织
|
||||
*
|
||||
* @param departmentInfo
|
||||
*/
|
||||
public void addDepartmentInfoForHikvision(DepartmentInfo departmentInfo) {
|
||||
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, departmentInfo.getProjectSn()));
|
||||
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
|
||||
@ -551,6 +636,11 @@ public class HikvisionCall {
|
||||
return hikvisionOrganization;
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑组织
|
||||
*
|
||||
* @param departmentInfo
|
||||
*/
|
||||
public void editDepartmentInfoForHikvision(DepartmentInfo departmentInfo) {
|
||||
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, departmentInfo.getProjectSn()));
|
||||
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
|
||||
@ -563,6 +653,11 @@ public class HikvisionCall {
|
||||
HikvisionUtil.doPost(host, path, JSONArray.toJSONString(hikvisionOrganization), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除组织
|
||||
*
|
||||
* @param departmentInfo
|
||||
*/
|
||||
public void deleteDepartmentInfoForHikvision(DepartmentInfo departmentInfo) {
|
||||
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, departmentInfo.getProjectSn()));
|
||||
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
|
||||
@ -576,12 +671,17 @@ public class HikvisionCall {
|
||||
HikvisionUtil.doPost(host, path, jo.toJSONString(), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加组织
|
||||
*
|
||||
* @param project
|
||||
*/
|
||||
public void editProjectForHikvision(Project project) {
|
||||
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
|
||||
return;
|
||||
}
|
||||
final String ARTEMIS_PATH = "/artemis";
|
||||
final String path = ARTEMIS_PATH + "/api/resource/v1/org/batch/add";
|
||||
final String path = ARTEMIS_PATH + "/api/resource/v1/org/single/update";
|
||||
String host = "https://" + project.getArtemisConfigHost();
|
||||
HikvisionOrganization hikvisionOrganization = getHikvisionOrganization(project);
|
||||
JsonArray array = new JsonArray();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user