|
@@ -709,7 +709,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
|
public int insertDroneEvent(List<DroneVO> alarmData) {
|
|
|
// 将告警图片转换为本地图片
|
|
|
alarmData.parallelStream().forEach(item -> {
|
|
|
- item.setId(IdUtils.simpleUUID());
|
|
|
+// item.setId(IdUtils.simpleUUID());
|
|
|
try {
|
|
|
MultipartFile multipartFile = NetworkImageToMultipartFile.downloadImageToMultipartFile(item.getPhotoPath());
|
|
|
R<SysFile> upload = fileService.upload(multipartFile);
|
|
@@ -744,8 +744,12 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
|
CenterdataTCamera centerdataTCamera = new CenterdataTCamera();
|
|
|
centerdataTCamera.setId(uavId);
|
|
|
centerdataTCamera.setCameraName(MapUtils.getString(data, "uavName"));
|
|
|
+
|
|
|
+ //写入事件目录表
|
|
|
centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, alarm.getCreationTime());
|
|
|
|
|
|
+ //将事件目录表的eventCode赋值给报文表的id
|
|
|
+ alarm.setId(centereventTEventcatalogue.getEventCode());
|
|
|
String eventCode = centereventTEventcatalogue.getEventCode();
|
|
|
String createName = centereventTEventcatalogue.getCreateName();
|
|
|
Date createTime = centereventTEventcatalogue.getCreateTime();
|