|
@@ -316,12 +316,12 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
// 事件目录
|
|
// 事件目录
|
|
String eventType = centereventTEventtype.getParentId();
|
|
String eventType = centereventTEventtype.getParentId();
|
|
String eventTypeXl = centereventTEventtype.getId();
|
|
String eventTypeXl = centereventTEventtype.getId();
|
|
- String eventName = infoVO.getChannelName() + DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, new Date(infoVO.getAlarmDate())) + centereventTEventtype.getEventTypeName();
|
|
|
|
|
|
+ String eventName = infoVO.getChannelName() + DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, new Date(infoVO.getAlarmDate() * 1000)) + centereventTEventtype.getEventTypeName();
|
|
String eventDescription = infoVO.toString(centerdataTCamera);
|
|
String eventDescription = infoVO.toString(centerdataTCamera);
|
|
String longitude = centerdataTCamera.getLongitude();
|
|
String longitude = centerdataTCamera.getLongitude();
|
|
String latitude = centerdataTCamera.getLatitude();
|
|
String latitude = centerdataTCamera.getLatitude();
|
|
String reportor = centerdataTCamera.getCameraName();
|
|
String reportor = centerdataTCamera.getCameraName();
|
|
- Date reportTime = DateUtils.timestampToTime(infoVO.getAlarmDate());
|
|
|
|
|
|
+ Date reportTime = DateUtils.timestampToTime(infoVO.getAlarmDate() * 1000);
|
|
String address = centerdataTCamera.getCameraRegion();
|
|
String address = centerdataTCamera.getCameraRegion();
|
|
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,
|
|
REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), daHuaFireEventVO.getCreateTime());
|
|
REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), daHuaFireEventVO.getCreateTime());
|