|
@@ -477,8 +477,14 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
@Transactional
|
|
@Transactional
|
|
@Override
|
|
@Override
|
|
public String insertTowerEvent(TowerEventVo towerEventVo) {
|
|
public String insertTowerEvent(TowerEventVo towerEventVo) {
|
|
|
|
+ // 验证是否配置摄像头
|
|
|
|
+ CenterdataTCamera centerdataTCamera = SpringUtils.getBean(RemoteMonitorService.class).getCameraByChinaTowerCameraCode(towerEventVo.getDeviceCode());
|
|
|
|
+ if (StringUtils.isNull(centerdataTCamera)) {
|
|
|
|
+ logger.info("无法匹配相关设备!铁塔摄像头为:{}", towerEventVo.getDeviceCode());
|
|
|
|
+ return "";
|
|
|
|
+ }
|
|
// 验证是否配置指挥中心
|
|
// 验证是否配置指挥中心
|
|
- List<CenterdataTAidevicedept> listDept = SpringUtils.getBean(RemoteMonitorService.class).listForCommandCenter(towerEventVo.getDeviceCode(), "1", "1").getData();
|
|
|
|
|
|
+ List<CenterdataTAidevicedept> listDept = SpringUtils.getBean(RemoteMonitorService.class).listForCommandCenter(centerdataTCamera.getId(), "1", "1").getData();
|
|
if (StringUtils.isEmpty(listDept)) {
|
|
if (StringUtils.isEmpty(listDept)) {
|
|
logger.info(ERROR_MSG_DEPT, towerEventVo.getDeviceCode());
|
|
logger.info(ERROR_MSG_DEPT, towerEventVo.getDeviceCode());
|
|
return "";
|
|
return "";
|
|
@@ -500,7 +506,6 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
Date reportTime = towerEventVo.getAlarmTime();
|
|
Date reportTime = towerEventVo.getAlarmTime();
|
|
String address = towerEventVo.getAddress();
|
|
String address = towerEventVo.getAddress();
|
|
CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address);
|
|
CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address);
|
|
- CenterdataTCamera centerdataTCamera = new CenterdataTCamera(towerEventVo.getDeviceCode(), towerEventVo.getDeviceName());
|
|
|
|
centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, null);
|
|
centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, null);
|
|
// 事件部门
|
|
// 事件部门
|
|
this.insertEventDept(centereventTEventcatalogue, listDept);
|
|
this.insertEventDept(centereventTEventcatalogue, listDept);
|
|
@@ -527,6 +532,15 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
tAttach.setFileType(FILE_TYPE_1);
|
|
tAttach.setFileType(FILE_TYPE_1);
|
|
remoteDataService.insertAttach(tAttach);
|
|
remoteDataService.insertAttach(tAttach);
|
|
}
|
|
}
|
|
|
|
+ if (StringUtils.isNotBlank(towerEventVo.getAlarmVideoUrl())) {
|
|
|
|
+ CenterdataTAttach tAttach = new CenterdataTAttach();
|
|
|
|
+ tAttach.setBusId(logId);
|
|
|
|
+ tAttach.setAttachPath(towerEventVo.getAlarmPictureUrl());
|
|
|
|
+ tAttach.setBusIndx(BUS_INDEX_2);
|
|
|
|
+ tAttach.setBusSource("TT_1");
|
|
|
|
+ tAttach.setFileType(FILE_TYPE_2);
|
|
|
|
+ remoteDataService.insertAttach(tAttach);
|
|
|
|
+ }
|
|
return centereventTEventcatalogue.getEventCode();
|
|
return centereventTEventcatalogue.getEventCode();
|
|
}
|
|
}
|
|
|
|
|