فهرست منبع

修复bug, 无人机报文与事件目录无关联问题

Memory_LG 1 ماه پیش
والد
کامیت
3da6d5464a

+ 5 - 1
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/AlarmEventServiceImpl.java

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