|
@@ -98,7 +98,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
String address = eventsVo.getData().getAlarm().getPlaceName();
|
|
String address = eventsVo.getData().getAlarm().getPlaceName();
|
|
CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, eventName, eventDescription, longitude, latitude, reportor, reportTime, address,
|
|
CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, eventName, eventDescription, longitude, latitude, reportor, reportTime, address,
|
|
REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), DateUtils.getNowDate());
|
|
REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), DateUtils.getNowDate());
|
|
- centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue);
|
|
|
|
|
|
+ this.insertEventCatalogue(centereventTEventcatalogue);
|
|
// 事件部门
|
|
// 事件部门
|
|
this.insertEventDept(centereventTEventcatalogue, listDept);
|
|
this.insertEventDept(centereventTEventcatalogue, listDept);
|
|
// 事件日志
|
|
// 事件日志
|
|
@@ -159,7 +159,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
String address = eventsVo.getData().getText()[0].getOrgName();
|
|
String address = eventsVo.getData().getText()[0].getOrgName();
|
|
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(), DateUtils.getNowDate());
|
|
REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), DateUtils.getNowDate());
|
|
- centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue);
|
|
|
|
|
|
+ this.insertEventCatalogue(centereventTEventcatalogue);
|
|
// 事件部门
|
|
// 事件部门
|
|
this.insertEventDept(centereventTEventcatalogue, listDept);
|
|
this.insertEventDept(centereventTEventcatalogue, listDept);
|
|
// 事件日志
|
|
// 事件日志
|
|
@@ -177,7 +177,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
}
|
|
}
|
|
|
|
|
|
// 事件目录
|
|
// 事件目录
|
|
- private CentereventTEventcatalogue insertEventCatalogue(CentereventTEventcatalogue eventcatalogue) {
|
|
|
|
|
|
+ private void insertEventCatalogue(CentereventTEventcatalogue eventcatalogue) {
|
|
//生成uuid
|
|
//生成uuid
|
|
String eventCode = IdUtils.simpleUUID();
|
|
String eventCode = IdUtils.simpleUUID();
|
|
eventcatalogue.setId(eventCode);
|
|
eventcatalogue.setId(eventCode);
|
|
@@ -189,7 +189,6 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
eventcatalogue.setCreateTime(DateUtils.getNowDate());
|
|
eventcatalogue.setCreateTime(DateUtils.getNowDate());
|
|
}
|
|
}
|
|
centereventTEventcatalogueService.insertCentereventTEventcatalogue(eventcatalogue);
|
|
centereventTEventcatalogueService.insertCentereventTEventcatalogue(eventcatalogue);
|
|
- return eventcatalogue;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
// 事件部门
|
|
// 事件部门
|
|
@@ -270,7 +269,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
String address = centerdataTCamera.getCameraRegion();
|
|
String address = centerdataTCamera.getCameraRegion();
|
|
CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, eventName, eventDescription, longitude, latitude, reportor, reportTime, address,
|
|
CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, 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());
|
|
- centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue);
|
|
|
|
|
|
+ this.insertEventCatalogue(centereventTEventcatalogue);
|
|
// 事件部门
|
|
// 事件部门
|
|
this.insertEventDept(centereventTEventcatalogue, listDept);
|
|
this.insertEventDept(centereventTEventcatalogue, listDept);
|
|
// 事件日志
|
|
// 事件日志
|
|
@@ -365,7 +364,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
String address = daHuaOtherEventVO.getAddress();
|
|
String address = daHuaOtherEventVO.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,
|
|
REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), daHuaOtherEventVO.getCreateTime());
|
|
REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), daHuaOtherEventVO.getCreateTime());
|
|
- centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue);
|
|
|
|
|
|
+ this.insertEventCatalogue(centereventTEventcatalogue);
|
|
// 事件部门
|
|
// 事件部门
|
|
this.insertEventDept(centereventTEventcatalogue, listDept);
|
|
this.insertEventDept(centereventTEventcatalogue, listDept);
|
|
// 事件日志
|
|
// 事件日志
|
|
@@ -399,7 +398,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
String eventName = sensorEventVo.getReportor() + DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, sensorEventVo.getReportTime()) + eventtype.getEventTypeName();
|
|
String eventName = sensorEventVo.getReportor() + DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, sensorEventVo.getReportTime()) + eventtype.getEventTypeName();
|
|
CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(sensorEventVo.getEventType(), sensorEventVo.getEventTypeXl(), eventName, sensorEventVo.getEventDescription(), sensorEventVo.getLongitude(), sensorEventVo.getLatitude(), sensorEventVo.getReportor(), sensorEventVo.getReportTime(), sensorEventVo.getAddress(),
|
|
CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(sensorEventVo.getEventType(), sensorEventVo.getEventTypeXl(), eventName, sensorEventVo.getEventDescription(), sensorEventVo.getLongitude(), sensorEventVo.getLatitude(), sensorEventVo.getReportor(), sensorEventVo.getReportTime(), sensorEventVo.getAddress(),
|
|
REPORTING_SOURCE_4, "上报", FOREST_EVENT_STATUS_1, sensorEventVo.getSensorId(), sensorEventVo.getReportor(), DateUtils.getNowDate());
|
|
REPORTING_SOURCE_4, "上报", FOREST_EVENT_STATUS_1, sensorEventVo.getSensorId(), sensorEventVo.getReportor(), DateUtils.getNowDate());
|
|
- centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue);
|
|
|
|
|
|
+ this.insertEventCatalogue(centereventTEventcatalogue);
|
|
// 事件部门
|
|
// 事件部门
|
|
this.insertEventDept(centereventTEventcatalogue, listDept);
|
|
this.insertEventDept(centereventTEventcatalogue, listDept);
|
|
// 事件日志
|
|
// 事件日志
|
|
@@ -430,7 +429,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
"签收", FOREST_EVENT_STATUS_2, SecurityUtils.getLoginUser().getSysUser().getUserId().toString(), SecurityUtils.getLoginUser().getSysUser().getNickName(), DateUtils.getNowDate());
|
|
"签收", FOREST_EVENT_STATUS_2, SecurityUtils.getLoginUser().getSysUser().getUserId().toString(), SecurityUtils.getLoginUser().getSysUser().getNickName(), DateUtils.getNowDate());
|
|
eventcatalogue.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
|
|
eventcatalogue.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
|
|
eventcatalogue.setDeptName(SecurityUtils.getLoginUser().getSysUser().getDeptNames());
|
|
eventcatalogue.setDeptName(SecurityUtils.getLoginUser().getSysUser().getDeptNames());
|
|
- eventcatalogue = this.insertEventCatalogue(eventcatalogue);
|
|
|
|
|
|
+ this.insertEventCatalogue(eventcatalogue);
|
|
// 事件部门
|
|
// 事件部门
|
|
List<CenterdataTAidevicedept> listDept = new ArrayList<>();
|
|
List<CenterdataTAidevicedept> listDept = new ArrayList<>();
|
|
listDept.add(new CenterdataTAidevicedept(eventcatalogue.getDeptId(), eventcatalogue.getDeptName()));
|
|
listDept.add(new CenterdataTAidevicedept(eventcatalogue.getDeptId(), eventcatalogue.getDeptName()));
|