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

编辑项目不发通知

Browse Source
This commit is contained in:
guoshengxiong 2024-05-22 15:01:56 +08:00
parent a35666c8bc
commit 00a456d8aa
3 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
View File

@ -335,7 +335,6 @@ public class AsyncHikvision {
hikvisionCall.editProjectForHikvision(project);
} catch (Exception e) {
log.error("海康：", e);
sendNoticeForOrg(project.getProjectName(), e, "编辑");
}
}

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

@ -27,20 +27,12 @@ import com.zhgd.xmgl.modules.car.mapper.CarInfoMapper;
import com.zhgd.xmgl.modules.car.mapper.CarPassRecordMapper;
import com.zhgd.xmgl.modules.car.mapper.CarTypeMapper;
import com.zhgd.xmgl.modules.car.service.impl.CarPassRecordServiceImpl;
import com.zhgd.xmgl.modules.frontier.entity.FrontierProtectionDev;
import com.zhgd.xmgl.modules.frontier.entity.FrontierProtectionDevAlarm;
import com.zhgd.xmgl.modules.frontier.service.FrontierProtectionDevService;
import com.zhgd.xmgl.modules.frontier.service.IFrontierProtectionDevAlarmService;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDev;
import com.zhgd.xmgl.modules.frontierprotectionnonet.mapper.FrontierProtectionNoNetDevMapper;
import com.zhgd.xmgl.modules.frontierprotectionnonet.service.impl.FrontierProtectionNoNetDataServiceImpl;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDev;
import com.zhgd.xmgl.modules.frontierprotectionnonet.service.IFrontierProtectionNoNetDataService;
import com.zhgd.xmgl.modules.frontierprotectionnonet.service.IFrontierProtectionNoNetDevService;
import com.zhgd.xmgl.modules.project.entity.Project;
import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig;
import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord;
import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareRecord;
@ -1815,7 +1807,7 @@ public class HikvisionCall {
return;
}
HikvisionOrganization hikvisionOrganization = getHikvisionOrganization(enterpriseInfo);
addOrgFromHttp(project, hikvisionOrganization);
addOrgNoticeFromHttp(project, hikvisionOrganization);
}
private HikvisionOrganization getHikvisionOrganization(EnterpriseInfo enterpriseInfo) {
@ -1841,7 +1833,7 @@ public class HikvisionCall {
if (existOrg(project, String.valueOf(enterpriseInfo.getId()))) {
editOrgFromHttp(project, hikvisionOrganization);
} else {
addOrgFromHttp(project, hikvisionOrganization);
addOrgNoticeFromHttp(project, hikvisionOrganization);
}
}
@ -1879,7 +1871,7 @@ public class HikvisionCall {
return;
}
HikvisionOrganization hikvisionOrganization = getHikvisionOrganization(teamInfo);
addOrgFromHttp(project, hikvisionOrganization);
addOrgNoticeFromHttp(project, hikvisionOrganization);
}
private HikvisionOrganization getHikvisionOrganization(TeamInfo teamInfo) {
@ -1905,7 +1897,7 @@ public class HikvisionCall {
if (existOrg(project, String.valueOf(teamInfo.getId()))) {
editOrgFromHttp(project, hikvisionOrganization);
} else {
addOrgFromHttp(project, hikvisionOrganization);
addOrgNoticeFromHttp(project, hikvisionOrganization);
}
}
@ -1927,14 +1919,18 @@ public class HikvisionCall {
sendNoticeForOrg("删除组织到海康isc", rs, orgName);
}
private void addOrgFromHttp(Project project, HikvisionOrganization hikvisionOrganization) throws Exception {
private void addOrgNoticeFromHttp(Project project, HikvisionOrganization hikvisionOrganization) throws Exception {
String rs = addOrgFromHttp(project, hikvisionOrganization);
sendNoticeForOrg("添加组织到海康isc", rs, hikvisionOrganization.getOrgName());
}
private String addOrgFromHttp(Project project, HikvisionOrganization hikvisionOrganization) throws Exception {
final String ARTEMIS_PATH = "/artemis";
final String path = ARTEMIS_PATH + "/api/resource/v1/org/batch/add";
String host = "https://" + project.getArtemisConfigHost();
ArrayList<HikvisionOrganization> list = new ArrayList<>();
list.add(hikvisionOrganization);
String rs = HikvisionUtil.doPost(host, path, JSON.toJSONString(list), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
sendNoticeForOrg("添加组织到海康isc", rs, hikvisionOrganization.getOrgName());
return HikvisionUtil.doPost(host, path, JSON.toJSONString(list), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
}
/**
@ -1961,7 +1957,7 @@ public class HikvisionCall {
return;
}
HikvisionOrganization hikvisionOrganization = getHikvisionOrganization(departmentInfo);
addOrgFromHttp(project, hikvisionOrganization);
addOrgNoticeFromHttp(project, hikvisionOrganization);
}
private HikvisionOrganization getHikvisionOrganization(DepartmentInfo departmentInfo) {
@ -1987,7 +1983,7 @@ public class HikvisionCall {
if (existOrg(project, String.valueOf(departmentInfo.getId()))) {
editOrgFromHttp(project, hikvisionOrganization);
} else {
addOrgFromHttp(project, hikvisionOrganization);
addOrgNoticeFromHttp(project, hikvisionOrganization);
}
}

8
src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java
View File

@ -346,15 +346,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
} else {
throw new RuntimeException("请求参数异常");
}
Project projectEntity = baseMapper.selectOne(queryWrapper);
if (projectEntity == null) {
Project old = baseMapper.selectOne(queryWrapper);
if (old == null) {
throw new OpenAlertException(MessageUtil.get("notFindErr"));
}
baseMapper.update(project, queryWrapper);
redisRepository.del("projectInfoBySn:" + projectEntity.getProjectSn());
redisRepository.del("projectInfoBySn:" + old.getProjectSn());
//同步海康
asyncHikvision.editProjectForHikvision(projectEntity);
asyncHikvision.editProjectForHikvision(old);
}
@Override